diff options
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/BackNavigationController.java | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 1f06b0b7c62b..1cc26806cb16 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3614,8 +3614,7 @@ <!-- Whether this device prefers to show snapshot or splash screen on back predict target. When set true, there will create windowless starting surface for the preview target, so it won't affect activity's lifecycle. This should only be disabled on low-ram device. --> - <!-- TODO(b/268563842) enable once activity snapshot is ready --> - <bool name="config_predictShowStartingSurface">false</bool> + <bool name="config_predictShowStartingSurface">true</bool> <!-- default window ShowCircularMask property --> <bool name="config_windowShowCircularMask">false</bool> diff --git a/services/core/java/com/android/server/wm/BackNavigationController.java b/services/core/java/com/android/server/wm/BackNavigationController.java index 1feffca55e20..e15512678104 100644 --- a/services/core/java/com/android/server/wm/BackNavigationController.java +++ b/services/core/java/com/android/server/wm/BackNavigationController.java @@ -61,6 +61,7 @@ import com.android.internal.annotations.VisibleForTesting; import com.android.internal.policy.TransitionAnimation; import com.android.internal.protolog.common.ProtoLog; import com.android.server.wm.utils.InsetUtils; +import com.android.window.flags.Flags; import java.io.PrintWriter; import java.util.ArrayList; @@ -901,7 +902,8 @@ class BackNavigationController { mWindowManagerService = wms; final Context context = wms.mContext; mShowWindowlessSurface = context.getResources().getBoolean( - com.android.internal.R.bool.config_predictShowStartingSurface); + com.android.internal.R.bool.config_predictShowStartingSurface) + && Flags.activitySnapshotByDefault(); } private static final int UNKNOWN = 0; private static final int TASK_SWITCH = 1; |