From 1edfed0785c9fa929535e2ab7e156e3aaeff0b56 Mon Sep 17 00:00:00 2001 From: Issei Suzuki Date: Fri, 29 Oct 2021 15:21:06 +0200 Subject: [PATCH] Remove obsolute property persist.wm.disable_custom_task_animation Bug: 204540636 Test: Existing tests pass. Change-Id: Ie06136d165fecb35b2e7802580010cf3a32a24e5 --- .../com/android/server/wm/WindowContainer.java | 2 +- .../android/server/wm/WindowManagerService.java | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java index cae5b148222f2..5c7b4167aec41 100644 --- a/services/core/java/com/android/server/wm/WindowContainer.java +++ b/services/core/java/com/android/server/wm/WindowContainer.java @@ -906,7 +906,7 @@ class WindowContainer extends ConfigurationContainer< * container. */ boolean canCustomizeAppTransition() { - return !WindowManagerService.sDisableCustomTaskAnimationProperty; + return false; } /** diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index c4a518395eeae..9b67db62b62e2 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -398,21 +398,6 @@ public class WindowManagerService extends IWindowManager.Stub static final int LOGTAG_INPUT_FOCUS = 62001; - /** - * Restrict ability of activities overriding transition animation in a way such that - * an activity can do it only when the transition happens within a same task. - * - * @see android.app.Activity#overridePendingTransition(int, int) - */ - private static final String DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY = - "persist.wm.disable_custom_task_animation"; - - /** - * @see #DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY - */ - static boolean sDisableCustomTaskAnimationProperty = - SystemProperties.getBoolean(DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY, true); - /** * Use WMShell for app transition. */