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

Commit 1fa5c692 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Add shell control for disabling blur" into sc-dev am: c3f3255c 

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

Change-Id: I9ed85f2c579fd3a681dfb55fd159460fba3f3f8b
parents deae160c c3f3255c

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

+31 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



import static android.os.Build.IS_USER;

import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;



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

import static com.android.server.wm.WindowManagerService.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING;
@@ -135,6 +136,8 @@ public class WindowManagerShellCommand extends ShellCommand { 
                    return runGetLetterboxBackgroundColor(pw);

                case "reset":

                    return runReset(pw);

                case "disable-blur":

                    return runSetBlurDisabled(pw);

                default:

                    return handleDefaultCommands(cmd);

            }
@@ -214,6 +217,33 @@ public class WindowManagerShellCommand extends ShellCommand { 
        return 0;

    }



    private int runSetBlurDisabled(PrintWriter pw) throws RemoteException {

        String arg = getNextArg();

        if (arg == null) {

            pw.println("Blur supported on device: " + CROSS_WINDOW_BLUR_SUPPORTED);

            pw.println("Blur enabled: " + mInternal.mBlurController.mBlurEnabled);

            return 0;

        }



        final boolean disableBlur;

        switch (arg) {

            case "true":

            case "1":

                disableBlur = true;

                break;

            case "false":

            case "0":

                disableBlur = false;

                break;

            default:

                getErrPrintWriter().println("Error: expected true, 1, false, 0, but got " + arg);

                return -1;

        }



        mInterface.setForceCrossWindowBlurDisabled(disableBlur);

        return 0;

    }



    private void printInitialDisplayDensity(PrintWriter pw , int displayId) {

        try {

            final int initialDensity = mInterface.getInitialDisplayDensity(displayId);
@@ -725,6 +755,7 @@ public class WindowManagerShellCommand extends ShellCommand { 
        pw.println("    Set display scaling mode.");

        pw.println("  dismiss-keyguard");

        pw.println("    Dismiss the keyguard, prompting user for auth if necessary.");

        pw.println("  disable-blur [true|1|false|0]");

        pw.println("  user-rotation [-d DISPLAY_ID] [free|lock] [rotation]");

        pw.println("    Print or set user rotation mode and user rotation.");

        pw.println("  dump-visible-window-views");