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

Commit e847f7ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix keyguard dismiss animation with occludable activities." into tm-d1-dev

parents 85817e65 07d87012

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
@@ -2494,6 +2494,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)) {