summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dan Sandler <dsandler@android.com> 2024-10-09 10:04:33 -0400
committer Daniel Sandler <dsandler@android.com> 2024-10-09 14:12:09 +0000
commit684ecbab1bfabe830a7a88446ccb5fbc63fa45b0 (patch)
tree4109bbb9d2fb7d8920d1ac214e131c88225403be
parente03a73f7747aae486597342e3c381a4e1903083e (diff)
Opt tuner settings activity out of edge-to-edge.
Still fun for some, but not for all: this screen is no longer accessible by end users but is useful in OS development. (This quick fix does, however, fix a similar bug in the Demo Mode activity.) Fixes: 371216803 Fixes: 341039611 Flag: EXEMPT bugfix in legacy code Test: adb root \ && adb shell pm enable com.android.systemui/.tuner.TunerActivity \ && adb shell am start -n com.android.systemui/.tuner/TunerActivity Change-Id: Ibb6984ab4b44e12956c5c60b9903b73d12e1cd26
-rw-r--r--packages/SystemUI/res/values/styles.xml2
-rw-r--r--packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a02c35461031..5b9c64ff3e3e 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -676,10 +676,12 @@
<style name="TunerSettings" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="android:windowActionBar">false</item>
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
<item name="preferenceTheme">@style/TunerPreferenceTheme</item>
</style>
<style name="TunerPreferenceTheme" parent="@style/PreferenceThemeOverlay.SettingsBase">
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
<style name="TextAppearance.NotificationInfo.Confirmation">
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
index 213581787f73..d0817d736f07 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerActivity.java
@@ -61,7 +61,6 @@ public class TunerActivity extends Activity implements
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setTheme(androidx.appcompat.R.style.Theme_AppCompat_DayNight);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
requestWindowFeature(Window.FEATURE_NO_TITLE);