[DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands
Fix: 184937020 Test: N/A Change-Id: Ic246f66c4d579cdc637140f19fceb9aae76cb102
This commit is contained in:
@@ -30,8 +30,7 @@ import java.lang.annotation.RetentionPolicy;
|
|||||||
final class LetterboxConfiguration {
|
final class LetterboxConfiguration {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Override of aspect ratio for fixed orientation letterboxing that is set via ADB with
|
* Override of aspect ratio for fixed orientation letterboxing that is set via {@link
|
||||||
* set-fixed-orientation-letterbox-aspect-ratio or via {@link
|
|
||||||
* com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio} will be ignored
|
* com.android.internal.R.dimen.config_fixedOrientationLetterboxAspectRatio} will be ignored
|
||||||
* if it is <= this value.
|
* if it is <= this value.
|
||||||
*/
|
*/
|
||||||
@@ -251,7 +250,7 @@ final class LetterboxConfiguration {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets {@link LetterboxBackgroundType} specified in {@link
|
* Gets {@link LetterboxBackgroundType} specified in {@link
|
||||||
* com.android.internal.R.integer.config_letterboxBackgroundType} or over via ADB command.
|
* com.android.internal.R.integer.config_letterboxBackgroundType}.
|
||||||
*/
|
*/
|
||||||
@LetterboxBackgroundType
|
@LetterboxBackgroundType
|
||||||
int getLetterboxBackgroundType() {
|
int getLetterboxBackgroundType() {
|
||||||
@@ -359,9 +358,8 @@ final class LetterboxConfiguration {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Gets horizontal position of a center of the letterboxed app window specified
|
* Gets horizontal position of a center of the letterboxed app window specified
|
||||||
* in {@link com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier}
|
* in {@link com.android.internal.R.dimen.config_letterboxHorizontalPositionMultiplier}.
|
||||||
* or via an ADB command. 0 corresponds to the left side of the screen and 1 to the
|
* 0 corresponds to the left side of the screen and 1 to the right side.
|
||||||
* right side.
|
|
||||||
*/
|
*/
|
||||||
float getLetterboxHorizontalPositionMultiplier() {
|
float getLetterboxHorizontalPositionMultiplier() {
|
||||||
return (mLetterboxHorizontalPositionMultiplier < 0.0f
|
return (mLetterboxHorizontalPositionMultiplier < 0.0f
|
||||||
@@ -416,8 +414,7 @@ final class LetterboxConfiguration {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Gets default horizontal position of the letterboxed app window when reachability is enabled.
|
* Gets default horizontal position of the letterboxed app window when reachability is enabled.
|
||||||
* Specified in {@link R.integer.config_letterboxDefaultPositionForReachability} or via an ADB
|
* Specified in {@link R.integer.config_letterboxDefaultPositionForReachability}.
|
||||||
* command.
|
|
||||||
*/
|
*/
|
||||||
@LetterboxReachabilityPosition
|
@LetterboxReachabilityPosition
|
||||||
int getDefaultPositionForReachability() {
|
int getDefaultPositionForReachability() {
|
||||||
|
|||||||
@@ -19,16 +19,6 @@ package com.android.server.wm;
|
|||||||
import static android.os.Build.IS_USER;
|
import static android.os.Build.IS_USER;
|
||||||
import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
|
import static android.view.CrossWindowBlurListeners.CROSS_WINDOW_BLUR_SUPPORTED;
|
||||||
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_BACKGROUND_SOLID_COLOR;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_BACKGROUND_WALLPAPER;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_REACHABILITY_POSITION_CENTER;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_REACHABILITY_POSITION_LEFT;
|
|
||||||
import static com.android.server.wm.LetterboxConfiguration.LETTERBOX_REACHABILITY_POSITION_RIGHT;
|
|
||||||
|
|
||||||
import android.content.res.Resources.NotFoundException;
|
|
||||||
import android.graphics.Color;
|
|
||||||
import android.graphics.Point;
|
import android.graphics.Point;
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.os.ParcelFileDescriptor;
|
import android.os.ParcelFileDescriptor;
|
||||||
@@ -46,8 +36,6 @@ import com.android.internal.os.ByteTransferPipe;
|
|||||||
import com.android.internal.protolog.ProtoLogImpl;
|
import com.android.internal.protolog.ProtoLogImpl;
|
||||||
import com.android.server.LocalServices;
|
import com.android.server.LocalServices;
|
||||||
import com.android.server.statusbar.StatusBarManagerInternal;
|
import com.android.server.statusbar.StatusBarManagerInternal;
|
||||||
import com.android.server.wm.LetterboxConfiguration.LetterboxBackgroundType;
|
|
||||||
import com.android.server.wm.LetterboxConfiguration.LetterboxReachabilityPosition;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
@@ -70,12 +58,10 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
|
|
||||||
// Internal service impl -- must perform security checks before touching.
|
// Internal service impl -- must perform security checks before touching.
|
||||||
private final WindowManagerService mInternal;
|
private final WindowManagerService mInternal;
|
||||||
private final LetterboxConfiguration mLetterboxConfiguration;
|
|
||||||
|
|
||||||
public WindowManagerShellCommand(WindowManagerService service) {
|
public WindowManagerShellCommand(WindowManagerService service) {
|
||||||
mInterface = service;
|
mInterface = service;
|
||||||
mInternal = service;
|
mInternal = service;
|
||||||
mLetterboxConfiguration = service.mLetterboxConfiguration;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -127,14 +113,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
return runGetIgnoreOrientationRequest(pw);
|
return runGetIgnoreOrientationRequest(pw);
|
||||||
case "dump-visible-window-views":
|
case "dump-visible-window-views":
|
||||||
return runDumpVisibleWindowViews(pw);
|
return runDumpVisibleWindowViews(pw);
|
||||||
case "set-letterbox-style":
|
|
||||||
return runSetLetterboxStyle(pw);
|
|
||||||
case "get-letterbox-style":
|
|
||||||
return runGetLetterboxStyle(pw);
|
|
||||||
case "reset-letterbox-style":
|
|
||||||
return runResetLetterboxStyle(pw);
|
|
||||||
case "set-sandbox-display-apis":
|
|
||||||
return runSandboxDisplayApis(pw);
|
|
||||||
case "set-multi-window-config":
|
case "set-multi-window-config":
|
||||||
return runSetMultiWindowConfig();
|
return runSetMultiWindowConfig();
|
||||||
case "get-multi-window-config":
|
case "get-multi-window-config":
|
||||||
@@ -353,37 +331,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Override display size and metrics to reflect the DisplayArea of the calling activity.
|
|
||||||
*/
|
|
||||||
private int runSandboxDisplayApis(PrintWriter pw) throws RemoteException {
|
|
||||||
int displayId = Display.DEFAULT_DISPLAY;
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
if ("-d".equals(arg)) {
|
|
||||||
displayId = Integer.parseInt(getNextArgRequired());
|
|
||||||
arg = getNextArgRequired();
|
|
||||||
}
|
|
||||||
|
|
||||||
final boolean sandboxDisplayApis;
|
|
||||||
switch (arg) {
|
|
||||||
case "true":
|
|
||||||
case "1":
|
|
||||||
sandboxDisplayApis = true;
|
|
||||||
break;
|
|
||||||
case "false":
|
|
||||||
case "0":
|
|
||||||
sandboxDisplayApis = false;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println("Error: expecting true, 1, false, 0, but we "
|
|
||||||
+ "get " + arg);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
mInternal.setSandboxDisplayApis(displayId, sandboxDisplayApis);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runDismissKeyguard(PrintWriter pw) throws RemoteException {
|
private int runDismissKeyguard(PrintWriter pw) throws RemoteException {
|
||||||
mInterface.dismissKeyguard(null /* callback */, null /* message */);
|
mInterface.dismissKeyguard(null /* callback */, null /* message */);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -601,318 +548,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private int runSetFixedOrientationLetterboxAspectRatio(PrintWriter pw) throws RemoteException {
|
|
||||||
final float aspectRatio;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
aspectRatio = Float.parseFloat(arg);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
getErrPrintWriter().println("Error: bad aspect ratio format " + e);
|
|
||||||
return -1;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: aspect ratio should be provided as an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setFixedOrientationLetterboxAspectRatio(aspectRatio);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxActivityCornersRadius(PrintWriter pw) throws RemoteException {
|
|
||||||
final int cornersRadius;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
cornersRadius = Integer.parseInt(arg);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
getErrPrintWriter().println("Error: bad corners radius format " + e);
|
|
||||||
return -1;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: corners radius should be provided as an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxActivityCornersRadius(cornersRadius);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxBackgroundType(PrintWriter pw) throws RemoteException {
|
|
||||||
@LetterboxBackgroundType final int backgroundType;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
switch (arg) {
|
|
||||||
case "solid_color":
|
|
||||||
backgroundType = LETTERBOX_BACKGROUND_SOLID_COLOR;
|
|
||||||
break;
|
|
||||||
case "app_color_background":
|
|
||||||
backgroundType = LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND;
|
|
||||||
break;
|
|
||||||
case "app_color_background_floating":
|
|
||||||
backgroundType = LETTERBOX_BACKGROUND_APP_COLOR_BACKGROUND_FLOATING;
|
|
||||||
break;
|
|
||||||
case "wallpaper":
|
|
||||||
backgroundType = LETTERBOX_BACKGROUND_WALLPAPER;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: 'solid_color', 'app_color_background' or "
|
|
||||||
+ "'wallpaper' should be provided as an argument");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: 'solid_color', 'app_color_background' or "
|
|
||||||
+ "'wallpaper' should be provided as an argument" + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxBackgroundType(backgroundType);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxBackgroundColorResource(PrintWriter pw) throws RemoteException {
|
|
||||||
final int colorId;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
colorId = mInternal.mContext.getResources()
|
|
||||||
.getIdentifier(arg, "color", "com.android.internal");
|
|
||||||
} catch (NotFoundException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: color in '@android:color/resource_name' format should be provided as "
|
|
||||||
+ "an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxBackgroundColorResourceId(colorId);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxBackgroundColor(PrintWriter pw) throws RemoteException {
|
|
||||||
final Color color;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
color = Color.valueOf(Color.parseColor(arg));
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: color in #RRGGBB format should be provided as "
|
|
||||||
+ "an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxBackgroundColor(color);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxBackgroundWallpaperBlurRadius(PrintWriter pw)
|
|
||||||
throws RemoteException {
|
|
||||||
final int radius;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
radius = Integer.parseInt(arg);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
getErrPrintWriter().println("Error: blur radius format " + e);
|
|
||||||
return -1;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: blur radius should be provided as an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxBackgroundWallpaperBlurRadius(radius);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxBackgroundWallpaperDarkScrimAlpha(PrintWriter pw)
|
|
||||||
throws RemoteException {
|
|
||||||
final float alpha;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
alpha = Float.parseFloat(arg);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
getErrPrintWriter().println("Error: bad alpha format " + e);
|
|
||||||
return -1;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: alpha should be provided as an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxBackgroundWallpaperDarkScrimAlpha(alpha);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxHorizontalPositionMultiplier(PrintWriter pw) throws RemoteException {
|
|
||||||
final float multiplier;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
multiplier = Float.parseFloat(arg);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
getErrPrintWriter().println("Error: bad multiplier format " + e);
|
|
||||||
return -1;
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: multiplier should be provided as an argument " + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setLetterboxHorizontalPositionMultiplier(multiplier);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxIsReachabilityEnabled(PrintWriter pw) throws RemoteException {
|
|
||||||
String arg = getNextArg();
|
|
||||||
final boolean enabled;
|
|
||||||
switch (arg) {
|
|
||||||
case "true":
|
|
||||||
case "1":
|
|
||||||
enabled = true;
|
|
||||||
break;
|
|
||||||
case "false":
|
|
||||||
case "0":
|
|
||||||
enabled = false;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println("Error: expected true, 1, false, 0, but got " + arg);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setIsReachabilityEnabled(enabled);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxDefaultPositionForReachability(PrintWriter pw)
|
|
||||||
throws RemoteException {
|
|
||||||
@LetterboxReachabilityPosition final int position;
|
|
||||||
try {
|
|
||||||
String arg = getNextArgRequired();
|
|
||||||
switch (arg) {
|
|
||||||
case "left":
|
|
||||||
position = LETTERBOX_REACHABILITY_POSITION_LEFT;
|
|
||||||
break;
|
|
||||||
case "center":
|
|
||||||
position = LETTERBOX_REACHABILITY_POSITION_CENTER;
|
|
||||||
break;
|
|
||||||
case "right":
|
|
||||||
position = LETTERBOX_REACHABILITY_POSITION_RIGHT;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: 'left', 'center' or 'right' are expected as an argument");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
} catch (IllegalArgumentException e) {
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: 'left', 'center' or 'right' are expected as an argument" + e);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.setDefaultPositionForReachability(position);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetLetterboxStyle(PrintWriter pw) throws RemoteException {
|
|
||||||
if (peekNextArg() == null) {
|
|
||||||
getErrPrintWriter().println("Error: No arguments provided.");
|
|
||||||
}
|
|
||||||
while (peekNextArg() != null) {
|
|
||||||
String arg = getNextArg();
|
|
||||||
switch (arg) {
|
|
||||||
case "--aspectRatio":
|
|
||||||
runSetFixedOrientationLetterboxAspectRatio(pw);
|
|
||||||
break;
|
|
||||||
case "--cornerRadius":
|
|
||||||
runSetLetterboxActivityCornersRadius(pw);
|
|
||||||
break;
|
|
||||||
case "--backgroundType":
|
|
||||||
runSetLetterboxBackgroundType(pw);
|
|
||||||
break;
|
|
||||||
case "--backgroundColor":
|
|
||||||
runSetLetterboxBackgroundColor(pw);
|
|
||||||
break;
|
|
||||||
case "--backgroundColorResource":
|
|
||||||
runSetLetterboxBackgroundColorResource(pw);
|
|
||||||
break;
|
|
||||||
case "--wallpaperBlurRadius":
|
|
||||||
runSetLetterboxBackgroundWallpaperBlurRadius(pw);
|
|
||||||
break;
|
|
||||||
case "--wallpaperDarkScrimAlpha":
|
|
||||||
runSetLetterboxBackgroundWallpaperDarkScrimAlpha(pw);
|
|
||||||
break;
|
|
||||||
case "--horizontalPositionMultiplier":
|
|
||||||
runSetLetterboxHorizontalPositionMultiplier(pw);
|
|
||||||
break;
|
|
||||||
case "--isReachabilityEnabled":
|
|
||||||
runSetLetterboxIsReachabilityEnabled(pw);
|
|
||||||
break;
|
|
||||||
case "--defaultPositionForReachability":
|
|
||||||
runSetLetterboxDefaultPositionForReachability(pw);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: Unrecognized letterbox style option: " + arg);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runResetLetterboxStyle(PrintWriter pw) throws RemoteException {
|
|
||||||
if (peekNextArg() == null) {
|
|
||||||
resetLetterboxStyle();
|
|
||||||
}
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
while (peekNextArg() != null) {
|
|
||||||
String arg = getNextArg();
|
|
||||||
switch (arg) {
|
|
||||||
case "aspectRatio":
|
|
||||||
mLetterboxConfiguration.resetFixedOrientationLetterboxAspectRatio();
|
|
||||||
break;
|
|
||||||
case "cornerRadius":
|
|
||||||
mLetterboxConfiguration.resetLetterboxActivityCornersRadius();
|
|
||||||
break;
|
|
||||||
case "backgroundType":
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundType();
|
|
||||||
break;
|
|
||||||
case "backgroundColor":
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundColor();
|
|
||||||
break;
|
|
||||||
case "wallpaperBlurRadius":
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundWallpaperBlurRadius();
|
|
||||||
break;
|
|
||||||
case "wallpaperDarkScrimAlpha":
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundWallpaperDarkScrimAlpha();
|
|
||||||
break;
|
|
||||||
case "horizontalPositionMultiplier":
|
|
||||||
mLetterboxConfiguration.resetLetterboxHorizontalPositionMultiplier();
|
|
||||||
break;
|
|
||||||
case "isReachabilityEnabled":
|
|
||||||
mLetterboxConfiguration.getIsReachabilityEnabled();
|
|
||||||
break;
|
|
||||||
case "defaultPositionForReachability":
|
|
||||||
mLetterboxConfiguration.getDefaultPositionForReachability();
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
getErrPrintWriter().println(
|
|
||||||
"Error: Unrecognized letterbox style option: " + arg);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runSetMultiWindowConfig() {
|
private int runSetMultiWindowConfig() {
|
||||||
if (peekNextArg() == null) {
|
if (peekNextArg() == null) {
|
||||||
getErrPrintWriter().println("Error: No arguments provided.");
|
getErrPrintWriter().println("Error: No arguments provided.");
|
||||||
@@ -987,47 +622,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void resetLetterboxStyle() {
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
mLetterboxConfiguration.resetFixedOrientationLetterboxAspectRatio();
|
|
||||||
mLetterboxConfiguration.resetLetterboxActivityCornersRadius();
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundType();
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundColor();
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundWallpaperBlurRadius();
|
|
||||||
mLetterboxConfiguration.resetLetterboxBackgroundWallpaperDarkScrimAlpha();
|
|
||||||
mLetterboxConfiguration.resetLetterboxHorizontalPositionMultiplier();
|
|
||||||
mLetterboxConfiguration.resetIsReachabilityEnabled();
|
|
||||||
mLetterboxConfiguration.resetDefaultPositionForReachability();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runGetLetterboxStyle(PrintWriter pw) throws RemoteException {
|
|
||||||
synchronized (mInternal.mGlobalLock) {
|
|
||||||
pw.println("Corner radius: "
|
|
||||||
+ mLetterboxConfiguration.getLetterboxActivityCornersRadius());
|
|
||||||
pw.println("Horizontal position multiplier: "
|
|
||||||
+ mLetterboxConfiguration.getLetterboxHorizontalPositionMultiplier());
|
|
||||||
pw.println("Aspect ratio: "
|
|
||||||
+ mLetterboxConfiguration.getFixedOrientationLetterboxAspectRatio());
|
|
||||||
pw.println("Is reachability enabled: "
|
|
||||||
+ mLetterboxConfiguration.getIsReachabilityEnabled());
|
|
||||||
pw.println("Default position for reachability: "
|
|
||||||
+ LetterboxConfiguration.letterboxReachabilityPositionToString(
|
|
||||||
mLetterboxConfiguration.getDefaultPositionForReachability()));
|
|
||||||
|
|
||||||
pw.println("Background type: "
|
|
||||||
+ LetterboxConfiguration.letterboxBackgroundTypeToString(
|
|
||||||
mLetterboxConfiguration.getLetterboxBackgroundType()));
|
|
||||||
pw.println(" Background color: " + Integer.toHexString(
|
|
||||||
mLetterboxConfiguration.getLetterboxBackgroundColor().toArgb()));
|
|
||||||
pw.println(" Wallpaper blur radius: "
|
|
||||||
+ mLetterboxConfiguration.getLetterboxBackgroundWallpaperBlurRadius());
|
|
||||||
pw.println(" Wallpaper dark scrim alpha: "
|
|
||||||
+ mLetterboxConfiguration.getLetterboxBackgroundWallpaperDarkScrimAlpha());
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
private int runReset(PrintWriter pw) throws RemoteException {
|
private int runReset(PrintWriter pw) throws RemoteException {
|
||||||
int displayId = getDisplayId(getNextArg());
|
int displayId = getDisplayId(getNextArg());
|
||||||
|
|
||||||
@@ -1052,12 +646,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
// set-ignore-orientation-request
|
// set-ignore-orientation-request
|
||||||
mInterface.setIgnoreOrientationRequest(displayId, false /* ignoreOrientationRequest */);
|
mInterface.setIgnoreOrientationRequest(displayId, false /* ignoreOrientationRequest */);
|
||||||
|
|
||||||
// set-letterbox-style
|
|
||||||
resetLetterboxStyle();
|
|
||||||
|
|
||||||
// set-sandbox-display-apis
|
|
||||||
mInternal.setSandboxDisplayApis(displayId, /* sandboxDisplayApis= */ true);
|
|
||||||
|
|
||||||
// set-multi-window-config
|
// set-multi-window-config
|
||||||
runResetMultiWindowConfig();
|
runResetMultiWindowConfig();
|
||||||
|
|
||||||
@@ -1092,12 +680,7 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
pw.println(" set-ignore-orientation-request [-d DISPLAY_ID] [true|1|false|0]");
|
pw.println(" set-ignore-orientation-request [-d DISPLAY_ID] [true|1|false|0]");
|
||||||
pw.println(" get-ignore-orientation-request [-d DISPLAY_ID] ");
|
pw.println(" get-ignore-orientation-request [-d DISPLAY_ID] ");
|
||||||
pw.println(" If app requested orientation should be ignored.");
|
pw.println(" If app requested orientation should be ignored.");
|
||||||
pw.println(" set-sandbox-display-apis [true|1|false|0]");
|
|
||||||
pw.println(" Sets override of Display APIs getRealSize / getRealMetrics to reflect ");
|
|
||||||
pw.println(" DisplayArea of the activity, or the window bounds if in letterbox or");
|
|
||||||
pw.println(" Size Compat Mode.");
|
|
||||||
|
|
||||||
printLetterboxHelp(pw);
|
|
||||||
printMultiWindowConfigHelp(pw);
|
printMultiWindowConfigHelp(pw);
|
||||||
|
|
||||||
pw.println(" reset [-d DISPLAY_ID]");
|
pw.println(" reset [-d DISPLAY_ID]");
|
||||||
@@ -1110,61 +693,6 @@ public class WindowManagerShellCommand extends ShellCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void printLetterboxHelp(PrintWriter pw) {
|
|
||||||
pw.println(" set-letterbox-style");
|
|
||||||
pw.println(" Sets letterbox style using the following options:");
|
|
||||||
pw.println(" --aspectRatio aspectRatio");
|
|
||||||
pw.println(" Aspect ratio of letterbox for fixed orientation. If aspectRatio <= "
|
|
||||||
+ LetterboxConfiguration.MIN_FIXED_ORIENTATION_LETTERBOX_ASPECT_RATIO);
|
|
||||||
pw.println(" both it and R.dimen.config_fixedOrientationLetterboxAspectRatio will");
|
|
||||||
pw.println(" be ignored and framework implementation will determine aspect ratio.");
|
|
||||||
pw.println(" --cornerRadius radius");
|
|
||||||
pw.println(" Corners radius for activities in the letterbox mode. If radius < 0,");
|
|
||||||
pw.println(" both it and R.integer.config_letterboxActivityCornersRadius will be");
|
|
||||||
pw.println(" ignored and corners of the activity won't be rounded.");
|
|
||||||
pw.println(" --backgroundType [reset|solid_color|app_color_background");
|
|
||||||
pw.println(" |app_color_background_floating|wallpaper]");
|
|
||||||
pw.println(" Type of background used in the letterbox mode.");
|
|
||||||
pw.println(" --backgroundColor color");
|
|
||||||
pw.println(" Color of letterbox which is be used when letterbox background type");
|
|
||||||
pw.println(" is 'solid-color'. Use (set)get-letterbox-style to check and control");
|
|
||||||
pw.println(" letterbox background type. See Color#parseColor for allowed color");
|
|
||||||
pw.println(" formats (#RRGGBB and some colors by name, e.g. magenta or olive).");
|
|
||||||
pw.println(" --backgroundColorResource resource_name");
|
|
||||||
pw.println(" Color resource name of letterbox background which is used when");
|
|
||||||
pw.println(" background type is 'solid-color'. Use (set)get-letterbox-style to");
|
|
||||||
pw.println(" check and control background type. Parameter is a color resource");
|
|
||||||
pw.println(" name, for example, @android:color/system_accent2_50.");
|
|
||||||
pw.println(" --wallpaperBlurRadius radius");
|
|
||||||
pw.println(" Blur radius for 'wallpaper' letterbox background. If radius <= 0");
|
|
||||||
pw.println(" both it and R.dimen.config_letterboxBackgroundWallpaperBlurRadius");
|
|
||||||
pw.println(" are ignored and 0 is used.");
|
|
||||||
pw.println(" --wallpaperDarkScrimAlpha alpha");
|
|
||||||
pw.println(" Alpha of a black translucent scrim shown over 'wallpaper'");
|
|
||||||
pw.println(" letterbox background. If alpha < 0 or >= 1 both it and");
|
|
||||||
pw.println(" R.dimen.config_letterboxBackgroundWallaperDarkScrimAlpha are ignored");
|
|
||||||
pw.println(" and 0.0 (transparent) is used instead.");
|
|
||||||
pw.println(" --horizontalPositionMultiplier multiplier");
|
|
||||||
pw.println(" Horizontal position of app window center. If multiplier < 0 or > 1,");
|
|
||||||
pw.println(" both it and R.dimen.config_letterboxHorizontalPositionMultiplier");
|
|
||||||
pw.println(" are ignored and central position (0.5) is used.");
|
|
||||||
pw.println(" --isReachabilityEnabled [true|1|false|0]");
|
|
||||||
pw.println(" Whether reachability repositioning is allowed for letterboxed");
|
|
||||||
pw.println(" fullscreen apps in landscape device orientation.");
|
|
||||||
pw.println(" --defaultPositionForReachability [left|center|right]");
|
|
||||||
pw.println(" Default horizontal position of app window when reachability is.");
|
|
||||||
pw.println(" enabled.");
|
|
||||||
pw.println(" reset-letterbox-style [aspectRatio|cornerRadius|backgroundType");
|
|
||||||
pw.println(" |backgroundColor|wallpaperBlurRadius|wallpaperDarkScrimAlpha");
|
|
||||||
pw.println(" |horizontalPositionMultiplier|isReachabilityEnabled");
|
|
||||||
pw.println(" |defaultPositionMultiplierForReachability]");
|
|
||||||
pw.println(" Resets overrides to default values for specified properties separated");
|
|
||||||
pw.println(" by space, e.g. 'reset-letterbox-style aspectRatio cornerRadius'.");
|
|
||||||
pw.println(" If no arguments provided, all values will be reset.");
|
|
||||||
pw.println(" get-letterbox-style");
|
|
||||||
pw.println(" Prints letterbox style configuration.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void printMultiWindowConfigHelp(PrintWriter pw) {
|
private void printMultiWindowConfigHelp(PrintWriter pw) {
|
||||||
pw.println(" set-multi-window-config");
|
pw.println(" set-multi-window-config");
|
||||||
pw.println(" Sets options to determine if activity should be shown in multi window:");
|
pw.println(" Sets options to determine if activity should be shown in multi window:");
|
||||||
|
|||||||
Reference in New Issue
Block a user