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

Commit 06a325c3 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

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

am: 47aa3f61

* commit '47aa3f61':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
parents 6b10cec2 47aa3f61

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -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);

core/java/android/app/Activity.java

+4 −0
Original line number 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.

     *

     * @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);