From 101823e6021386e9c62316e69f35436e2051884a Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Mon, 7 Jun 2021 16:18:02 +0800
Subject: [PATCH] Update the theme to fix background color problem

The action bar in the some setting pages has different background colors
when the action bar is in collapsed mode. These pages are using the default
settings theme that doesn't include edge-to-edge setting. This can be
fixed by assigning SubSettings theme to this activity.

Fix: 189189879
Fix: 188110157
Test: visual verified
Change-Id: Ie8d9b4c950e6a8ab5a7e361f94b8587d854b3b70
---
 AndroidManifest.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c4bf977f0b8..0a40c89d84b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -182,6 +182,7 @@
 
         <activity android:name=".Settings$CreateShortcutActivity"
                   android:exported="true"
+                  android:theme="@style/Theme.SubSettings"
                   android:label="@string/settings_shortcut">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -3713,6 +3714,7 @@
             android:name="Settings$GestureNavigationSettingsActivity"
             android:label="@string/gesture_settings_activity_title"
             android:exported="true"
+            android:theme="@style/Theme.SubSettings"
             android:enabled="true">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />