summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2022-06-16 12:24:49 +0100
committer Alex Johnston <acjohnston@google.com> 2022-06-16 12:24:53 +0100
commitb6db15ac2ffc4e29bf5abc0f7bb0a8d75ed8feb5 (patch)
treea2abc66adc081973226ce93b4268d2184592b76d /packages
parent25639f1b6df352962d3c8f8e0f5d290e620afe74 (diff)
Make WorkLockActivity theme translucent
* Instead, set the background in the auth_biometric_background view * This fixes a bug where there is an infinite loop to start the confirm device credential intent Bug: 234536059 Test: Manual testing with TestDPC Manual testing steps * Setup device with TestDPC * Set a work lock * Open TestDPC in the work profile * Select "lock now" * Verify there is no infinite loop Change-Id: I866e3d48a66e562050ad89ebc7f2ae0ac0455737
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/AndroidManifest.xml2
-rw-r--r--packages/SystemUI/res/layout/auth_biometric_background.xml2
2 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 490a3f53fd6a..6f22b49fc6a6 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -723,7 +723,7 @@
android:excludeFromRecents="true"
android:stateNotNeeded="true"
android:resumeWhilePausing="true"
- android:theme="@style/Theme.AppCompat.DayNight.NoActionBar">
+ android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen">
<intent-filter>
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/packages/SystemUI/res/layout/auth_biometric_background.xml b/packages/SystemUI/res/layout/auth_biometric_background.xml
index 7ce81ad7f01b..995aea11ffc6 100644
--- a/packages/SystemUI/res/layout/auth_biometric_background.xml
+++ b/packages/SystemUI/res/layout/auth_biometric_background.xml
@@ -16,6 +16,8 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ android:theme="@style/Theme.AppCompat.DayNight"
+ android:background="?android:colorBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"