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

Commit 219d7a50 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Add methods to coordinate unlock animation." into lmp-preview-dev

parents 575510c4 0d674623

core/java/android/view/IWindowManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ interface IWindowManager 
    boolean isKeyguardSecure();

    boolean inKeyguardRestrictedInputMode();

    void dismissKeyguard();

    void keyguardGoingAway();



    void closeSystemDialogs(String reason);

core/java/android/view/WindowManagerPolicy.java

+15 −3
Original line number Diff line number Diff line
@@ -608,7 +608,14 @@ public interface WindowManagerPolicy { 
     * Return whether the given window should forcibly hide everything

     * behind it.  Typically returns true for the keyguard.

     */

    public boolean doesForceHide(WindowState win, WindowManager.LayoutParams attrs);

    public boolean doesForceHide(WindowManager.LayoutParams attrs);





    /**

     * Return whether the given window can become one that passes doesForceHide() test.

     * Typically returns true for the StatusBar.

     */

    public boolean isKeyguardHostWindow(WindowManager.LayoutParams attrs);



    /**

     * Determine if a window that is behind one that is force hiding
@@ -1195,4 +1202,9 @@ public interface WindowManagerPolicy { 
     * @return True if the window is a top level one.

     */

    public boolean isTopLevelWindow(int windowType);



    /**

     * Notifies the keyguard to start fading out.

     */

    public void startKeyguardExitAnimation(long fadeoutDuration);

}

core/java/com/android/internal/policy/IKeyguardService.aidl

+6 −0
Original line number Diff line number Diff line
@@ -56,4 +56,10 @@ interface IKeyguardService { 
    oneway void dispatch(in MotionEvent event);

    oneway void launchCamera();

    oneway void onBootCompleted();



    /**

     * Notifies that the activity behind has now been drawn and it's safe to remove the wallpaper

     * and keyguard flag.

     */

    oneway void startKeyguardExitAnimation(long fadeoutDuration);

}

core/res/res/anim/lock_screen_behind_enter.xml

+2 −3
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ 
<set xmlns:android="http://schemas.android.com/apk/res/android"

    android:background="#ff000000" android:shareInterpolator="false">

    <alpha

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

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

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

        android:interpolator="@interpolator/decelerate_quint"

        android:startOffset="@android:integer/config_shortAnimTime"

        android:duration="@android:integer/config_shortAnimTime"/>

        android:duration="0"/>

</set>
 
 No newline at end of file

core/res/res/anim/lock_screen_wallpaper_behind_enter.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 
        android:fromAlpha="0.0" android:toAlpha="1.0"

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

        android:interpolator="@interpolator/decelerate_quad"

        android:startOffset="@android:integer/config_shortAnimTime"

        android:startOffset="@android:integer/config_mediumAnimTime"

        android:duration="@android:integer/config_shortAnimTime"/>

</set>