Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev

4 files changed, 4 insertions, 6 deletions

diff --git a/api/current.txt b/api/current.txt
index 60068697496c..6a1b1a5270e2 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 0938adc9224f..4a8db4218777 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);
diff --git a/api/test-current.txt b/api/test-current.txt
index 891a83ddafc3..9959cfaca627 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);