summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Sandler <dsandler@android.com>2023-07-12 20:09:41 -0400
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-15 21:18:04 +0000
commitf8d5e3701589c2c9fa37a0d60c8be8dec92f8846 (patch)
treef702396abf3f3cb221130d30e00703e219251329
parentc84f7f90605db5d6466889cfba848c5855ede0cd (diff)
downloadbase-f8d5e3701589c2c9fa37a0d60c8be8dec92f8846.tar.gz
Fix back gesture / keycode for the PlatLogoActivity
By overriding onKeyUp on the Activity itself, without calling super, I broke legacy back handling. Fortunately, there is now a better way to handle back! (Also fix the theme to avoid wallpaper showing through display cutout insets.) Test: adb shell input keyevent --longpress KEYCODE_BACK Test: swipe from edge Fixes: 289648693 Fixes: 290989795 (cherry picked from commit 5bbab52e0062877e17579bec48031f06ded79963) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eeacd7d3f11f204057da54a8229eab3b18a08a93) Merged-In: I4fd4975421d204f06dbd8acda1a0d2a5a99f3465 Change-Id: I4fd4975421d204f06dbd8acda1a0d2a5a99f3465
-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 2f9f6ae3f3c4..4dbc54fa2481 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7752,8 +7752,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>