Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c55566 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent interacting with secondary handle if not initialized" into sc-dev am: 7ba56c57 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473853

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad56220de689fda0e1279ab394c0552c73f78e8a
parents b78b047f 7ba56c57

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java

+2 −2
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    }



    private void initSecondaryHomeHandleForRotation() {

        if (!canShowSecondaryHandle()) {

        if (mNavBarMode != NAV_BAR_MODE_GESTURAL) {

            return;

        }
@@ -1524,7 +1524,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener, 
    }



    private boolean canShowSecondaryHandle() {

        return mNavBarMode == NAV_BAR_MODE_GESTURAL;

        return mNavBarMode == NAV_BAR_MODE_GESTURAL && mOrientationHandle != null;

    }



    private final Consumer<Integer> mRotationWatcher = rotation -> {