summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2023-08-18 05:04:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-18 05:04:27 +0000
commitb386ea02eb6aa0d7d2a41f92df1c866e64da5de8 (patch)
treee5b33ebe5f6b1654943bf892356ae184a60ba383
parentf0cdfdbd6f66fae90572b30524fa53969230a120 (diff)
parent47f2c221f8cfeef489d0daa340a7616e8e2f04ac (diff)
Merge "Fix back gesture / keycode for the PlatLogoActivity" into udc-qpr-dev am: bb3104a83b am: 47f2c221f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24407137 Change-Id: I52d0fdaf22f5205a17422b3c12e646fe72248537 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/res/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e129f7d22249..f55501ab1a8f 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7790,8 +7790,9 @@
android:process=":ui">
</activity>
<activity android:name="com.android.internal.app.PlatLogoActivity"
- android:theme="@style/Theme.Wallpaper.NoTitleBar.Fullscreen"
+ android:theme="@style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
+ android:enableOnBackInvokedCallback="true"
android:icon="@drawable/platlogo"
android:process=":ui">
</activity>