Merge changes from topic "flexible_bars" into rvc-qpr-dev am: a5404a59f2 (6b03df08) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManagerPolicyConstants.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,13 @@ public interface WindowManagerPolicyConstants {
		int PRESENCE_INTERNAL = 1 << 0;
		int PRESENCE_EXTERNAL = 1 << 1;

		// Alternate bars position values
		int ALT_BAR_UNKNOWN = -1;
		int ALT_BAR_LEFT = 1 << 0;
		int ALT_BAR_RIGHT = 1 << 1;
		int ALT_BAR_BOTTOM = 1 << 2;
		int ALT_BAR_TOP = 1 << 3;

		// Navigation bar position values
		int NAV_BAR_INVALID = -1;
		int NAV_BAR_LEFT = 1 << 0;

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBar.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,12 @@

		package com.android.systemui.car.navigationbar;

		import static android.view.InsetsState.ITYPE_BOTTOM_GESTURES;
		import static android.view.InsetsState.ITYPE_CLIMATE_BAR;
		import static android.view.InsetsState.ITYPE_EXTRA_NAVIGATION_BAR;
		import static android.view.InsetsState.ITYPE_NAVIGATION_BAR;
		import static android.view.InsetsState.ITYPE_STATUS_BAR;
		import static android.view.InsetsState.ITYPE_TOP_GESTURES;
		import static android.view.InsetsState.containsType;
		import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;

		@@ -368,13 +370,15 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
		WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		height,
		WindowManager.LayoutParams.TYPE_STATUS_BAR,
		WindowManager.LayoutParams.TYPE_STATUS_BAR_ADDITIONAL,
		WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
		\| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
		\| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
		\| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
		PixelFormat.TRANSLUCENT);
		lp.setTitle("TopCarNavigationBar");
		lp.providesInsetsTypes = new int[]{ITYPE_STATUS_BAR, ITYPE_TOP_GESTURES};
		lp.setFitInsetsTypes(0);
		lp.windowAnimations = 0;
		lp.gravity = Gravity.TOP;
		mWindowManager.addView(mTopNavigationBarWindow, lp);
		@@ -388,13 +392,14 @@ public class CarNavigationBar extends SystemUI implements CommandQueue.Callbacks
		WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
		ViewGroup.LayoutParams.MATCH_PARENT,
		height,
		WindowManager.LayoutParams.TYPE_NAVIGATION_BAR,
		WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
		WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
		\| WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
		\| WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH
		\| WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
		PixelFormat.TRANSLUCENT);
		lp.setTitle("BottomCarNavigationBar");
		lp.providesInsetsTypes = new int[]{ITYPE_NAVIGATION_BAR, ITYPE_BOTTOM_GESTURES};
		lp.windowAnimations = 0;
		lp.gravity = Gravity.BOTTOM;
		mWindowManager.addView(mBottomNavigationBarWindow, lp);

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/CarNavigationBarView.java

+22 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@

		package com.android.systemui.car.navigationbar;

		import static android.view.WindowInsets.Type.systemBars;

		import android.content.Context;
		import android.graphics.Insets;
		import android.util.AttributeSet;
		import android.view.MotionEvent;
		import android.view.View;
		@@ -79,9 +82,28 @@ public class CarNavigationBarView extends LinearLayout {

		@Override
		public WindowInsets onApplyWindowInsets(WindowInsets windowInsets) {
		applyMargins(windowInsets.getInsets(systemBars()));
		return windowInsets;
		}

		private void applyMargins(Insets insets) {
		final int count = getChildCount();
		for (int i = 0; i < count; i++) {
		View child = getChildAt(i);
		if (child.getLayoutParams() instanceof LayoutParams) {
		LayoutParams lp = (LayoutParams) child.getLayoutParams();
		if (lp.rightMargin != insets.right \|\| lp.leftMargin != insets.left
		\|\| lp.topMargin != insets.top \|\| lp.bottomMargin != insets.bottom) {
		lp.rightMargin = insets.right;
		lp.leftMargin = insets.left;
		lp.topMargin = insets.top;
		lp.bottomMargin = insets.bottom;
		child.requestLayout();
		}
		}
		}
		}

		// Used to forward touch events even if the touch was initiated from a child component
		@Override
		public boolean onInterceptTouchEvent(MotionEvent ev) {

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,10 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
		@IntDef({NAV_BAR_LEFT, NAV_BAR_RIGHT, NAV_BAR_BOTTOM})
		@interface NavigationBarPosition {}

		@Retention(SOURCE)
		@IntDef({ALT_BAR_UNKNOWN, ALT_BAR_LEFT, ALT_BAR_RIGHT, ALT_BAR_BOTTOM, ALT_BAR_TOP})
		@interface AltBarPosition {}

		/**
		* Pass this event to the user / app. To be returned from
		* {@link #interceptKeyBeforeQueueing}.

services/core/java/com/android/server/wm/DisplayPolicy.java

+166 −24

Original line number	Diff line number	Diff line
		@@ -102,6 +102,11 @@ import static android.view.WindowManager.LayoutParams.TYPE_VOLUME_OVERLAY;
		import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
		import static android.view.WindowManagerGlobal.ADD_OKAY;
		import static android.view.WindowManagerPolicyConstants.ACTION_HDMI_PLUGGED;
		import static android.view.WindowManagerPolicyConstants.ALT_BAR_BOTTOM;
		import static android.view.WindowManagerPolicyConstants.ALT_BAR_LEFT;
		import static android.view.WindowManagerPolicyConstants.ALT_BAR_RIGHT;
		import static android.view.WindowManagerPolicyConstants.ALT_BAR_TOP;
		import static android.view.WindowManagerPolicyConstants.ALT_BAR_UNKNOWN;
		import static android.view.WindowManagerPolicyConstants.EXTRA_HDMI_PLUGGED_STATE;
		import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM;
		import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT;
		@@ -314,6 +319,17 @@ public class DisplayPolicy {
		private int[] mNavigationBarHeightForRotationInCarMode = new int[4];
		private int[] mNavigationBarWidthForRotationInCarMode = new int[4];

		// Alternative status bar for when flexible insets mapping is used to place the status bar on
		// another side of the screen.
		private WindowState mStatusBarAlt = null;
		@WindowManagerPolicy.AltBarPosition
		private int mStatusBarAltPosition = ALT_BAR_UNKNOWN;
		// Alternative navigation bar for when flexible insets mapping is used to place the navigation
		// bar elsewhere on the screen.
		private WindowState mNavigationBarAlt = null;
		@WindowManagerPolicy.AltBarPosition
		private int mNavigationBarAltPosition = ALT_BAR_UNKNOWN;

		/** See {@link #getNavigationBarFrameHeight} */
		private int[] mNavigationBarFrameHeightForRotationDefault = new int[4];

		@@ -431,7 +447,7 @@ public class DisplayPolicy {
		case MSG_REQUEST_TRANSIENT_BARS:
		synchronized (mLock) {
		WindowState targetBar = (msg.arg1 == MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS)
		? mStatusBar : mNavigationBar;
		? getStatusBar() : getNavigationBar();
		if (targetBar != null) {
		requestTransientBars(targetBar);
		}
		@@ -494,6 +510,7 @@ public class DisplayPolicy {
		if (mStatusBar != null) {
		requestTransientBars(mStatusBar);
		}
		checkAltBarSwipeForTransientBars(ALT_BAR_TOP);
		}
		}

		@@ -504,6 +521,7 @@ public class DisplayPolicy {
		&& mNavigationBarPosition == NAV_BAR_BOTTOM) {
		requestTransientBars(mNavigationBar);
		}
		checkAltBarSwipeForTransientBars(ALT_BAR_BOTTOM);
		}
		}

		@@ -520,6 +538,7 @@ public class DisplayPolicy {
		excludedRegion)) {
		requestTransientBars(mNavigationBar);
		}
		checkAltBarSwipeForTransientBars(ALT_BAR_RIGHT);
		}
		excludedRegion.recycle();
		}
		@@ -537,6 +556,7 @@ public class DisplayPolicy {
		excludedRegion)) {
		requestTransientBars(mNavigationBar);
		}
		checkAltBarSwipeForTransientBars(ALT_BAR_LEFT);
		}
		excludedRegion.recycle();
		}
		@@ -638,6 +658,15 @@ public class DisplayPolicy {
		mHandler.post(mGestureNavigationSettingsObserver::register);
		}

		private void checkAltBarSwipeForTransientBars(@WindowManagerPolicy.AltBarPosition int pos) {
		if (mStatusBarAlt != null && mStatusBarAltPosition == pos) {
		requestTransientBars(mStatusBarAlt);
		}
		if (mNavigationBarAlt != null && mNavigationBarAltPosition == pos) {
		requestTransientBars(mNavigationBarAlt);
		}
		}

		void systemReady() {
		mSystemGestures.systemReady();
		if (mService.mPointerLocationEnabled) {
		@@ -899,6 +928,14 @@ public class DisplayPolicy {
		}
		break;
		}

		// Check if alternate bars positions were updated.
		if (mStatusBarAlt == win) {
		mStatusBarAltPosition = getAltBarPosition(attrs);
		}
		if (mNavigationBarAlt == win) {
		mNavigationBarAltPosition = getAltBarPosition(attrs);
		}
		}

		/**
		@@ -938,11 +975,10 @@ public class DisplayPolicy {
		mContext.enforcePermission(
		android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid,
		"DisplayPolicy");
		if (mStatusBar != null) {
		if (mStatusBar.isAlive()) {
		if ((mStatusBar != null && mStatusBar.isAlive())
		\|\| (mStatusBarAlt != null && mStatusBarAlt.isAlive())) {
		return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
		}
		}
		break;
		case TYPE_NOTIFICATION_SHADE:
		mContext.enforcePermission(
		@@ -958,11 +994,10 @@ public class DisplayPolicy {
		mContext.enforcePermission(
		android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid,
		"DisplayPolicy");
		if (mNavigationBar != null) {
		if (mNavigationBar.isAlive()) {
		if ((mNavigationBar != null && mNavigationBar.isAlive())
		\|\| (mNavigationBarAlt != null && mNavigationBarAlt.isAlive())) {
		return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
		}
		}
		break;
		case TYPE_NAVIGATION_BAR_PANEL:
		// Check for permission if the caller is not the recents component.
		@@ -993,6 +1028,23 @@ public class DisplayPolicy {
		android.Manifest.permission.STATUS_BAR_SERVICE, callingPid, callingUid,
		"DisplayPolicy");
		enforceSingleInsetsTypeCorrespondingToWindowType(attrs.providesInsetsTypes);

		for (@InternalInsetsType int insetType : attrs.providesInsetsTypes) {
		switch (insetType) {
		case ITYPE_STATUS_BAR:
		if ((mStatusBar != null && mStatusBar.isAlive())
		\|\| (mStatusBarAlt != null && mStatusBarAlt.isAlive())) {
		return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
		}
		break;
		case ITYPE_NAVIGATION_BAR:
		if ((mNavigationBar != null && mNavigationBar.isAlive())
		\|\| (mNavigationBarAlt != null && mNavigationBarAlt.isAlive())) {
		return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
		}
		break;
		}
		}
		}
		return ADD_OKAY;
		}
		@@ -1084,7 +1136,19 @@ public class DisplayPolicy {
		break;
		default:
		if (attrs.providesInsetsTypes != null) {
		for (int insetsType : attrs.providesInsetsTypes) {
		for (@InternalInsetsType int insetsType : attrs.providesInsetsTypes) {
		switch (insetsType) {
		case ITYPE_STATUS_BAR:
		mStatusBarAlt = win;
		mStatusBarController.setWindow(mStatusBarAlt);
		mStatusBarAltPosition = getAltBarPosition(attrs);
		break;
		case ITYPE_NAVIGATION_BAR:
		mNavigationBarAlt = win;
		mNavigationBarController.setWindow(mNavigationBarAlt);
		mNavigationBarAltPosition = getAltBarPosition(attrs);
		break;
		}
		mDisplayContent.setInsetProvider(insetsType, win, null);
		}
		}
		@@ -1092,6 +1156,22 @@ public class DisplayPolicy {
		}
		}

		@WindowManagerPolicy.AltBarPosition
		private int getAltBarPosition(WindowManager.LayoutParams params) {
		switch (params.gravity) {
		case Gravity.LEFT:
		return ALT_BAR_LEFT;
		case Gravity.RIGHT:
		return ALT_BAR_RIGHT;
		case Gravity.BOTTOM:
		return ALT_BAR_BOTTOM;
		case Gravity.TOP:
		return ALT_BAR_TOP;
		default:
		return ALT_BAR_UNKNOWN;
		}
		}

		TriConsumer<DisplayFrames, WindowState, Rect> getImeSourceFrameProvider() {
		return (displayFrames, windowState, inOutFrame) -> {
		if (mNavigationBar != null && navigationBarPosition(displayFrames.mDisplayWidth,
		@@ -1132,12 +1212,14 @@ public class DisplayPolicy {
		* @param win The window being removed.
		*/
		void removeWindowLw(WindowState win) {
		if (mStatusBar == win) {
		if (mStatusBar == win \|\| mStatusBarAlt == win) {
		mStatusBar = null;
		mStatusBarAlt = null;
		mStatusBarController.setWindow(null);
		mDisplayContent.setInsetProvider(ITYPE_STATUS_BAR, null, null);
		} else if (mNavigationBar == win) {
		} else if (mNavigationBar == win \|\| mNavigationBarAlt == win) {
		mNavigationBar = null;
		mNavigationBarAlt = null;
		mNavigationBarController.setWindow(null);
		mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, null, null);
		} else if (mNotificationShade == win) {
		@@ -1163,7 +1245,7 @@ public class DisplayPolicy {
		}

		WindowState getStatusBar() {
		return mStatusBar;
		return mStatusBar != null ? mStatusBar : mStatusBarAlt;
		}

		WindowState getNotificationShade() {
		@@ -1171,7 +1253,7 @@ public class DisplayPolicy {
		}

		WindowState getNavigationBar() {
		return mNavigationBar;
		return mNavigationBar != null ? mNavigationBar : mNavigationBarAlt;
		}

		/**
		@@ -1233,6 +1315,46 @@ public class DisplayPolicy {
		return R.anim.dock_left_enter;
		}
		}
		} else if (win == mStatusBarAlt \|\| win == mNavigationBarAlt) {
		if (win.getAttrs().windowAnimations != 0) {
		return ANIMATION_STYLEABLE;
		}

		int pos = (win == mStatusBarAlt) ? mStatusBarAltPosition : mNavigationBarAltPosition;

		boolean isExitOrHide = transit == TRANSIT_EXIT \|\| transit == TRANSIT_HIDE;
		boolean isEnterOrShow = transit == TRANSIT_ENTER \|\| transit == TRANSIT_SHOW;

		switch (pos) {
		case ALT_BAR_LEFT:
		if (isExitOrHide) {
		return R.anim.dock_left_exit;
		} else if (isEnterOrShow) {
		return R.anim.dock_left_enter;
		}
		break;
		case ALT_BAR_RIGHT:
		if (isExitOrHide) {
		return R.anim.dock_right_exit;
		} else if (isEnterOrShow) {
		return R.anim.dock_right_enter;
		}
		break;
		case ALT_BAR_BOTTOM:
		if (isExitOrHide) {
		return R.anim.dock_bottom_exit;
		} else if (isEnterOrShow) {
		return R.anim.dock_bottom_enter;
		}
		break;
		case ALT_BAR_TOP:
		if (isExitOrHide) {
		return R.anim.dock_top_exit;
		} else if (isEnterOrShow) {
		return R.anim.dock_top_enter;
		}
		break;
		}
		}

		if (transit == TRANSIT_PREVIEW_DONE) {
		@@ -1591,7 +1713,7 @@ public class DisplayPolicy {
		mInputConsumer = null;
		Slog.v(TAG, INPUT_CONSUMER_NAVIGATION + " dismissed.");
		}
		} else if (mInputConsumer == null && mStatusBar != null && canHideNavigationBar()) {
		} else if (mInputConsumer == null && getStatusBar() != null && canHideNavigationBar()) {
		mInputConsumer = mDisplayContent.getInputMonitor().createInputConsumer(
		mHandler.getLooper(),
		INPUT_CONSUMER_NAVIGATION,
		@@ -2677,10 +2799,10 @@ public class DisplayPolicy {
		mDreamingLockscreen = mService.mPolicy.isKeyguardShowingAndNotOccluded();
		}

		if (mStatusBar != null) {
		if (getStatusBar() != null) {
		if (DEBUG_LAYOUT) Slog.i(TAG, "force=" + mForceStatusBar
		+ " top=" + mTopFullscreenOpaqueWindowState);
		final boolean forceShowStatusBar = (mStatusBar.getAttrs().privateFlags
		final boolean forceShowStatusBar = (getStatusBar().getAttrs().privateFlags
		& PRIVATE_FLAG_FORCE_SHOW_STATUS_BAR) != 0;
		final boolean notificationShadeForcesShowingNavigation =
		mNotificationShade != null
		@@ -3166,6 +3288,16 @@ public class DisplayPolicy {
		return mNavigationBarPosition;
		}

		@WindowManagerPolicy.AltBarPosition
		int getAlternateStatusBarPosition() {
		return mStatusBarAltPosition;
		}

		@WindowManagerPolicy.AltBarPosition
		int getAlternateNavBarPosition() {
		return mNavigationBarAltPosition;
		}

		/**
		* A new window has been focused.
		*/
		@@ -3327,8 +3459,8 @@ public class DisplayPolicy {
		final boolean isFullscreen = (visibility & (View.SYSTEM_UI_FLAG_FULLSCREEN
		\| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION)) != 0
		\|\| (PolicyControl.getWindowFlags(win, win.mAttrs) & FLAG_FULLSCREEN) != 0
		\|\| (mStatusBar != null && insetsPolicy.isHidden(ITYPE_STATUS_BAR))
		\|\| (mNavigationBar != null && insetsPolicy.isHidden(
		\|\| (getStatusBar() != null && insetsPolicy.isHidden(ITYPE_STATUS_BAR))
		\|\| (getNavigationBar() != null && insetsPolicy.isHidden(
		ITYPE_NAVIGATION_BAR));
		final int behavior = win.mAttrs.insetsFlags.behavior;
		final boolean isImmersive = (visibility & (View.SYSTEM_UI_FLAG_IMMERSIVE
		@@ -3583,7 +3715,7 @@ public class DisplayPolicy {
		final boolean hideNavBarSysui =
		(vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0;

		final boolean transientStatusBarAllowed = mStatusBar != null
		final boolean transientStatusBarAllowed = getStatusBar() != null
		&& (notificationShadeHasFocus \|\| (!mForceShowSystemBars
		&& (hideStatusBarWM \|\| (hideStatusBarSysui && immersiveSticky))));

		@@ -3741,7 +3873,7 @@ public class DisplayPolicy {
		// TODO(b/118118435): Remove this after migration
		private boolean isImmersiveMode(int vis) {
		final int flags = View.SYSTEM_UI_FLAG_IMMERSIVE \| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
		return mNavigationBar != null
		return getNavigationBar() != null
		&& (vis & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) != 0
		&& (vis & flags) != 0
		&& canHideNavigationBar();
		@@ -3749,7 +3881,7 @@ public class DisplayPolicy {

		private boolean isImmersiveMode(WindowState win) {
		final int behavior = win.mAttrs.insetsFlags.behavior;
		return mNavigationBar != null
		return getNavigationBar() != null
		&& canHideNavigationBar()
		&& (behavior == BEHAVIOR_SHOW_BARS_BY_SWIPE
		\|\| behavior == BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE)
		@@ -3830,8 +3962,8 @@ public class DisplayPolicy {
		public void takeScreenshot(int screenshotType, int source) {
		if (mScreenshotHelper != null) {
		mScreenshotHelper.takeScreenshot(screenshotType,
		mStatusBar != null && mStatusBar.isVisibleLw(),
		mNavigationBar != null && mNavigationBar.isVisibleLw(),
		getStatusBar() != null && getStatusBar().isVisibleLw(),
		getNavigationBar() != null && getNavigationBar().isVisibleLw(),
		source, mHandler, null /* completionConsumer */);
		}
		}
		@@ -3869,6 +4001,11 @@ public class DisplayPolicy {
		if (mStatusBar != null) {
		pw.print(prefix); pw.print("mStatusBar="); pw.print(mStatusBar);
		}
		if (mStatusBarAlt != null) {
		pw.print(prefix); pw.print("mStatusBarAlt="); pw.print(mStatusBarAlt);
		pw.print(prefix); pw.print("mStatusBarAltPosition=");
		pw.println(mStatusBarAltPosition);
		}
		if (mNotificationShade != null) {
		pw.print(prefix); pw.print("mExpandedPanel="); pw.print(mNotificationShade);
		}
		@@ -3880,6 +4017,11 @@ public class DisplayPolicy {
		pw.print(prefix); pw.print("mNavigationBarPosition=");
		pw.println(mNavigationBarPosition);
		}
		if (mNavigationBarAlt != null) {
		pw.print(prefix); pw.print("mNavigationBarAlt="); pw.println(mNavigationBarAlt);
		pw.print(prefix); pw.print("mNavigationBarAltPosition=");
		pw.println(mNavigationBarAltPosition);
		}
		if (mFocusedWindow != null) {
		pw.print(prefix); pw.print("mFocusedWindow="); pw.println(mFocusedWindow);
		}