Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jordan Demeulenaere
2022-05-17 10:12:50 +00:00
committed by Android (Google) Code Review
parent 0428d86493 1a3135ee5c
commit 43ad687b92
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/res/drawable/keyguard_bottom_affordance_bg.xml
View File

@@ -16,19 +16,13 @@
* 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"> android:shape="rectangle">
<item> <solid android:color="?androidprv:attr/colorSurface"/>
<shape <size
android:shape="rectangle"> android:width="@dimen/keyguard_affordance_width"
<solid android:color="?androidprv:attr/colorSurface"/> android:height="@dimen/keyguard_affordance_height"/>
<size <corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
android:width="@dimen/keyguard_affordance_width" </shape>
android:height="@dimen/keyguard_affordance_height"/>
<corners android:radius="@dimen/keyguard_affordance_fixed_radius"/>
</shape>
</item>
</ripple>

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

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