Quicker exit animation for bottom dock on Keyguard
Change-Id: I9d07dc6ce7e2aec36bf797bd4041701315e71e0e Fixes: 31274209
This commit is contained in:
22
core/res/res/anim/dock_bottom_exit_keyguard.xml
Normal file
22
core/res/res/anim/dock_bottom_exit_keyguard.xml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (C) 2016 The Android Open Source Project
|
||||||
|
~
|
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
~ you may not use this file except in compliance with the License.
|
||||||
|
~ You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License
|
||||||
|
-->
|
||||||
|
|
||||||
|
<!-- Animation for when a dock window at the bottom of the screen is exiting while on Keyguard -->
|
||||||
|
<set xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:interpolator="@android:interpolator/fast_out_linear_in">
|
||||||
|
<translate android:fromYDelta="0" android:toYDelta="100%"
|
||||||
|
android:duration="200"/>
|
||||||
|
</set>
|
||||||
@@ -1459,6 +1459,7 @@
|
|||||||
<java-symbol type="anim" name="dock_top_exit" />
|
<java-symbol type="anim" name="dock_top_exit" />
|
||||||
<java-symbol type="anim" name="dock_bottom_enter" />
|
<java-symbol type="anim" name="dock_bottom_enter" />
|
||||||
<java-symbol type="anim" name="dock_bottom_exit" />
|
<java-symbol type="anim" name="dock_bottom_exit" />
|
||||||
|
<java-symbol type="anim" name="dock_bottom_exit_keyguard" />
|
||||||
<java-symbol type="anim" name="dock_left_enter" />
|
<java-symbol type="anim" name="dock_left_enter" />
|
||||||
<java-symbol type="anim" name="dock_left_exit" />
|
<java-symbol type="anim" name="dock_left_exit" />
|
||||||
<java-symbol type="anim" name="dock_right_enter" />
|
<java-symbol type="anim" name="dock_right_enter" />
|
||||||
|
|||||||
@@ -2805,7 +2805,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
|
|||||||
if (mNavigationBarPosition == NAV_BAR_BOTTOM) {
|
if (mNavigationBarPosition == NAV_BAR_BOTTOM) {
|
||||||
if (transit == TRANSIT_EXIT
|
if (transit == TRANSIT_EXIT
|
||||||
|| transit == TRANSIT_HIDE) {
|
|| transit == TRANSIT_HIDE) {
|
||||||
return R.anim.dock_bottom_exit;
|
if (isKeyguardShowingAndNotOccluded()) {
|
||||||
|
return R.anim.dock_bottom_exit_keyguard;
|
||||||
|
} else {
|
||||||
|
return R.anim.dock_bottom_exit;
|
||||||
|
}
|
||||||
} else if (transit == TRANSIT_ENTER
|
} else if (transit == TRANSIT_ENTER
|
||||||
|| transit == TRANSIT_SHOW) {
|
|| transit == TRANSIT_SHOW) {
|
||||||
return R.anim.dock_bottom_enter;
|
return R.anim.dock_bottom_enter;
|
||||||
|
|||||||
Reference in New Issue
Block a user