am d5102f19: Merge "Transparent system ui flags -> Translucent WM flags." into klp-dev (b88ede00) · Commits · e / os / android_frameworks_base

api/current.txt

+8 −2

core/java/android/view/View.java

+22 −24

Original line number	Original line	Diff line number	Diff line
	@@ -2447,24 +2447,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	*/		*/
	public static final int SYSTEM_UI_FLAG_IMMERSIVE = 0x00000800;		public static final int SYSTEM_UI_FLAG_IMMERSIVE = 0x00000800;

	/**
	* Flag for {@link #setSystemUiVisibility(int)}: View would like the status bar to have
	* transparency.
	*
	* <p>The transparency request may be denied if the bar is in another mode with a specific
	* style, like {@link #SYSTEM_UI_FLAG_IMMERSIVE immersive mode}.
	*/
	public static final int SYSTEM_UI_FLAG_TRANSPARENT_STATUS = 0x00001000;

	/**
	* Flag for {@link #setSystemUiVisibility(int)}: View would like the navigation bar to have
	* transparency.
	*
	* <p>The transparency request may be denied if the bar is in another mode with a specific
	* style, like {@link #SYSTEM_UI_FLAG_IMMERSIVE immersive mode}.
	*/
	public static final int SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION = 0x00002000;

	/**		/**
	* @deprecated Use {@link #SYSTEM_UI_FLAG_LOW_PROFILE} instead.		* @deprecated Use {@link #SYSTEM_UI_FLAG_LOW_PROFILE} instead.
	*/		*/
	@@ -2624,6 +2606,26 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	*/		*/
	public static final int NAVIGATION_BAR_UNHIDE = 0x20000000;		public static final int NAVIGATION_BAR_UNHIDE = 0x20000000;

			/**
			* @hide
			*
			* NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked
			* out of the public fields to keep the undefined bits out of the developer's way.
			*
			* Flag to specify that the status bar is displayed in translucent mode.
			*/
			public static final int STATUS_BAR_TRANSLUCENT = 0x40000000;

			/**
			* @hide
			*
			* NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked
			* out of the public fields to keep the undefined bits out of the developer's way.
			*
			* Flag to specify that the navigation bar is displayed in translucent mode.
			*/
			public static final int NAVIGATION_BAR_TRANSLUCENT = 0x80000000;

	/**		/**
	* @hide		* @hide
	*/		*/
	@@ -16934,9 +16936,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* @param visibility Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE},		* @param visibility Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE},
	* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, {@link #SYSTEM_UI_FLAG_FULLSCREEN},		* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, {@link #SYSTEM_UI_FLAG_FULLSCREEN},
	* {@link #SYSTEM_UI_FLAG_LAYOUT_STABLE}, {@link #SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION},		* {@link #SYSTEM_UI_FLAG_LAYOUT_STABLE}, {@link #SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION},
	* {@link #SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}, {@link #SYSTEM_UI_FLAG_IMMERSIVE},		* {@link #SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}, and {@link #SYSTEM_UI_FLAG_IMMERSIVE}.
	* {@link #SYSTEM_UI_FLAG_TRANSPARENT_STATUS},
	* and {@link #SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION}.
	*/		*/
	public void setSystemUiVisibility(int visibility) {		public void setSystemUiVisibility(int visibility) {
	if (visibility != mSystemUiVisibility) {		if (visibility != mSystemUiVisibility) {
	@@ -16952,9 +16952,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* @return Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE},		* @return Bitwise-or of flags {@link #SYSTEM_UI_FLAG_LOW_PROFILE},
	* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, {@link #SYSTEM_UI_FLAG_FULLSCREEN},		* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, {@link #SYSTEM_UI_FLAG_FULLSCREEN},
	* {@link #SYSTEM_UI_FLAG_LAYOUT_STABLE}, {@link #SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION},		* {@link #SYSTEM_UI_FLAG_LAYOUT_STABLE}, {@link #SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION},
	* {@link #SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}, {@link #SYSTEM_UI_FLAG_IMMERSIVE},		* {@link #SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}, and {@link #SYSTEM_UI_FLAG_IMMERSIVE}.
	* {@link #SYSTEM_UI_FLAG_TRANSPARENT_STATUS},
	* and {@link #SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION}.
	*/		*/
	public int getSystemUiVisibility() {		public int getSystemUiVisibility() {
	return mSystemUiVisibility;		return mSystemUiVisibility;

core/java/android/view/ViewRootImpl.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -754,6 +754,11 @@ public final class ViewRootImpl implements ViewParent,
	attrs.systemUiVisibility = mWindowAttributes.systemUiVisibility;		attrs.systemUiVisibility = mWindowAttributes.systemUiVisibility;
	attrs.subtreeSystemUiVisibility = mWindowAttributes.subtreeSystemUiVisibility;		attrs.subtreeSystemUiVisibility = mWindowAttributes.subtreeSystemUiVisibility;
	mWindowAttributesChangesFlag = mWindowAttributes.copyFrom(attrs);		mWindowAttributesChangesFlag = mWindowAttributes.copyFrom(attrs);
			if ((mWindowAttributesChangesFlag
			& WindowManager.LayoutParams.TRANSLUCENT_FLAGS_CHANGED) != 0) {
			// Recompute system ui visibility.
			mAttachInfo.mRecomputeGlobalAttributes = true;
			}
	if (mWindowAttributes.packageName == null) {		if (mWindowAttributes.packageName == null) {
	mWindowAttributes.packageName = mBasePackageName;		mWindowAttributes.packageName = mBasePackageName;
	}		}
	@@ -1026,6 +1031,7 @@ public final class ViewRootImpl implements ViewParent,
	mView.dispatchCollectViewAttributes(attachInfo, 0);		mView.dispatchCollectViewAttributes(attachInfo, 0);
	attachInfo.mSystemUiVisibility &= ~attachInfo.mDisabledSystemUiVisibility;		attachInfo.mSystemUiVisibility &= ~attachInfo.mDisabledSystemUiVisibility;
	WindowManager.LayoutParams params = mWindowAttributes;		WindowManager.LayoutParams params = mWindowAttributes;
			attachInfo.mSystemUiVisibility \|= getImpliedSystemUiVisibility(params);
	if (attachInfo.mKeepScreenOn != oldScreenOn		if (attachInfo.mKeepScreenOn != oldScreenOn
	\|\| attachInfo.mSystemUiVisibility != params.subtreeSystemUiVisibility		\|\| attachInfo.mSystemUiVisibility != params.subtreeSystemUiVisibility
	\|\| attachInfo.mHasSystemUiListeners != params.hasSystemUiListeners) {		\|\| attachInfo.mHasSystemUiListeners != params.hasSystemUiListeners) {
	@@ -1039,6 +1045,18 @@ public final class ViewRootImpl implements ViewParent,
	return false;		return false;
	}		}

			private int getImpliedSystemUiVisibility(WindowManager.LayoutParams params) {
			int vis = 0;
			// Translucent decor window flags imply stable system ui visibility.
			if ((params.flags & WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS) != 0) {
			vis \|= View.SYSTEM_UI_FLAG_LAYOUT_STABLE \| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
			}
			if ((params.flags & WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION) != 0) {
			vis \|= View.SYSTEM_UI_FLAG_LAYOUT_STABLE \| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
			}
			return vis;
			}

	private boolean measureHierarchy(final View host, final WindowManager.LayoutParams lp,		private boolean measureHierarchy(final View host, final WindowManager.LayoutParams lp,
	final Resources res, final int desiredWindowWidth, final int desiredWindowHeight) {		final Resources res, final int desiredWindowWidth, final int desiredWindowHeight) {
	int childWidthMeasureSpec;		int childWidthMeasureSpec;

core/java/android/view/WindowManager.java

+54 −1

Original line number	Original line	Diff line number	Diff line
	@@ -838,6 +838,44 @@ public interface WindowManager extends ViewManager {
	*/		*/
	public static final int FLAG_LAYOUT_IN_OVERSCAN = 0x02000000;		public static final int FLAG_LAYOUT_IN_OVERSCAN = 0x02000000;

			/**
			* Window flag: request a translucent status bar with minimal system-provided
			* background protection.
			*
			* <p>This flag can be controlled in your theme through the
			* {@link android.R.attr#windowTranslucentStatus} attribute; this attribute
			* is automatically set for you in the standard translucent decor themes
			* such as
			* {@link android.R.style#Theme_Holo_NoActionBar_TranslucentDecor},
			* {@link android.R.style#Theme_Holo_Light_NoActionBar_TranslucentDecor},
			* {@link android.R.style#Theme_DeviceDefault_NoActionBar_TranslucentDecor}, and
			* {@link android.R.style#Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor}.</p>
			*
			* <p>When this flag is enabled for a window, it automatically sets
			* the system UI visibility flags {@link View#SYSTEM_UI_FLAG_LAYOUT_STABLE} and
			* {@link View#SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN}.</p>
			*/
			public static final int FLAG_TRANSLUCENT_STATUS = 0x04000000;

			/**
			* Window flag: request a translucent navigation bar with minimal system-provided
			* background protection.
			*
			* <p>This flag can be controlled in your theme through the
			* {@link android.R.attr#windowTranslucentNavigation} attribute; this attribute
			* is automatically set for you in the standard translucent decor themes
			* such as
			* {@link android.R.style#Theme_Holo_NoActionBar_TranslucentDecor},
			* {@link android.R.style#Theme_Holo_Light_NoActionBar_TranslucentDecor},
			* {@link android.R.style#Theme_DeviceDefault_NoActionBar_TranslucentDecor}, and
			* {@link android.R.style#Theme_DeviceDefault_Light_NoActionBar_TranslucentDecor}.</p>
			*
			* <p>When this flag is enabled for a window, it automatically sets
			* the system UI visibility flags {@link View#SYSTEM_UI_FLAG_LAYOUT_STABLE} and
			* {@link View#SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION}.</p>
			*/
			public static final int FLAG_TRANSLUCENT_NAVIGATION = 0x08000000;

	// ----- HIDDEN FLAGS.		// ----- HIDDEN FLAGS.
	// These start at the high bit and go down.		// These start at the high bit and go down.

	@@ -956,7 +994,11 @@ public interface WindowManager extends ViewManager {
	@ViewDebug.FlagToString(mask = FLAG_HARDWARE_ACCELERATED, equals = FLAG_HARDWARE_ACCELERATED,		@ViewDebug.FlagToString(mask = FLAG_HARDWARE_ACCELERATED, equals = FLAG_HARDWARE_ACCELERATED,
	name = "FLAG_HARDWARE_ACCELERATED"),		name = "FLAG_HARDWARE_ACCELERATED"),
	@ViewDebug.FlagToString(mask = FLAG_LOCAL_FOCUS_MODE, equals = FLAG_LOCAL_FOCUS_MODE,		@ViewDebug.FlagToString(mask = FLAG_LOCAL_FOCUS_MODE, equals = FLAG_LOCAL_FOCUS_MODE,
	name = "FLAG_LOCAL_FOCUS_MODE")		name = "FLAG_LOCAL_FOCUS_MODE"),
			@ViewDebug.FlagToString(mask = FLAG_TRANSLUCENT_STATUS, equals = FLAG_TRANSLUCENT_STATUS,
			name = "FLAG_TRANSLUCENT_STATUS"),
			@ViewDebug.FlagToString(mask = FLAG_TRANSLUCENT_NAVIGATION, equals = FLAG_TRANSLUCENT_NAVIGATION,
			name = "FLAG_TRANSLUCENT_NAVIGATION")
	})		})
	public int flags;		public int flags;

	@@ -1046,6 +1088,11 @@ public interface WindowManager extends ViewManager {
	* {@hide} */		* {@hide} */
	public static final int PRIVATE_FLAG_SYSTEM_ERROR = 0x00000100;		public static final int PRIVATE_FLAG_SYSTEM_ERROR = 0x00000100;

			/** Window flag: maintain the previous transparent decor state when this window
			* becomes top-most.
			* {@hide} */
			public static final int PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR = 0x00000200;

	/**		/**
	* Control flags that are private to the platform.		* Control flags that are private to the platform.
	* @hide		* @hide
	@@ -1576,6 +1623,8 @@ public interface WindowManager extends ViewManager {
	/** {@hide} */		/** {@hide} */
	public static final int USER_ACTIVITY_TIMEOUT_CHANGED = 1<<18;		public static final int USER_ACTIVITY_TIMEOUT_CHANGED = 1<<18;
	/** {@hide} */		/** {@hide} */
			public static final int TRANSLUCENT_FLAGS_CHANGED = 1<<19;
			/** {@hide} */
	public static final int EVERYTHING_CHANGED = 0xffffffff;		public static final int EVERYTHING_CHANGED = 0xffffffff;

	// internal buffer to backup/restore parameters under compatibility mode.		// internal buffer to backup/restore parameters under compatibility mode.
	@@ -1621,6 +1670,10 @@ public interface WindowManager extends ViewManager {
	changes \|= TYPE_CHANGED;		changes \|= TYPE_CHANGED;
	}		}
	if (flags != o.flags) {		if (flags != o.flags) {
			final int diff = flags ^ o.flags;
			if ((diff & (FLAG_TRANSLUCENT_STATUS \| FLAG_TRANSLUCENT_NAVIGATION)) != 0) {
			changes \|= TRANSLUCENT_FLAGS_CHANGED;
			}
	flags = o.flags;		flags = o.flags;
	changes \|= FLAGS_CHANGED;		changes \|= FLAGS_CHANGED;
	}		}

core/res/res/values/attrs.xml

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -439,6 +439,14 @@
	or later. -->		or later. -->
	<attr name="windowCloseOnTouchOutside" format="boolean" />		<attr name="windowCloseOnTouchOutside" format="boolean" />

			<!-- Flag indicating whether this window requests a translucent status bar. Corresponds
			to {@link android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_STATUS}. -->
			<attr name="windowTranslucentStatus" format="boolean" />

			<!-- Flag indicating whether this window requests a translucent navigation bar. Corresponds
			to {@link android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_NAVIGATION}. -->
			<attr name="windowTranslucentNavigation" format="boolean" />

	<!-- ============ -->		<!-- ============ -->
	<!-- Alert Dialog styles -->		<!-- Alert Dialog styles -->
	<!-- ============ -->		<!-- ============ -->
	@@ -1594,6 +1602,8 @@
	<attr name="windowSplitActionBar" />		<attr name="windowSplitActionBar" />
	<attr name="windowEnableSplitTouch" />		<attr name="windowEnableSplitTouch" />
	<attr name="windowCloseOnTouchOutside" />		<attr name="windowCloseOnTouchOutside" />
			<attr name="windowTranslucentStatus" />
			<attr name="windowTranslucentNavigation" />
	<!-- The minimum width the window is allowed to be, along the major		<!-- The minimum width the window is allowed to be, along the major
	axis of the screen. That is, when in landscape. Can be either		axis of the screen. That is, when in landscape. Can be either
	an absolute dimension or a fraction of the screen size in that		an absolute dimension or a fraction of the screen size in that