Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d23038e5 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge "Made inheritShowWhenLocked() API public."

parents 46835775 7c09f0b8

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -768,6 +768,7 @@ package android { 
    field public static final int indicatorRight = 16843022; // 0x101010e

    field public static final int indicatorStart = 16843729; // 0x10103d1

    field public static final int inflatedId = 16842995; // 0x10100f3

    field public static final int inheritShowWhenLocked = 16844194; // 0x10105a2

    field public static final int initOrder = 16842778; // 0x101001a

    field public static final int initialKeyguardLayout = 16843714; // 0x10103c2

    field public static final int initialLayout = 16843345; // 0x1010251
@@ -3850,6 +3851,7 @@ package android.app { 
    method public final void setFeatureDrawableUri(int, android.net.Uri);

    method public void setFinishOnTouchOutside(boolean);

    method public void setImmersive(boolean);

    method public void setInheritShowWhenLocked(boolean);

    method public void setIntent(android.content.Intent);

    method public final void setMediaController(android.media.session.MediaController);

    method public void setPictureInPictureParams(@NonNull android.app.PictureInPictureParams);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ package android { 














  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844198; // 0x10105a6













    field public static final int inheritShowWhenLocked = 16844194; // 0x10105a2















    field public static final int isVrOnly = 16844152; // 0x1010578















    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565















    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566










@@ -281,7 +280,6 @@ package android.app {













    method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);















    method @Deprecated public boolean isBackgroundVisibleBehind();















    method @Deprecated public void onBackgroundVisibleBehindChanged(boolean);













    method public void setInheritShowWhenLocked(boolean);















  }





























  public static interface Activity.TranslucentConversionListener {

































api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -41,7 +41,6 @@ package android.app {





























  public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {















    method public void onMovedToDisplay(int, android.content.res.Configuration);













    method public void setInheritShowWhenLocked(boolean);















  }































  public class ActivityManager {

































core/java/android/app/Activity.java



+1
−4




























Original line number
Diff line number
Diff line








@@ -8366,11 +8366,8 @@ public class Activity extends ContextThemeWrapper













     *                              screen when this activity has another activity behind it with















     *                              the showWhenLock attribute set; {@code false} otherwise.















     * @see #setShowWhenLocked(boolean)













     * See android.R.attr#inheritShowWhenLocked













     * @hide













     * @see android.R.attr#inheritShowWhenLocked















     */













    @SystemApi













    @TestApi















    public void setInheritShowWhenLocked(boolean inheritShowWhenLocked) {















        try {















            ActivityTaskManager.getService().setInheritShowWhenLocked(

































core/res/res/values/attrs_manifest.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -965,7 +965,7 @@













         <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













    <!-- 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