From 5bbab52e0062877e17579bec48031f06ded79963 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Wed, 12 Jul 2023 20:09:41 -0400
Subject: 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
Change-Id: I4fd4975421d204f06dbd8acda1a0d2a5a99f3465
---
 core/res/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 10cf353bf5e9..7d1253ccb687 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -7770,8 +7770,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>
-- 
cgit v1.2.3-59-g8ed1b