From 5c96320e40285c4e2d5cdfec4134b707527764d9 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Tue, 17 May 2016 13:47:43 -0700 Subject: 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 --- api/current.txt | 2 -- api/system-current.txt | 10 ++++------ api/test-current.txt | 2 -- core/java/android/app/Activity.java | 4 ++++ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/current.txt b/api/current.txt index c808e04ff3c2..762aa5318455 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3479,7 +3479,6 @@ package android.app { method public boolean isInMultiWindowMode(); method public boolean isInPictureInPictureMode(); method public boolean isLocalVoiceInteractionSupported(); - method public boolean isOverlayWithDecorCaptionEnabled(); method public boolean isTaskRoot(); method public boolean isVoiceInteraction(); method public boolean isVoiceInteractionRoot(); @@ -3601,7 +3600,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); 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 setProgressBarIndeterminate(boolean); method public final deprecated void setProgressBarIndeterminateVisibility(boolean); diff --git a/api/system-current.txt b/api/system-current.txt index fa9bdb881aa2..0f9ea4dc0d9a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3606,7 +3606,6 @@ package android.app { method public boolean isInMultiWindowMode(); method public boolean isInPictureInPictureMode(); method public boolean isLocalVoiceInteractionSupported(); - method public boolean isOverlayWithDecorCaptionEnabled(); method public boolean isTaskRoot(); method public boolean isVoiceInteraction(); method public boolean isVoiceInteractionRoot(); @@ -3729,7 +3728,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); 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 setProgressBarIndeterminate(boolean); method public final deprecated void setProgressBarIndeterminateVisibility(boolean); @@ -31762,6 +31760,7 @@ package android.os { method public android.os.UserHandle getUserForSerialNumber(long); method public java.lang.String getUserName(); method public java.util.List getUserProfiles(); + method public int getUserRestrictionSource(java.lang.String, android.os.UserHandle); method public android.os.Bundle getUserRestrictions(); method public android.os.Bundle getUserRestrictions(android.os.UserHandle); 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, android.os.UserHandle); 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 DISALLOW_ADD_USER = "no_add_user"; 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 ENSURE_VERIFY_APPS = "ensure_verify_apps"; 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_SOURCE_SYSTEM = 1; // 0x1 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_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 { diff --git a/api/test-current.txt b/api/test-current.txt index d572c8dc1422..aa9d30507c4b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3479,7 +3479,6 @@ package android.app { method public boolean isInMultiWindowMode(); method public boolean isInPictureInPictureMode(); method public boolean isLocalVoiceInteractionSupported(); - method public boolean isOverlayWithDecorCaptionEnabled(); method public boolean isTaskRoot(); method public boolean isVoiceInteraction(); method public boolean isVoiceInteractionRoot(); @@ -3601,7 +3600,6 @@ package android.app { method public void setImmersive(boolean); method public void setIntent(android.content.Intent); 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 setProgressBarIndeterminate(boolean); method public final deprecated void setProgressBarIndeterminateVisibility(boolean); diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 59edc8c48ee5..6d405f6bbd0e 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -7007,6 +7007,8 @@ public class Activity extends ContextThemeWrapper * @return True if caption is displayed on content, false if it pushes the content down. * * @see {@link #setOverlayWithDecorCaptionEnabled(boolean)} + * + * @hide */ public boolean 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 * window of the activity. The caption is used to drag the window around and also shows * maximize and close action buttons. + * + * @hide */ public void setOverlayWithDecorCaptionEnabled(boolean enabled) { mWindow.setOverlayWithDecorCaptionEnabled(enabled); -- cgit v1.2.3-59-g8ed1b