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

Commit f5fc70b4 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281173



Change-Id: I7609dfc9d6cd5e05cf64d9df87820c734a8900c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e0cd33a 4b33be9f

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

+1 −0
Original line number Diff line number Diff line
@@ -6228,6 +6228,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    /**

     * Sets if Display APIs should be sandboxed to the activity window bounds.

     */

    @VisibleForTesting

    void setSandboxDisplayApis(boolean sandboxDisplayApis) {

        mSandboxDisplayApis = sandboxDisplayApis;

    }

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

+8 −129
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.graphics.Color;



import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -156,6 +157,7 @@ final class LetterboxConfiguration { 
     * com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio} will be ignored and

     * the framework implementation will be used to determine the aspect ratio.

     */

    @VisibleForTesting

    void setFixedOrientationLetterboxAspectRatio(float aspectRatio) {

        mFixedOrientationLetterboxAspectRatio = aspectRatio;

    }
@@ -164,6 +166,7 @@ final class LetterboxConfiguration { 
     * Resets the aspect ratio of letterbox for fixed orientation to {@link

     * com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio}.

     */

    @VisibleForTesting

    void resetFixedOrientationLetterboxAspectRatio() {

        mFixedOrientationLetterboxAspectRatio = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio);
@@ -176,25 +179,6 @@ final class LetterboxConfiguration { 
        return mFixedOrientationLetterboxAspectRatio;

    }



    /**

     * Overrides corners raidus for activities presented in the letterbox mode. If given value < 0,

     * both it and a value of {@link

     * com.android.internal.R.integer.config_letterboxActivityCornersRadius} will be ignored and

     * corners of the activity won't be rounded.

     */

    void setLetterboxActivityCornersRadius(int cornersRadius) {

        mLetterboxActivityCornersRadius = cornersRadius;

    }



    /**

     * Resets corners raidus for activities presented in the letterbox mode to {@link

     * com.android.internal.R.integer.config_letterboxActivityCornersRadius}.

     */

    void resetLetterboxActivityCornersRadius() {

        mLetterboxActivityCornersRadius = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_letterboxActivityCornersRadius);

    }



    /**

     * Whether corners of letterboxed activities are rounded.

     */
@@ -226,34 +210,6 @@ final class LetterboxConfiguration { 
        return Color.valueOf(mContext.getResources().getColor(colorId));

    }





    /**

     * Sets color of letterbox background which is used when {@link

     * #getLetterboxBackgroundType()} is {@link #LETTERBOX_BACKGROUND_SOLID_COLOR} or as

     * fallback for other backfround types.

     */

    void setLetterboxBackgroundColor(Color color) {

        mLetterboxBackgroundColorOverride = color;

    }



    /**

     * Sets color ID of letterbox background which is used when {@link

     * #getLetterboxBackgroundType()} is {@link #LETTERBOX_BACKGROUND_SOLID_COLOR} or as

     * fallback for other backfround types.

     */

    void setLetterboxBackgroundColorResourceId(int colorId) {

        mLetterboxBackgroundColorResourceIdOverride = colorId;

    }



    /**

     * Resets color of letterbox background to {@link

     * com.android.internal.R.color.config_letterboxBackgroundColor}.

     */

    void resetLetterboxBackgroundColor() {

        mLetterboxBackgroundColorOverride = null;

        mLetterboxBackgroundColorResourceIdOverride = null;

    }



    /**

     * Gets {@link LetterboxBackgroundType} specified in {@link

     * com.android.internal.R.integer.config_letterboxBackgroundType} or over via ADB command.
@@ -263,19 +219,6 @@ final class LetterboxConfiguration { 
        return mLetterboxBackgroundType;

    }



    /** Sets letterbox background type. */

    void setLetterboxBackgroundType(@LetterboxBackgroundType int backgroundType) {

        mLetterboxBackgroundType = backgroundType;

    }



    /**

     * Resets cletterbox background type to {@link

     * com.android.internal.R.integer.config_letterboxBackgroundType}.

     */

    void resetLetterboxBackgroundType() {

        mLetterboxBackgroundType = readLetterboxBackgroundTypeFromConfig(mContext);

    }



    /** Returns a string representing the given {@link LetterboxBackgroundType}. */

    static String letterboxBackgroundTypeToString(

            @LetterboxBackgroundType int backgroundType) {
@@ -304,27 +247,6 @@ final class LetterboxConfiguration { 
                    ? backgroundType : LETTERBOX_BACKGROUND_SOLID_COLOR;

    }



    /**

     * Overrides alpha of a black scrim shown over wallpaper for {@link

     * #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link mLetterboxBackgroundType}.

     *

     * <p>If given value is < 0 or >= 1, both it and a value of {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha} are ignored

     * and 0.0 (transparent) is instead.

     */

    void setLetterboxBackgroundWallpaperDarkScrimAlpha(float alpha) {

        mLetterboxBackgroundWallpaperDarkScrimAlpha = alpha;

    }



    /**

     * Resets alpha of a black scrim shown over wallpaper letterbox background to {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha}.

     */

    void resetLetterboxBackgroundWallpaperDarkScrimAlpha() {

        mLetterboxBackgroundWallpaperDarkScrimAlpha = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha);

    }



    /**

     * Gets alpha of a black scrim shown over wallpaper letterbox background.

     */
@@ -332,28 +254,6 @@ final class LetterboxConfiguration { 
        return mLetterboxBackgroundWallpaperDarkScrimAlpha;

    }



    /**

     * Overrides blur radius for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in

     * {@link mLetterboxBackgroundType}.

     *

     * <p> If given value <= 0, both it and a value of {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius} are ignored

     * and 0 is used instead.

     */

    void setLetterboxBackgroundWallpaperBlurRadius(int radius) {

        mLetterboxBackgroundWallpaperBlurRadius = radius;

    }



    /**

     * Resets blur raidus for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link

     * mLetterboxBackgroundType} to {@link

     * com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius}.

     */

    void resetLetterboxBackgroundWallpaperBlurRadius() {

        mLetterboxBackgroundWallpaperBlurRadius = mContext.getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.config_letterboxBackgroundWallpaperBlurRadius);

    }



    /**

     * Gets blur raidus for {@link #LETTERBOX_BACKGROUND_WALLPAPER} option in {@link

     * mLetterboxBackgroundType}.
@@ -381,6 +281,7 @@ final class LetterboxConfiguration { 
     * com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier} are ignored and

     * central position (0.5) is used.

     */

    @VisibleForTesting

    void setLetterboxHorizontalPositionMultiplier(float multiplier) {

        mLetterboxHorizontalPositionMultiplier = multiplier;

    }
@@ -389,6 +290,7 @@ final class LetterboxConfiguration { 
     * Resets horizontal position of a center of the letterboxed app window to {@link

     * com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier}.

     */

    @VisibleForTesting

    void resetLetterboxHorizontalPositionMultiplier() {

        mLetterboxHorizontalPositionMultiplier = mContext.getResources().getFloat(

                com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier);
@@ -406,6 +308,7 @@ final class LetterboxConfiguration { 
     * Overrides whether reachability repositioning is allowed for letterboxed fullscreen apps in

     * landscape device orientation.

     */

    @VisibleForTesting

    void setIsReachabilityEnabled(boolean enabled) {

        mIsReachabilityEnabled = enabled;

    }
@@ -414,6 +317,7 @@ final class LetterboxConfiguration { 
     * Resets whether reachability repositioning is allowed for letterboxed fullscreen apps in

     * landscape device orientation to {@link R.bool.config_letterboxIsReachabilityEnabled}.

     */

    @VisibleForTesting

    void resetIsReachabilityEnabled() {

        mIsReachabilityEnabled = mContext.getResources().getBoolean(

                R.bool.config_letterboxIsReachabilityEnabled);
@@ -429,22 +333,6 @@ final class LetterboxConfiguration { 
        return mDefaultPositionForReachability;

    }



    /**

     * Overrides default horizonal position of the letterboxed app window when reachability

     * is enabled.

     */

    void setDefaultPositionForReachability(@LetterboxReachabilityPosition int position) {

        mDefaultPositionForReachability = position;

    }



    /**

     * Resets default horizontal position of the letterboxed app window when reachability is

     * enabled to {@link R.integer.config_letterboxDefaultPositionForReachability}.

     */

    void resetDefaultPositionForReachability() {

        mDefaultPositionForReachability = readLetterboxReachabilityPositionFromConfig(mContext);

    }



    @LetterboxReachabilityPosition

    private static int readLetterboxReachabilityPositionFromConfig(Context context) {

        int position = context.getResources().getInteger(
@@ -516,17 +404,8 @@ final class LetterboxConfiguration { 
    /**

     * Overrides whether education is allowed for letterboxed fullscreen apps.

     */

    @VisibleForTesting

    void setIsEducationEnabled(boolean enabled) {

        mIsEducationEnabled = enabled;

    }



    /**

     * Resets whether education is allowed for letterboxed fullscreen apps to

     * {@link R.bool.config_letterboxIsEducationEnabled}.

     */

    void resetIsEducationEnabled() {

        mIsEducationEnabled = mContext.getResources().getBoolean(

                R.bool.config_letterboxIsEducationEnabled);

    }



}

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

+0 −19
Original line number Diff line number Diff line
@@ -5704,25 +5704,6 @@ public class WindowManagerService extends IWindowManager.Stub 
        }

    }



    void setSandboxDisplayApis(int displayId, boolean sandboxDisplayApis) {

        if (mContext.checkCallingOrSelfPermission(WRITE_SECURE_SETTINGS)

                != PackageManager.PERMISSION_GRANTED) {

            throw new SecurityException("Must hold permission " + WRITE_SECURE_SETTINGS);

        }



        final long ident = Binder.clearCallingIdentity();

        try {

            synchronized (mGlobalLock) {

                final DisplayContent displayContent = mRoot.getDisplayContent(displayId);

                if (displayContent != null) {

                    displayContent.setSandboxDisplayApis(sandboxDisplayApis);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }

    }



    /** The global settings only apply to default display. */

    private boolean applyForcedPropertiesForDefaultDisplay() {

        boolean changed = false;

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

+0 −506

File changed.

Preview size limit exceeded, changes collapsed.