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

Commit ab45cb7c authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Fix keyguard dismiss animation with occludable activities." into... 

Merge "Fix keyguard dismiss animation with occludable activities." into tm-qpr-dev am: 43ad687b am: 5b340193

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18379255



Change-Id: I955657a7bf244aa2f96abf55fadc9bfc06f94e3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3fb95ba0 5b340193

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

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

* limitations under the License.

*/

*/

-->

-->

<ripple

<shape

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

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

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

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

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

  <item>

    <shape

    android:shape="rectangle">

    android:shape="rectangle">

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

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

  <size

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

      android:height="@dimen/keyguard_affordance_height"/>

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

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

</shape>
 
</shape>
 
  </item>

</ripple>

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

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

                    animate, intent.getPackage(), (adapter) -> {

                        ActivityOptions options = new ActivityOptions(

                        ActivityOptions options = new ActivityOptions(

                                CentralSurfaces.getActivityOptions(mDisplayId, adapter));

                                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(

                        options.setDisallowEnterPictureInPictureWhileLaunching(

                                disallowEnterPictureInPictureWhileLaunching);

                                disallowEnterPictureInPictureWhileLaunching);

                        if (CameraIntents.isInsecureCameraIntent(intent)) {

                        if (CameraIntents.isInsecureCameraIntent(intent)) {