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

Commit b570a799 authored by Massimo Carli's avatar Massimo Carli Committed by Android (Google) Code Review
Browse files

Merge "[52/n] Simplify LetterboxOverrides naming" into main

parents 947277bc fe3c1c44

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −2
Original line number Diff line number Diff line
@@ -1820,8 +1820,7 @@ final class ActivityRecord extends WindowToken { 
    }



    boolean hasWallpaperBackgroundForLetterbox() {

        return mAppCompatController.getAppCompatLetterboxOverrides()

                .hasWallpaperBackgroundForLetterbox();

        return mAppCompatController.getLetterboxOverrides().hasWallpaperBackgroundForLetterbox();

    }



    void updateLetterboxSurfaceIfNeeded(WindowState winHint, Transaction t) {

services/core/java/com/android/server/wm/AppCompatController.java

+2 −2
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ class AppCompatController { 
    }



    @NonNull

    AppCompatLetterboxOverrides getAppCompatLetterboxOverrides() {

        return mAppCompatOverrides.getAppCompatLetterboxOverrides();

    AppCompatLetterboxOverrides getLetterboxOverrides() {

        return mAppCompatOverrides.getLetterboxOverrides();

    }



    @NonNull

services/core/java/com/android/server/wm/AppCompatLetterboxPolicy.java

+3 −3
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class AppCompatLetterboxPolicy { 
                + AppCompatUtils.getLetterboxReasonString(mActivityRecord, mainWin));

        mActivityRecord.mAppCompatController.getReachabilityPolicy().dump(pw, prefix);

        final AppCompatLetterboxOverrides letterboxOverride = mActivityRecord.mAppCompatController

                .getAppCompatLetterboxOverrides();

                .getLetterboxOverrides();

        pw.println(prefix + "  letterboxBackgroundColor=" + Integer.toHexString(

                letterboxOverride.getLetterboxBackgroundColor().toArgb()));

        pw.println(prefix + "  letterboxBackgroundType="
@@ -276,7 +276,7 @@ class AppCompatLetterboxPolicy { 


    private void updateWallpaperForLetterbox(@NonNull WindowState mainWindow) {

        final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord

                .mAppCompatController.getAppCompatLetterboxOverrides();

                .mAppCompatController.getLetterboxOverrides();

        final @LetterboxBackgroundType int letterboxBackgroundType =

                letterboxOverrides.getLetterboxBackgroundType();

        boolean wallpaperShouldBeShown =
@@ -324,7 +324,7 @@ class AppCompatLetterboxPolicy { 
        public void layoutLetterboxIfNeeded(@NonNull WindowState w) {

            if (!isRunning()) {

                final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord

                        .mAppCompatController.getAppCompatLetterboxOverrides();

                        .mAppCompatController.getLetterboxOverrides();

                final AppCompatReachabilityPolicy reachabilityPolicy = mActivityRecord

                        .mAppCompatController.getReachabilityPolicy();

                mLetterbox = new Letterbox(() -> mActivityRecord.makeChildSurface(null),

services/core/java/com/android/server/wm/AppCompatOverrides.java

+4 −4
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class AppCompatOverrides { 
    @NonNull

    private final AppCompatReachabilityOverrides mReachabilityOverrides;

    @NonNull

    private final AppCompatLetterboxOverrides mAppCompatLetterboxOverrides;

    private final AppCompatLetterboxOverrides mLetterboxOverrides;



    AppCompatOverrides(@NonNull ActivityRecord activityRecord,

            @NonNull PackageManager packageManager,
@@ -59,7 +59,7 @@ public class AppCompatOverrides { 
                optPropBuilder);

        mResizeOverrides = new AppCompatResizeOverrides(activityRecord, packageManager,

                optPropBuilder);

        mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,

        mLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,

                appCompatConfiguration);

    }
@@ -94,7 +94,7 @@ public class AppCompatOverrides { 
    }



    @NonNull

    AppCompatLetterboxOverrides getAppCompatLetterboxOverrides() {

        return mAppCompatLetterboxOverrides;

    AppCompatLetterboxOverrides getLetterboxOverrides() {

        return mLetterboxOverrides;

    }

}

services/core/java/com/android/server/wm/AppCompatRoundedCorners.java

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ class AppCompatRoundedCorners { 
            return 0;

        }

        final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord

                .mAppCompatController.getAppCompatLetterboxOverrides();

                .mAppCompatController.getLetterboxOverrides();

        final int radius;

        if (letterboxOverrides.getLetterboxActivityCornersRadius() >= 0) {

            radius = letterboxOverrides.getLetterboxActivityCornersRadius();
@@ -135,7 +135,7 @@ class AppCompatRoundedCorners { 


    private boolean requiresRoundedCorners(@NonNull final WindowState mainWindow) {

        final AppCompatLetterboxOverrides letterboxOverrides = mActivityRecord

                .mAppCompatController.getAppCompatLetterboxOverrides();

                .mAppCompatController.getLetterboxOverrides();

        return mIsLetterboxedNotForDisplayCutout.test(mainWindow)

                && letterboxOverrides.isLetterboxActivityCornersRounded();

    }