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

Commit 79071973 authored by Issei Suzuki's avatar Issei Suzuki Committed by android-build-merger
Browse files

Merge "Added subtle animation for unlocking screen." into qt-r1-dev 

am: 0ca1dbcb

Change-Id: I08834a57295530c15d19811cccc72174f9f428ad
parents 925b8818 0ca1dbcb

core/java/android/view/WindowManager.java

+6 −0
Original line number Diff line number Diff line
@@ -318,6 +318,12 @@ public interface WindowManager extends ViewManager { 
     */

    int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER = 0x4;



    /**

     * Transition flag: Keyguard is going away with subtle animation.

     * @hide

     */

    int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION = 0x8;



    /**

     * @hide

     */

core/java/android/view/WindowManagerPolicyConstants.java

+2 −1
Original line number Diff line number Diff line
@@ -38,10 +38,11 @@ public interface WindowManagerPolicyConstants { 
    int FLAG_INTERACTIVE = 0x20000000;

    int FLAG_PASS_TO_USER = 0x40000000;



    // Flags for IActivityManager.keyguardGoingAway()

    // Flags for IActivityTaskManager.keyguardGoingAway()

    int KEYGUARD_GOING_AWAY_FLAG_TO_SHADE = 1 << 0;

    int KEYGUARD_GOING_AWAY_FLAG_NO_WINDOW_ANIMATIONS = 1 << 1;

    int KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER = 1 << 2;

    int KEYGUARD_GOING_AWAY_FLAG_SUBTLE_WINDOW_ANIMATIONS = 1 << 3;



    // Flags used for indicating whether the internal and/or external input devices

    // of some type are available.

core/res/res/anim/lock_screen_behind_enter_subtle.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2019 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

  -->



<set xmlns:android="http://schemas.android.com/apk/res/android"

        android:detachWallpaper="true"

        android:shareInterpolator="false">



   <alpha

        android:fromAlpha="0.0" android:toAlpha="1.0"

        android:fillEnabled="true" android:fillBefore="true"

        android:interpolator="@interpolator/linear"

        android:duration="233"/>

    <translate android:fromYDelta="5%p" android:toYDelta="0"

            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"

            android:interpolator="@interpolator/fast_out_slow_in"

            android:duration="233" />

</set>
 
 No newline at end of file

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2274,6 +2274,7 @@ 
  <java-symbol type="anim" name="lock_screen_behind_enter" />

  <java-symbol type="anim" name="lock_screen_behind_enter_wallpaper" />

  <java-symbol type="anim" name="lock_screen_behind_enter_fade_in" />

  <java-symbol type="anim" name="lock_screen_behind_enter_subtle" />

  <java-symbol type="anim" name="lock_screen_wallpaper_exit" />

  <java-symbol type="anim" name="launch_task_behind_source" />

  <java-symbol type="anim" name="wallpaper_open_exit" />

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Diff line number Diff line
@@ -1800,6 +1800,10 @@ public class KeyguardViewMediator extends SystemUI { 
            if (mStatusBarKeyguardViewManager.isUnlockWithWallpaper()) {

                flags |= WindowManagerPolicyConstants.KEYGUARD_GOING_AWAY_FLAG_WITH_WALLPAPER;

            }

            if (mStatusBarKeyguardViewManager.shouldSubtleWindowAnimationsForUnlock()) {

                flags |= WindowManagerPolicyConstants

                        .KEYGUARD_GOING_AWAY_FLAG_SUBTLE_WINDOW_ANIMATIONS;

            }



            mUpdateMonitor.setKeyguardGoingAway(true /* goingAway */);