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

Commit 95eb7cd4 authored by Massimo Carli's avatar Massimo Carli
Browse files

[28/n] Create Policy and Overrides for Letterboxing 

Creates AppCompatLetterboxPolicy and AppCompatLetterboxOverrides
classes. Keeps the existing tests.

Flag: EXEMPT refactor
Bug: 356385137
Test: atest WmTests:LetterboxUiControllerTest
Test: atest WmTests:SizeCompatTests
Test: atest WmTests:AppCompatUtilsTest
Test: atest WmTests:LetterboxTest

Change-Id: I74597dcf4569dc50704961564e4653cb35ff28fe
parent 2e9983c5

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

+14 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ class AppCompatController { 
    private final AppCompatOverrides mAppCompatOverrides;

    @NonNull

    private final AppCompatDeviceStateQuery mAppCompatDeviceStateQuery;

    @NonNull

    private final AppCompatLetterboxPolicy mAppCompatLetterboxPolicy;



    AppCompatController(@NonNull WindowManagerService wmService,

                        @NonNull ActivityRecord activityRecord) {
@@ -57,6 +59,8 @@ class AppCompatController { 
                mTransparentPolicy, mAppCompatOverrides);

        mAppCompatReachabilityPolicy = new AppCompatReachabilityPolicy(mActivityRecord,

                wmService.mAppCompatConfiguration);

        mAppCompatLetterboxPolicy = new AppCompatLetterboxPolicy(mActivityRecord,

                mTransparentPolicy);

    }



    @NonNull
@@ -112,6 +116,11 @@ class AppCompatController { 
        return mAppCompatReachabilityPolicy;

    }



    @NonNull

    AppCompatLetterboxPolicy getAppCompatLetterboxPolicy() {

        return mAppCompatLetterboxPolicy;

    }



    @NonNull

    AppCompatFocusOverrides getAppCompatFocusOverrides() {

        return mAppCompatOverrides.getAppCompatFocusOverrides();
@@ -127,4 +136,9 @@ class AppCompatController { 
        return mAppCompatDeviceStateQuery;

    }



    @NonNull

    AppCompatLetterboxOverrides getAppCompatLetterboxOverrides() {

        return mAppCompatOverrides.getAppCompatLetterboxOverrides();

    }



}

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

0 → 100644
+147 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm;



import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;

import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND;

import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING;

import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_SOLID_COLOR;

import static com.android.server.wm.AppCompatConfiguration.LETTERBOX_BACKGROUND_WALLPAPER;



import android.annotation.NonNull;

import android.app.ActivityManager;

import android.graphics.Color;

import android.util.Slog;

import android.view.WindowManager;



import com.android.server.wm.AppCompatConfiguration.LetterboxBackgroundType;



/**

 * Encapsulates overrides and configuration related to the Letterboxing policy.

 */

class AppCompatLetterboxOverrides {



    private static final String TAG = TAG_WITH_CLASS_NAME ? "AppCompatLetterboxOverrides" : TAG_ATM;



    @NonNull

    private final ActivityRecord mActivityRecord;

    @NonNull

    private final AppCompatConfiguration mAppCompatConfiguration;



    private boolean mShowWallpaperForLetterboxBackground;



    AppCompatLetterboxOverrides(@NonNull ActivityRecord activityRecord,

            @NonNull AppCompatConfiguration appCompatConfiguration) {

        mActivityRecord = activityRecord;

        mAppCompatConfiguration = appCompatConfiguration;

    }



    boolean shouldLetterboxHaveRoundedCorners() {

        // TODO(b/214030873): remove once background is drawn for transparent activities

        // Letterbox shouldn't have rounded corners if the activity is transparent

        return mAppCompatConfiguration.isLetterboxActivityCornersRounded()

                && mActivityRecord.fillsParent();

    }



    boolean isLetterboxEducationEnabled() {

        return mAppCompatConfiguration.getIsEducationEnabled();

    }



    boolean hasWallpaperBackgroundForLetterbox() {

        return mShowWallpaperForLetterboxBackground;

    }



    boolean checkWallpaperBackgroundForLetterbox(boolean wallpaperShouldBeShown) {

        if (mShowWallpaperForLetterboxBackground != wallpaperShouldBeShown) {

            mShowWallpaperForLetterboxBackground = wallpaperShouldBeShown;

            return true;

        }

        return false;

    }



    @NonNull

    Color getLetterboxBackgroundColor() {

        final WindowState w = mActivityRecord.findMainWindow();

        if (w == null || w.isLetterboxedForDisplayCutout()) {

            return Color.valueOf(Color.BLACK);

        }

        final @LetterboxBackgroundType int letterboxBackgroundType =

                mAppCompatConfiguration.getLetterboxBackgroundType();

        final ActivityManager.TaskDescription taskDescription = mActivityRecord.taskDescription;

        switch (letterboxBackgroundType) {

            case LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING:

                if (taskDescription != null && taskDescription.getBackgroundColorFloating() != 0) {

                    return Color.valueOf(taskDescription.getBackgroundColorFloating());

                }

                break;

            case LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND:

                if (taskDescription != null && taskDescription.getBackgroundColor() != 0) {

                    return Color.valueOf(taskDescription.getBackgroundColor());

                }

                break;

            case LETTERBOX_BACKGROUND_WALLPAPER:

                if (hasWallpaperBackgroundForLetterbox()) {

                    // Color is used for translucent scrim that dims wallpaper.

                    return mAppCompatConfiguration.getLetterboxBackgroundColor();

                }

                Slog.w(TAG, "Wallpaper option is selected for letterbox background but "

                        + "blur is not supported by a device or not supported in the current "

                        + "window configuration or both alpha scrim and blur radius aren't "

                        + "provided so using solid color background");

                break;

            case LETTERBOX_BACKGROUND_SOLID_COLOR:

                return mAppCompatConfiguration.getLetterboxBackgroundColor();

            default:

                throw new AssertionError(

                        "Unexpected letterbox background type: " + letterboxBackgroundType);

        }

        // If picked option configured incorrectly or not supported then default to a solid color

        // background.

        return mAppCompatConfiguration.getLetterboxBackgroundColor();

    }



    int getLetterboxActivityCornersRadius() {

        return mAppCompatConfiguration.getLetterboxActivityCornersRadius();

    }



    boolean isLetterboxActivityCornersRounded() {

        return mAppCompatConfiguration.isLetterboxActivityCornersRounded();

    }



    @LetterboxBackgroundType

    int getLetterboxBackgroundType() {

        return mAppCompatConfiguration.getLetterboxBackgroundType();

    }



    int getLetterboxWallpaperBlurRadiusPx() {

        int blurRadius = mAppCompatConfiguration.getLetterboxBackgroundWallpaperBlurRadiusPx();

        return Math.max(blurRadius, 0);

    }



    float getLetterboxWallpaperDarkScrimAlpha() {

        float alpha = mAppCompatConfiguration.getLetterboxBackgroundWallpaperDarkScrimAlpha();

        // No scrim by default.

        return (alpha < 0 || alpha >= 1) ? 0.0f : alpha;

    }



    boolean isLetterboxWallpaperBlurSupported() {

        return mAppCompatConfiguration.mContext.getSystemService(WindowManager.class)

                .isCrossWindowBlurEnabled();

    }



}

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

0 → 100644
+397 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ public class AppCompatOverrides { 
    private final AppCompatResizeOverrides mAppCompatResizeOverrides;

    @NonNull

    private final AppCompatReachabilityOverrides mAppCompatReachabilityOverrides;

    @NonNull

    private final AppCompatLetterboxOverrides mAppCompatLetterboxOverrides;



    AppCompatOverrides(@NonNull ActivityRecord activityRecord,

            @NonNull AppCompatConfiguration appCompatConfiguration,
@@ -54,6 +56,8 @@ public class AppCompatOverrides { 
        mAppCompatFocusOverrides = new AppCompatFocusOverrides(activityRecord,

                appCompatConfiguration, optPropBuilder);

        mAppCompatResizeOverrides = new AppCompatResizeOverrides(activityRecord, optPropBuilder);

        mAppCompatLetterboxOverrides = new AppCompatLetterboxOverrides(activityRecord,

                appCompatConfiguration);

    }



    @NonNull
@@ -85,4 +89,9 @@ public class AppCompatOverrides { 
    AppCompatReachabilityOverrides getAppCompatReachabilityOverrides() {

        return mAppCompatReachabilityOverrides;

    }



    @NonNull

    AppCompatLetterboxOverrides getAppCompatLetterboxOverrides() {

        return mAppCompatLetterboxOverrides;

    }

}

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

+20 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ import android.app.CameraCompatTaskInfo; 
import android.app.TaskInfo;

import android.content.res.Configuration;

import android.graphics.Rect;

import android.view.InsetsSource;

import android.view.InsetsState;

import android.view.WindowInsets;



import java.util.function.BooleanSupplier;
@@ -212,6 +215,23 @@ class AppCompatUtils { 
        return "UNKNOWN_REASON";

    }



    /**

     * Returns the taskbar in case it is visible and expanded in height, otherwise returns null.

     */

    @Nullable

    static InsetsSource getExpandedTaskbarOrNull(@NonNull final WindowState mainWindow) {

        final InsetsState state = mainWindow.getInsetsState();

        for (int i = state.sourceSize() - 1; i >= 0; i--) {

            final InsetsSource source = state.sourceAt(i);

            if (source.getType() == WindowInsets.Type.navigationBars()

                    && source.hasFlags(InsetsSource.FLAG_INSETS_ROUNDED_CORNER)

                    && source.isVisible()) {

                return source;

            }

        }

        return null;

    }



    private static void clearAppCompatTaskInfo(@NonNull AppCompatTaskInfo info) {

        info.topActivityLetterboxVerticalPosition = TaskInfo.PROPERTY_VALUE_UNSET;

        info.topActivityLetterboxHorizontalPosition = TaskInfo.PROPERTY_VALUE_UNSET;