Yet another improvement of navbar layout heuristics

Author: C3C0

src/com/ceco/gm2/gravitybox/ModNavigationBar.java

@@ -213,19 +213,12 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
 
                     // insert app key
                     ViewGroup vRot, navButtons;
-                    LinearLayout.LayoutParams lp;
 
                     // insert app key in rot0 view
                     vRot = (ViewGroup) ((ViewGroup) param.thisObject).findViewById(
                             mResources.getIdentifier("rot0", "id", PACKAGE_NAME));
                     if (vRot != null) {
                         KeyButtonView appKey = new KeyButtonView(context);
-                        lp = new LinearLayout.LayoutParams(
-                                (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40,
-                                        mResources.getDisplayMetrics()),
-                                        LinearLayout.LayoutParams.MATCH_PARENT);
-                        lp.weight = 0;
-                        appKey.setLayoutParams(lp);
                         appKey.setScaleType(ScaleType.FIT_CENTER);
                         appKey.setClickable(true);
                         appKey.setImageDrawable(gbRes.getDrawable(R.drawable.ic_sysbar_apps));
@@ -240,19 +233,6 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             mResources.getIdentifier("rot90", "id", PACKAGE_NAME));
                     if (vRot != null) {
                         KeyButtonView appKey = new KeyButtonView(context);
-                        if (Utils.isPhoneUI(context)) {
-                            lp = new LinearLayout.LayoutParams(
-                                            LinearLayout.LayoutParams.MATCH_PARENT,
-                                            (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40,
-                                                    mResources.getDisplayMetrics()));
-                        } else {
-                            lp = new LinearLayout.LayoutParams(
-                                    (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 40,
-                                            mResources.getDisplayMetrics()), 
-                                                LinearLayout.LayoutParams.MATCH_PARENT);
-                        }
-                        lp.weight = 0;
-                        appKey.setLayoutParams(lp);
                         appKey.setClickable(true);
                         appKey.setImageDrawable(gbRes.getDrawable(R.drawable.ic_sysbar_apps));
                         appKey.setOnClickListener(mAppKeyOnClickListener);
@@ -297,6 +277,10 @@ protected void beforeHookedMethod(MethodHookParam param) throws Throwable {
 
     private static void prepareNavbarViewInfo(ViewGroup navButtons, int index, KeyButtonView appView) {
         try {
+            final int size = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                    40, navButtons.getResources().getDisplayMetrics());
+            if (DEBUG) log("App key view minimum size=" + size);
+
             mNavbarViewInfo[index] = new NavbarViewInfo();
             mNavbarViewInfo[index].navButtons = navButtons;
             mNavbarViewInfo[index].appLauncherView = appView;
@@ -313,6 +297,47 @@ private static void prepareNavbarViewInfo(ViewGroup navButtons, int index, KeyBu
                 }
             }
             mNavbarViewInfo[index].position = searchPosition;
+
+            // determine app key layout
+            LinearLayout.LayoutParams lp = null;
+            if (mNavbarViewInfo[index].originalView != null) {
+                // determine layout from layout of placeholder view we found
+                ViewGroup.LayoutParams ovlp = mNavbarViewInfo[index].originalView.getLayoutParams();
+                if (DEBUG) log("originalView: lpWidth=" + ovlp.width + "; lpHeight=" + ovlp.height);
+                if (ovlp.width >= 0) {
+                    lp = new LinearLayout.LayoutParams(size, LinearLayout.LayoutParams.MATCH_PARENT, 0);
+                } else if (ovlp.height >= 0) {
+                    lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, size, 0);
+                } else {
+                    log("Weird layout of placeholder view detected");
+                }
+            } else {
+                // determine layout from Back key
+                final int resId = navButtons.getResources().getIdentifier("back", "id", PACKAGE_NAME);
+                if (resId != 0) {
+                    View back = navButtons.findViewById(resId);
+                    if (back != null) {
+                        ViewGroup.LayoutParams blp = back.getLayoutParams();
+                        if (blp.width >= 0) {
+                            lp = new LinearLayout.LayoutParams(size, LinearLayout.LayoutParams.MATCH_PARENT, 0);
+                        } else if (blp.height >= 0) {
+                            lp = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, size, 0);
+                        } else {
+                            log("Weird layout of back button view detected");
+                        }
+                    } else {
+                        log("Could not find back button view");
+                    }
+                } else {
+                    log("Could not find back button resource ID");
+                }
+            }
+            // worst case scenario (should never happen, but just to make sure)
+            if (lp == null) {
+                lp = new LinearLayout.LayoutParams(size, size, 0);
+            }
+            if (DEBUG) log("appView: lpWidth=" + lp.width + "; lpHeight=" + lp.height);
+            mNavbarViewInfo[index].appLauncherView.setLayoutParams(lp);
         } catch (Throwable t) {
             log("Error preparing NavbarViewInfo: " + t.getMessage());
         }