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

Commit 1a3135ee authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Fix keyguard dismiss animation with occludable activities. 

See b/203044476#comment27 for before/after videos.

Test: Manual
Bug: 203044476
Change-Id: Ie80187a5ca9b61b8178bbe977bf252db654d9fa4
parent f87e6944

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

+8 −14
Original line number Diff line number Diff line
@@ -16,12 +16,9 @@ 
* limitations under the License.

*/

-->

<ripple

<shape

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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:color="?android:attr/textColorPrimary">

  <item>

    <shape

    android:shape="rectangle">

  <solid android:color="?androidprv:attr/colorSurface"/>

  <size
@@ -29,6 +26,3 @@ 
      android:height="@dimen/keyguard_affordance_height"/>

  <corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>

</shape>
 
  </item>

</ripple>

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -2513,6 +2513,12 @@ public class CentralSurfacesImpl extends CoreStartable implements 
                    animate, intent.getPackage(), (adapter) -> {

                        ActivityOptions options = new ActivityOptions(

                                CentralSurfaces.getActivityOptions(mDisplayId, adapter));



                        // We know that the intent of the caller is to dismiss the keyguard and

                        // this runnable is called right after the keyguard is solved, so we tell

                        // WM that we should dismiss it to avoid flickers when opening an activity

                        // that can also be shown over the keyguard.

                        options.setDismissKeyguard();

                        options.setDisallowEnterPictureInPictureWhileLaunching(

                                disallowEnterPictureInPictureWhileLaunching);

                        if (CameraIntents.isInsecureCameraIntent(intent)) {