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

Commit a80fd227 authored by Lingyu Feng's avatar Lingyu Feng Committed by Android (Google) Code Review
Browse files

Merge "Remove IWindowManager#setShouldShowSystemDecors" into main

parents 4488d3cb ede4e8bf

core/api/test-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -3994,7 +3994,6 @@ package android.view { 
    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithMirror(int, @NonNull android.view.Window);

    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithMirror(int, @NonNull android.view.Window);

    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithSc(int, @NonNull android.view.SurfaceControl);

    method @RequiresPermission(android.Manifest.permission.ACCESS_SURFACE_FLINGER) public default boolean replaceContentOnDisplayWithSc(int, @NonNull android.view.SurfaceControl);

    method public default void setDisplayImePolicy(int, int);

    method public default void setDisplayImePolicy(int, int);

    method public default void setShouldShowSystemDecors(int, boolean);

    method public default void setShouldShowWithInsecureKeyguard(int, boolean);

    method public default void setShouldShowWithInsecureKeyguard(int, boolean);

    method public default boolean shouldShowSystemDecors(int);

    method public default boolean shouldShowSystemDecors(int);

    method @Nullable public default android.graphics.Bitmap snapshotTaskForRecents(@IntRange(from=0) int);

    method @Nullable public default android.graphics.Bitmap snapshotTaskForRecents(@IntRange(from=0) int);

core/java/android/view/IWindowManager.aidl

+0 −11
Original line number Original line Diff line number Diff line
@@ -741,17 +741,6 @@ interface IWindowManager 
     */

     */

    boolean shouldShowSystemDecors(int displayId);

    boolean shouldShowSystemDecors(int displayId);





    /**

     * Sets that the display should show system decors.

     * <p>

     * System decors include status bar, navigation bar, launcher.

     * </p>

     *

     * @param displayId The id of the display.

     * @param shouldShow Indicates that the display should show system decors.

     */

    void setShouldShowSystemDecors(int displayId, boolean shouldShow);



    /**

    /**

     * Indicates that the display is eligible for the desktop mode from WindowManager's perspective.

     * Indicates that the display is eligible for the desktop mode from WindowManager's perspective.

     * This includes:

     * This includes:

core/java/android/view/WindowManager.java

+0 −16
Original line number Original line Diff line number Diff line
@@ -1761,21 +1761,6 @@ public interface WindowManager extends ViewManager { 
    default void setShouldShowWithInsecureKeyguard(int displayId, boolean shouldShow) {

    default void setShouldShowWithInsecureKeyguard(int displayId, boolean shouldShow) {

    }

    }





    /**

     * Sets that the display should show system decors.

     * <p>

     * System decors include status bar, navigation bar, launcher.

     * </p>

     *

     * @param displayId The id of the display.

     * @param shouldShow Indicates that the display should show system decors.

     * @see #shouldShowSystemDecors(int)

     * @hide

     */

    @TestApi

    default void setShouldShowSystemDecors(int displayId, boolean shouldShow) {

    }



    /**

    /**

     * Checks if the display supports showing system decors.

     * Checks if the display supports showing system decors.

     * <p>

     * <p>
@@ -1783,7 +1768,6 @@ public interface WindowManager extends ViewManager { 
     * </p>

     * </p>

     *

     *

     * @param displayId The id of the display.

     * @param displayId The id of the display.

     * @see #setShouldShowSystemDecors(int, boolean)

     * @hide

     * @hide

     */

     */

    @TestApi

    @TestApi

core/java/android/view/WindowManagerImpl.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -321,15 +321,6 @@ public final class WindowManagerImpl implements WindowManager { 
        }

        }

    }

    }





    @Override

    public void setShouldShowSystemDecors(int displayId, boolean shouldShow) {

        try {

            WindowManagerGlobal.getWindowManagerService()

                    .setShouldShowSystemDecors(displayId, shouldShow);

        } catch (RemoteException e) {

        }

    }



    @Override

    @Override

    public boolean shouldShowSystemDecors(int displayId) {

    public boolean shouldShowSystemDecors(int displayId) {

        try {

        try {

core/java/android/view/WindowManagerWrapper.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -129,11 +129,6 @@ public class WindowManagerWrapper implements WindowManager { 
        mBase.setShouldShowWithInsecureKeyguard(displayId, shouldShow);

        mBase.setShouldShowWithInsecureKeyguard(displayId, shouldShow);

    }

    }





    @Override

    public void setShouldShowSystemDecors(int displayId, boolean shouldShow) {

        mBase.setShouldShowSystemDecors(displayId, shouldShow);

    }



    @Override

    @Override

    public boolean shouldShowSystemDecors(int displayId) {

    public boolean shouldShowSystemDecors(int displayId) {

        return mBase.shouldShowSystemDecors(displayId);

        return mBase.shouldShowSystemDecors(displayId);