summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Fufa <sfufa@google.com>2019-11-14 20:40:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-11-14 20:40:02 +0000
commit16691a72bf858c20fae404b9e859b2130c6d18e9 (patch)
tree4558babf8af0674ae369c81a5aa53af190fd9311
parent49e72ac059ea24642c07e0a4046f7d7964c4a65c (diff)
parent9fee045ed9261ba1a2fb7249352a143017febf7c (diff)
downloadandroid_packages_apps_Trebuchet-16691a72bf858c20fae404b9e859b2130c6d18e9.tar.gz
android_packages_apps_Trebuchet-16691a72bf858c20fae404b9e859b2130c6d18e9.tar.bz2
android_packages_apps_Trebuchet-16691a72bf858c20fae404b9e859b2130c6d18e9.zip
Merge "Make home setting edge-to-edge" into ub-launcher3-qt-future-dev
-rw-r--r--AndroidManifest-common.xml2
-rw-r--r--res/values/styles.xml4
2 files changed, 5 insertions, 1 deletions
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 8db875be9..555cc7302 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -169,7 +169,7 @@
<activity
android:name="com.android.launcher3.settings.SettingsActivity"
android:label="@string/settings_button_text"
- android:theme="@android:style/Theme.DeviceDefault.Settings"
+ android:theme="@style/HomeSettingsTheme"
android:autoRemoveFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.APPLICATION_PREFERENCES" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 339aef5b6..80c791c58 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -130,6 +130,10 @@
<item name="widgetsTheme">@style/WidgetContainerTheme</item>
</style>
+ <style name="HomeSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+ <item name="android:navigationBarColor">@android:color/transparent</item>
+ </style>
+
<!--
Theme overrides to element on homescreen, i.e., which are drawn on top on wallpaper.
Various foreground colors are overridden to be workspaceTextColor so that they are properly