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

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

Change-Id: Ic6fbd0cc1406c68f374993e59210277f0f922b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml

@@ -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

@@ -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)) {