Merge "Prevent interacting with secondary handle if not initialized" into sc-dev (7ba56c57) · Commits · e / os / android_frameworks_base

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 -> {