summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tiger Huang <tigerhuang@google.com> 2024-03-08 07:02:49 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-08 07:02:49 +0000
commit91a2c2fcc30b80b2a4f3ea23e39b504d293509c5 (patch)
tree78f45ede77a8431f34e380c81dd0fc344599e962
parentb1e79c13a2cebb9dc0fe566575c314c9efa43c2f (diff)
parent45dbf98295130791dc58edb2dbd5330b552f7c39 (diff)
Merge "Set windowOptOutEdgeToEdgeEnforcement for PeopleTileConfigActivity" into main
-rw-r--r--packages/SystemUI/res/values-night/styles.xml5
-rw-r--r--packages/SystemUI/res/values/styles.xml5
2 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml
index b6971d3c1fa4..291f8a20bdd2 100644
--- a/packages/SystemUI/res/values-night/styles.xml
+++ b/packages/SystemUI/res/values-night/styles.xml
@@ -53,6 +53,11 @@
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowLightStatusBar">false</item>
+
+ <!--
+ TODO(b/309578419): Make activities handle insets properly and then remove this.
+ -->
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
<style name="TextAppearance.InternetDialog.Active">
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index ce08ca3e43af..4e7809ade792 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -987,6 +987,11 @@
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowLightStatusBar">true</item>
+
+ <!--
+ TODO(b/309578419): Make activities handle insets properly and then remove this.
+ -->
+ <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
</style>
<style name="Theme.EditWidgetsActivity"