Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quicker exit animation for bottom dock on Keyguard am: 48832811b0

Browse Source 
am: 6e690e32a0

Change-Id: Ida90524726d313f3d153945bcd998186fb920655
This commit is contained in:
Jorim Jaggi
2016-09-06 22:06:43 +00:00
committed by android-build-merger
parent d54504020d 6e690e32a0
commit 292a746358
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/res/res/anim/dock_bottom_exit_keyguard.xml Normal file
View 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>

1
core/res/res/values/symbols.xml
View File

@@ -1460,6 +1460,7 @@
<java-symbol type="anim" name="dock_top_exit" />
<java-symbol type="anim" name="dock_bottom_enter" />
<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_exit" />
<java-symbol type="anim" name="dock_right_enter" />

6
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -2902,7 +2902,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (mNavigationBarPosition == NAV_BAR_BOTTOM) {
if (transit == TRANSIT_EXIT
|| 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
|| transit == TRANSIT_SHOW) {
return R.anim.dock_bottom_enter;