Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e690e32 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Quicker exit animation for bottom dock on Keyguard

am: 48832811

Change-Id: Ifd3603c9c41fb475730521452a0326b453e2ce8d
parents abc60347 48832811
Loading
Loading
Loading
Loading
+22 −0
Original line number Diff line number Diff line
<!--
  ~ 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>
 No newline at end of file
+1 −0
Original line number Diff line number Diff line
@@ -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" />
+5 −1
Original line number Diff line number Diff line
@@ -2902,7 +2902,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            if (mNavigationBarPosition == NAV_BAR_BOTTOM) {
                if (transit == TRANSIT_EXIT
                        || transit == TRANSIT_HIDE) {
                    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;