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

Commit 8f8c43bd authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Continue to @hide freeform decor caption APIs" into oc-dev 

am: 302ba2d3

Change-Id: I98135d6354a269669e176d9f4dee5b825578ff22
parents 6120510e 302ba2d3

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -3635,7 +3635,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();
@@ -3760,7 +3759,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 void setPictureInPictureArgs(android.app.PictureInPictureArgs);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgressBarIndeterminate(boolean);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -3767,7 +3767,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();
@@ -3894,7 +3893,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 void setPictureInPictureArgs(android.app.PictureInPictureArgs);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgressBarIndeterminate(boolean);

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -3637,7 +3637,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();
@@ -3762,7 +3761,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 void setPictureInPictureArgs(android.app.PictureInPictureArgs);

    method public final deprecated void setProgress(int);

    method public final deprecated void setProgressBarIndeterminate(boolean);

core/java/android/app/Activity.java

+2 −0
Original line number Diff line number Diff line
@@ -7320,6 +7320,7 @@ public class Activity extends ContextThemeWrapper 
     * @return True if caption is displayed on content, false if it pushes the content down.

     *

     * @see #setOverlayWithDecorCaptionEnabled(boolean)

     * @hide

     */

    public boolean isOverlayWithDecorCaptionEnabled() {

        return mWindow.isOverlayWithDecorCaptionEnabled();
@@ -7331,6 +7332,7 @@ 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);