Merge "Introduce new transparent bars sysui flags." (166bc5b6) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

core/java/android/view/View.java

+24 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2379,9 +2379,27 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* when hiding the status bar with {@link #SYSTEM_UI_FLAG_FULLSCREEN} and/or hiding the		* when hiding the status bar with {@link #SYSTEM_UI_FLAG_FULLSCREEN} and/or hiding the
	* navigation bar with {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION} instead of having the system		* navigation bar with {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION} instead of having the system
	* clear these flags upon interaction. The system may compensate by temporarily overlaying		* clear these flags upon interaction. The system may compensate by temporarily overlaying
	* transparent system ui while also delivering the event.		* transparent system bars while also delivering the event.
	*/		*/
	public static final int SYSTEM_UI_FLAG_ALLOW_OVERLAY = 0x00000800;		public static final int SYSTEM_UI_FLAG_ALLOW_TRANSIENT = 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_ALLOW_TRANSIENT transient 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_ALLOW_TRANSIENT transient 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.
	@@ -2508,11 +2526,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked		* 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.		* out of the public fields to keep the undefined bits out of the developer's way.
	*		*
	* Flag to specify that the status bar should temporarily overlay underlying content		* Flag to specify that the status bar is displayed in transient mode.
	* that is otherwise assuming the status bar is hidden. The status bar may
	* have some degree of transparency while in this temporary overlay mode.
	*/		*/
	public static final int STATUS_BAR_OVERLAY = 0x04000000;		public static final int STATUS_BAR_TRANSIENT = 0x04000000;

	/**		/**
	* @hide		* @hide
	@@ -2520,11 +2536,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	* NOTE: This flag may only be used in subtreeSystemUiVisibility. It is masked		* 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.		* out of the public fields to keep the undefined bits out of the developer's way.
	*		*
	* Flag to specify that the navigation bar should temporarily overlay underlying content		* Flag to specify that the navigation bar is displayed in transient mode.
	* that is otherwise assuming the navigation bar is hidden. The navigation bar mayu
	* have some degree of transparency while in this temporary overlay mode.
	*/		*/
	public static final int NAVIGATION_BAR_OVERLAY = 0x08000000;		public static final int NAVIGATION_BAR_TRANSIENT = 0x08000000;

	/**		/**
	* @hide		* @hide

packages/SystemUI/res/values-land/refs.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,5 +16,5 @@
	*/		*/
	-->		-->
	<resources>		<resources>
	<item type="string" name="hideybar_confirmation_message">@string/hideybar_confirmation_message_long</item>		<item type="string" name="hiding_navigation_confirmation_message">@string/hiding_navigation_confirmation_message_long</item>
	</resources>		</resources>

packages/SystemUI/res/values-sw600dp-port/refs.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,5 +16,5 @@
	*/		*/
	-->		-->
	<resources>		<resources>
	<item type="string" name="hideybar_confirmation_message">@string/hideybar_confirmation_message_long</item>		<item type="string" name="hiding_navigation_confirmation_message">@string/hiding_navigation_confirmation_message_long</item>
	</resources>		</resources>

packages/SystemUI/res/values/strings.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -502,8 +502,8 @@
	<string name="status_bar_help_text">Access them anytime by swiping down.\nSwipe down again for system controls.</string>		<string name="status_bar_help_text">Access them anytime by swiping down.\nSwipe down again for system controls.</string>

	<!-- Toast bar message when hiding the navigation bar -->		<!-- Toast bar message when hiding the navigation bar -->
	<string name="hideybar_confirmation_message">Swipe edge of screen to reveal bar</string>		<string name="hiding_navigation_confirmation_message">Swipe edge of screen to reveal bar</string>

	<!-- Longer version of toast bar message when hiding the navigation bar (if room) -->		<!-- Longer version of toast bar message when hiding the navigation bar (if room) -->
	<string name="hideybar_confirmation_message_long">Swipe from edge of screen to reveal system bar</string>		<string name="hiding_navigation_confirmation_message_long">Swipe from edge of screen to reveal system bar</string>
	</resources>		</resources>