Merge pull request #11428 from t895/cheats-fix-2

Android: Ignore workaround view height if 0
dolphin-emu · Jan 10, 2023 · 4b6d688 · 4b6d688
2 parents 558e3b5 + 6b97b64
commit 4b6d688
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InsetsHelper.java
@@ -31,9 +31,12 @@ public static void insetAppBar(Insets insets, AppBarLayout appBarLayout)
   // navigation bar https://issuetracker.google.com/issues/248761842
   public static void applyNavbarWorkaround(int bottomInset, View workaroundView)
   {
-    ViewGroup.LayoutParams lpWorkaround = workaroundView.getLayoutParams();
-    lpWorkaround.height = bottomInset;
-    workaroundView.setLayoutParams(lpWorkaround);
+    if (bottomInset > 0)
+    {
+      ViewGroup.LayoutParams lpWorkaround = workaroundView.getLayoutParams();
+      lpWorkaround.height = bottomInset;
+      workaroundView.setLayoutParams(lpWorkaround);
+    }
   }
 
   public static int getSystemGestureType(Context context)