Merge "Revert "Fix bubble bar location on device boot."" into main (e5d7a587) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -274,11 +274,8 @@ public class BubbleController implements ConfigurationChangeListener,
		private final DragAndDropController mDragAndDropController;
		/** Used to send bubble events to launcher. */
		private Bubbles.BubbleStateListener mBubbleStateListener;
		/**
		* Used to track previous navigation mode to detect switch to buttons navigation. Set to
		* true to switch the bubble bar to the opposite side for 3 nav buttons mode on device boot.
		*/
		private boolean mIsPrevNavModeGestures = true;
		/** Used to track previous navigation mode to detect switch to buttons navigation. */
		private boolean mIsPrevNavModeGestures;
		/** Used to send updates to the views from {@link #mBubbleDataListener}. */
		private BubbleViewCallback mBubbleViewCallback;

		@@ -360,6 +357,7 @@ public class BubbleController implements ConfigurationChangeListener,
		}
		};
		mExpandedViewManager = BubbleExpandedViewManager.fromBubbleController(this);
		mIsPrevNavModeGestures = ContextUtils.isGestureNavigationMode(mContext);
		}

		private void registerOneHandedState(OneHandedController oneHanded) {
		@@ -595,9 +593,9 @@ public class BubbleController implements ConfigurationChangeListener,
		if (mBubbleStateListener != null) {
		boolean isCurrentNavModeGestures = ContextUtils.isGestureNavigationMode(mContext);
		if (mIsPrevNavModeGestures && !isCurrentNavModeGestures) {
		BubbleBarLocation bubbleBarLocation = ContextUtils.isRtl(mContext)
		BubbleBarLocation navButtonsLocation = ContextUtils.isRtl(mContext)
		? BubbleBarLocation.RIGHT : BubbleBarLocation.LEFT;
		mBubblePositioner.setBubbleBarLocation(bubbleBarLocation);
		mBubblePositioner.setBubbleBarLocation(navButtonsLocation);
		}
		mIsPrevNavModeGestures = isCurrentNavModeGestures;
		BubbleBarUpdate update = mBubbleData.getInitialStateForBubbleBar();