Merge "Fix attr inheritShowWhenLocked cannot read from manifest." (ea9ae255) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		/**
		* Bit in {@link #privateFlags} indicating if the activity should be shown when locked in case
		* an activity behind this can also be shown when locked.
		* See android.R.attr#inheritShowWhenLocked
		* See {@link android.R.attr#inheritShowWhenLocked}.
		* @hide
		*/
		public static final int FLAG_INHERIT_SHOW_WHEN_LOCKED = 0x1;

core/res/res/values/attrs_manifest.xml

+11 −12

Original line number	Diff line number	Diff line
		@@ -950,6 +950,17 @@
		<p>The default value of this attribute is <code>false</code>. -->
		<attr name="allowEmbedded" format="boolean" />

		<!-- @hide @SystemApi Specifies whether this {@link android.app.Activity} should be shown on
		top of the lock screen whenever the lockscreen is up and this activity has another
		activity behind it with the {@link android.R.attr#showWhenLocked} attribute set. That
		is, this activity is only visible on the lock screen if there is another activity with
		the {@link android.R.attr#showWhenLocked} attribute visible at the same time on the
		lock screen. A use case for this is permission dialogs, that should only be visible on
		the lock screen if their requesting activity is also visible.

		<p>The default value of this attribute is <code>false</code>. -->
		<attr name="inheritShowWhenLocked" format="boolean" />

		<!-- Descriptive text for the associated data. -->
		<attr name="description" format="reference" />

		@@ -2415,18 +2426,6 @@
		<attr name="showForAllUsers" />

		<attr name="showWhenLocked" />
		<!-- @hide @SystemApi Specifies whether this {@link android.app.Activity} should be shown on
		top of the lock screen whenever the lockscreen is up and this activity has another
		activity behind it with the {@link android.R.attr#showWhenLocked} attribute set. That
		is, this activity is only visible on the lock screen if there is another activity with
		the {@link android.R.attr#showWhenLocked} attribute visible at the same time on the
		lock screen. A use case for this is permission dialogs, that should only be visible on
		the lock screen if their requesting activity is also visible.

		The default value of this attribute is <code>false</code>. -->
		<attr name="inheritShowWhenLocked" format="boolean" />


		<attr name="inheritShowWhenLocked" />
		<attr name="turnScreenOn" />