diff --git a/core/res/res/anim/dock_bottom_enter.xml b/core/res/res/anim/dock_bottom_enter.xml deleted file mode 100644 index bfb97b6d9b805..0000000000000 --- a/core/res/res/anim/dock_bottom_enter.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_bottom_exit.xml b/core/res/res/anim/dock_bottom_exit.xml deleted file mode 100644 index 4e15448aba3e5..0000000000000 --- a/core/res/res/anim/dock_bottom_exit.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_bottom_exit_keyguard.xml b/core/res/res/anim/dock_bottom_exit_keyguard.xml deleted file mode 100644 index 4de3ce5b89325..0000000000000 --- a/core/res/res/anim/dock_bottom_exit_keyguard.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/res/res/anim/dock_left_enter.xml b/core/res/res/anim/dock_left_enter.xml deleted file mode 100644 index 7f5dfd50afc75..0000000000000 --- a/core/res/res/anim/dock_left_enter.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_left_exit.xml b/core/res/res/anim/dock_left_exit.xml deleted file mode 100644 index 11cbc0b364058..0000000000000 --- a/core/res/res/anim/dock_left_exit.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_right_enter.xml b/core/res/res/anim/dock_right_enter.xml deleted file mode 100644 index a92c7d234e58e..0000000000000 --- a/core/res/res/anim/dock_right_enter.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_right_exit.xml b/core/res/res/anim/dock_right_exit.xml deleted file mode 100644 index 80e4dc3181920..0000000000000 --- a/core/res/res/anim/dock_right_exit.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_top_enter.xml b/core/res/res/anim/dock_top_enter.xml deleted file mode 100644 index f763fb5c1cc99..0000000000000 --- a/core/res/res/anim/dock_top_enter.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/anim/dock_top_exit.xml b/core/res/res/anim/dock_top_exit.xml deleted file mode 100644 index 995b7d0ffc8cf..0000000000000 --- a/core/res/res/anim/dock_top_exit.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e9f80235d7468..8601ea34e7f86 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1690,15 +1690,6 @@ - - - - - - - - - diff --git a/services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java b/services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java index 4c18d0b8a0dcd..56edde09f7477 100644 --- a/services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java +++ b/services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java @@ -57,7 +57,6 @@ import android.view.WindowInsets; import android.view.WindowInsets.Type; import android.view.WindowManager; import android.view.WindowManagerGlobal; -import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; import android.widget.Button; @@ -109,18 +108,13 @@ public class ImmersiveModeConfirmation { mContext = display.getDisplayId() == DEFAULT_DISPLAY ? uiContext : uiContext.createDisplayContext(display); mHandler = new H(looper); - mShowDelayMs = getNavBarExitDuration() * 3; + mShowDelayMs = context.getResources().getInteger(R.integer.dock_enter_exit_duration) * 3L; mPanicThresholdMs = context.getResources() .getInteger(R.integer.config_immersive_mode_confirmation_panic); mVrModeEnabled = vrModeEnabled; mCanSystemBarsBeShownByUser = canSystemBarsBeShownByUser; } - private long getNavBarExitDuration() { - Animation exit = AnimationUtils.loadAnimation(mContext, R.anim.dock_bottom_exit); - return exit != null ? exit.getDuration() : 0; - } - static boolean loadSetting(int currentUserId, Context context) { final boolean wasConfirmed = sConfirmed; sConfirmed = false;