From d7563951e1b277a2ac302d8d298ac48eac64af28 Mon Sep 17 00:00:00 2001 From: Peter Kalauskas Date: Thu, 21 Nov 2019 13:00:44 -0800 Subject: Remove config_lowRamTaskSnapshotsAndRecents config_lowRamTaskSnapshotsAndRecents was added to support icon recents. The config scales recents to 0.1, and replaces the snapshot starting window with the icon splash starting window when app is launched from recents overview. Bug: 144798942 Test: Check that wembley uses 0.6 snapshot scale, and that it uses snapshot for app transitions Change-Id: I056fe0d194d1542c8ed251b946ab1aae99045d19 --- core/res/res/values/config.xml | 5 ----- core/res/res/values/symbols.xml | 1 - services/core/java/com/android/server/wm/ActivityRecord.java | 5 ----- .../java/com/android/server/wm/TaskSnapshotPersister.java | 11 ++--------- .../core/java/com/android/server/wm/WindowManagerService.java | 9 --------- 5 files changed, 2 insertions(+), 29 deletions(-) diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index ced5deb66899..a66aa2968e9d 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2652,11 +2652,6 @@ - - false - 1.0 diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 90343e07d4e4..e2daa251db4d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -357,7 +357,6 @@ - diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index 25079ec758b3..8a6358cf9c1b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -1800,11 +1800,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } else if (newTask || !processRunning || (taskSwitch && !activityCreated)) { return STARTING_WINDOW_TYPE_SPLASH_SCREEN; } else if (taskSwitch && allowTaskSnapshot) { - if (mWmService.mLowRamTaskSnapshotsAndRecents) { - // For low RAM devices, we use the splash screen starting window instead of the - // task snapshot starting window. - return STARTING_WINDOW_TYPE_SPLASH_SCREEN; - } return snapshot == null ? STARTING_WINDOW_TYPE_NONE : snapshotOrientationSameAsTask(snapshot) || fromRecents ? STARTING_WINDOW_TYPE_SNAPSHOT : STARTING_WINDOW_TYPE_SPLASH_SCREEN; diff --git a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java index 59155907823b..10f29960081e 100644 --- a/services/core/java/com/android/server/wm/TaskSnapshotPersister.java +++ b/services/core/java/com/android/server/wm/TaskSnapshotPersister.java @@ -54,7 +54,6 @@ class TaskSnapshotPersister { private static final String REDUCED_POSTFIX = "_reduced"; private static final float REDUCED_SCALE = .5f; private static final float LOW_RAM_REDUCED_SCALE = .6f; - private static final float LOW_RAM_RECENTS_REDUCED_SCALE = .1f; static final boolean DISABLE_FULL_SIZED_BITMAPS = ActivityManager.isLowRamDeviceStatic(); private static final long DELAY_MS = 100; private static final int QUALITY = 95; @@ -85,14 +84,8 @@ class TaskSnapshotPersister { TaskSnapshotPersister(WindowManagerService service, DirectoryResolver resolver) { mDirectoryResolver = resolver; - if (service.mLowRamTaskSnapshotsAndRecents) { - // Use very low res snapshots if we are using Go version of recents. - mReducedScale = LOW_RAM_RECENTS_REDUCED_SCALE; - } else { - // TODO(122671846) Replace the low RAM value scale with the above when it is fully built - mReducedScale = ActivityManager.isLowRamDeviceStatic() - ? LOW_RAM_REDUCED_SCALE : REDUCED_SCALE; - } + mReducedScale = ActivityManager.isLowRamDeviceStatic() + ? LOW_RAM_REDUCED_SCALE : REDUCED_SCALE; mUse16BitFormat = service.mContext.getResources().getBoolean( com.android.internal.R.bool.config_use16BitTaskSnapshotPixelFormat); } diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 95eb4ddceb45..97e68584dd38 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -492,13 +492,6 @@ public class WindowManagerService extends IWindowManager.Stub final long mDrawLockTimeoutMillis; final boolean mAllowAnimationsInLowPowerMode; - // TODO(b/122671846) Remove the flag below in favor of isLowRam once feature is stable - /** - * Use very low resolution task snapshots. Replaces task snapshot starting windows with - * splashscreen starting windows. Used on low RAM devices to save memory. - */ - final boolean mLowRamTaskSnapshotsAndRecents; - final boolean mAllowBootMessages; final boolean mLimitedAlphaCompositing; @@ -1115,8 +1108,6 @@ public class WindowManagerService extends IWindowManager.Stub com.android.internal.R.bool.config_disableTransitionAnimation); mPerDisplayFocusEnabled = context.getResources().getBoolean( com.android.internal.R.bool.config_perDisplayFocusEnabled); - mLowRamTaskSnapshotsAndRecents = context.getResources().getBoolean( - com.android.internal.R.bool.config_lowRamTaskSnapshotsAndRecents); mInputManager = inputManager; // Must be before createDisplayContentLocked. mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class); -- cgit v1.2.3-59-g8ed1b