diff options
author | 2022-05-24 10:35:20 +0200 | |
---|---|---|
committer | 2022-05-24 09:43:19 +0000 | |
commit | 1f9c10de0d60b91c171cb01965fc48af2f4dd665 (patch) | |
tree | 047d06df1d78afa556bd1b035a80ca1b63f25821 | |
parent | aadfb596c4878e3f032bcfb3cb38575fd367db7c (diff) |
Make TV permission dialog be unrestricted keep-clear area
This makes the PiP window be moved away from the permission dialog
when both are shown
Bug: 227596282
Test: manual: start Pip alongside a permission dialog and verify that
the pip is moved away
Test: adb shell dumpsys package com.google.android.permissioncontroller \
| grep android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS
Change-Id: I969079422ca32659e19c20273ba2209eafdd8d60
3 files changed, 11 insertions, 1 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml index 2da7b2d43..e3490b105 100644 --- a/PermissionController/AndroidManifest.xml +++ b/PermissionController/AndroidManifest.xml @@ -61,6 +61,7 @@ <uses-permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE" /> <!--SYSTEM_APPLICATION_OVERLAY will be granted on T+, as installer protection is added in T --> <uses-permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY"/> + <uses-permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS"/> <application android:name="com.android.permissioncontroller.PermissionControllerApplication" android:label="@string/app_name" diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/GrantPermissionsViewHandlerImpl.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/GrantPermissionsViewHandlerImpl.java index e36855d2c..fa7f8120b 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/GrantPermissionsViewHandlerImpl.java +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/GrantPermissionsViewHandlerImpl.java @@ -8,6 +8,7 @@ import static com.android.permissioncontroller.permission.ui.GrantPermissionsAct import android.content.Context; import android.graphics.PixelFormat; +import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Build; @@ -30,6 +31,8 @@ import com.android.modules.utils.build.SdkLevel; import com.android.permissioncontroller.R; import com.android.permissioncontroller.permission.ui.GrantPermissionsViewHandler; +import java.util.Collections; + /** * TV-specific view handler for the grant permissions activity. */ @@ -97,6 +100,11 @@ public final class GrantPermissionsViewHandlerImpl implements GrantPermissionsVi mSoftDenyButton.setOnClickListener(this); mHardDenyButton.setOnClickListener(this); + mRootView.addOnLayoutChangeListener((view, l, t, r, b, oldL, oldT, oldR, oldB) -> { + mRootView.setUnrestrictedPreferKeepClearRects( + Collections.singletonList(new Rect(0, 0, r - l, b - t))); + }); + return mRootView; } diff --git a/permissions/com.android.permissioncontroller.xml b/permissions/com.android.permissioncontroller.xml index 7ac2d0612..453b47478 100644 --- a/permissions/com.android.permissioncontroller.xml +++ b/permissions/com.android.permissioncontroller.xml @@ -31,5 +31,6 @@ <permission name="android.permission.WRITE_SECURE_SETTINGS" /> <permission name="android.permission.READ_SAFETY_CENTER_STATUS" /> <permission name="android.permission.SEND_SAFETY_CENTER_UPDATE" /> + <permission name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" /> </privapp-permissions> -</permissions>
\ No newline at end of file +</permissions> |