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

Commit 5c96320e authored by Andrii Kulian's avatar Andrii Kulian
Browse files

DO NOT MERGE Hide decor caption APIs 

Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.

Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
parent 7996b963

api/current.txt

+0 −2
Original line number Original line Diff line number Diff line
@@ -3479,7 +3479,6 @@ package android.app { 
    method public boolean isInMultiWindowMode();

    method public boolean isInMultiWindowMode();

    method public boolean isInPictureInPictureMode();

    method public boolean isInPictureInPictureMode();

    method public boolean isLocalVoiceInteractionSupported();

    method public boolean isLocalVoiceInteractionSupported();

    method public boolean isOverlayWithDecorCaptionEnabled();

    method public boolean isTaskRoot();

    method public boolean isTaskRoot();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteractionRoot();

    method public boolean isVoiceInteractionRoot();
@@ -3601,7 +3600,6 @@ package android.app { 
    method public void setImmersive(boolean);

    method public void setImmersive(boolean);

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

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

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

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

    method public void setOverlayWithDecorCaptionEnabled(boolean);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgressBarIndeterminate(boolean);

    method public final deprecated void setProgressBarIndeterminate(boolean);

    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);

    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);

api/system-current.txt

+4 −6
Original line number Original line Diff line number Diff line
@@ -3606,7 +3606,6 @@ package android.app { 
    method public boolean isInMultiWindowMode();

    method public boolean isInMultiWindowMode();

    method public boolean isInPictureInPictureMode();

    method public boolean isInPictureInPictureMode();

    method public boolean isLocalVoiceInteractionSupported();

    method public boolean isLocalVoiceInteractionSupported();

    method public boolean isOverlayWithDecorCaptionEnabled();

    method public boolean isTaskRoot();

    method public boolean isTaskRoot();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteraction();

    method public boolean isVoiceInteractionRoot();

    method public boolean isVoiceInteractionRoot();
@@ -3729,7 +3728,6 @@ package android.app { 
    method public void setImmersive(boolean);

    method public void setImmersive(boolean);

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

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

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

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

    method public void setOverlayWithDecorCaptionEnabled(boolean);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgressBarIndeterminate(boolean);

    method public final deprecated void setProgressBarIndeterminate(boolean);

    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);

    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);
@@ -31762,6 +31760,7 @@ package android.os { 
    method public android.os.UserHandle getUserForSerialNumber(long);

    method public android.os.UserHandle getUserForSerialNumber(long);

    method public java.lang.String getUserName();

    method public java.lang.String getUserName();

    method public java.util.List<android.os.UserHandle> getUserProfiles();

    method public java.util.List<android.os.UserHandle> getUserProfiles();

    method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle);

    method public android.os.Bundle getUserRestrictions();

    method public android.os.Bundle getUserRestrictions();

    method public android.os.Bundle getUserRestrictions(android.os.UserHandle);

    method public android.os.Bundle getUserRestrictions(android.os.UserHandle);

    method public boolean hasUserRestriction(java.lang.String);

    method public boolean hasUserRestriction(java.lang.String);
@@ -31779,7 +31778,6 @@ package android.os { 
    method public deprecated void setUserRestrictions(android.os.Bundle);

    method public deprecated void setUserRestrictions(android.os.Bundle);

    method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    method public deprecated void setUserRestrictions(android.os.Bundle, android.os.UserHandle);

    method public static boolean supportsMultipleUsers();

    method public static boolean supportsMultipleUsers();

    method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle);

    field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";

    field public static final java.lang.String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";

    field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";

    field public static final java.lang.String DISALLOW_ADD_USER = "no_add_user";

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";

    field public static final java.lang.String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
@@ -31815,12 +31813,12 @@ package android.os { 
    field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";

    field public static final java.lang.String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";

    field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";

    field public static final java.lang.String ENSURE_VERIFY_APPS = "ensure_verify_apps";

    field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending";

    field public static final java.lang.String KEY_RESTRICTIONS_PENDING = "restrictions_pending";

    field public static final int USER_CREATION_FAILED_NOT_PERMITTED = 1; // 0x1

    field public static final int USER_CREATION_FAILED_NO_MORE_USERS = 2; // 0x2

    field public static final int RESTRICTION_NOT_SET = 0; // 0x0

    field public static final int RESTRICTION_NOT_SET = 0; // 0x0

    field public static final int RESTRICTION_SOURCE_SYSTEM = 1; // 0x1

    field public static final int RESTRICTION_SOURCE_DEVICE_OWNER = 2; // 0x2

    field public static final int RESTRICTION_SOURCE_DEVICE_OWNER = 2; // 0x2

    field public static final int RESTRICTION_SOURCE_PROFILE_OWNER = 4; // 0x4

    field public static final int RESTRICTION_SOURCE_PROFILE_OWNER = 4; // 0x4

    field public static final int RESTRICTION_SOURCE_SYSTEM = 1; // 0x1

    field public static final int USER_CREATION_FAILED_NOT_PERMITTED = 1; // 0x1

    field public static final int USER_CREATION_FAILED_NO_MORE_USERS = 2; // 0x2

  }

  }

















  public static abstract class UserManager.UserRestrictionSource implements java.lang.annotation.Annotation {







  public static abstract class UserManager.UserRestrictionSource implements java.lang.annotation.Annotation {

























api/test-current.txt



+0
−2




























Original line number
Original line
Diff line number
Diff line








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









    method public boolean isInMultiWindowMode();







    method public boolean isInMultiWindowMode();











    method public boolean isInPictureInPictureMode();







    method public boolean isInPictureInPictureMode();











    method public boolean isLocalVoiceInteractionSupported();







    method public boolean isLocalVoiceInteractionSupported();











    method public boolean isOverlayWithDecorCaptionEnabled();














    method public boolean isTaskRoot();







    method public boolean isTaskRoot();











    method public boolean isVoiceInteraction();







    method public boolean isVoiceInteraction();











    method public boolean isVoiceInteractionRoot();







    method public boolean isVoiceInteractionRoot();










@@ -3601,7 +3600,6 @@ package android.app {









    method public void setImmersive(boolean);







    method public void setImmersive(boolean);











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







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











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







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











    method public void setOverlayWithDecorCaptionEnabled(boolean);














    method public final deprecated void setProgress(int);







    method public final deprecated void setProgress(int);











    method public final deprecated void setProgressBarIndeterminate(boolean);







    method public final deprecated void setProgressBarIndeterminate(boolean);











    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);







    method public final deprecated void setProgressBarIndeterminateVisibility(boolean);

























core/java/android/app/Activity.java



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -7007,6 +7007,8 @@ public class Activity extends ContextThemeWrapper









     * @return True if caption is displayed on content, false if it pushes the content down.







     * @return True if caption is displayed on content, false if it pushes the content down.











     *







     *











     * @see {@link #setOverlayWithDecorCaptionEnabled(boolean)}







     * @see {@link #setOverlayWithDecorCaptionEnabled(boolean)}














     *














     * @hide











     */







     */











    public boolean isOverlayWithDecorCaptionEnabled() {







    public boolean isOverlayWithDecorCaptionEnabled() {











        return mWindow.isOverlayWithDecorCaptionEnabled();







        return mWindow.isOverlayWithDecorCaptionEnabled();









@@ -7018,6 +7020,8 @@ public class Activity extends ContextThemeWrapper









     * This affects only freeform windows since they display the caption and only the main







     * This affects only freeform windows since they display the caption and only the main











     * window of the activity. The caption is used to drag the window around and also shows







     * window of the activity. The caption is used to drag the window around and also shows











     * maximize and close action buttons.







     * maximize and close action buttons.














     *














     * @hide











     */







     */











    public void setOverlayWithDecorCaptionEnabled(boolean enabled) {







    public void setOverlayWithDecorCaptionEnabled(boolean enabled) {











        mWindow.setOverlayWithDecorCaptionEnabled(enabled);







        mWindow.setOverlayWithDecorCaptionEnabled(enabled);