From 129036cf751a2becd6e484059f07e7529ebfe7d6 Mon Sep 17 00:00:00 2001
From: Mill Chen <millchen@google.com>
Date: Wed, 5 May 2021 18:50:25 +0800
Subject: [PATCH] Fix color filling on some Wifi pages

Since there's no edge-to-edge in the theme that Wifi page applied, it
caused the different colors filled in status bar and collapsing
toolbar area separately. It can be fixed by updating the theme to
Theme.SubSettings.

Fix: 187016196
Fix: 187021412
Test: visual verified
Change-Id: I686861c37acfb1eeddda1278cd70fa5bfd44cc1d
---
 AndroidManifest.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9b11fe81c98..54ea5f27358 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -141,7 +141,7 @@
 
         <activity android:name=".network.telephony.MobileNetworkActivity"
                   android:label="@string/network_settings_title"
-                  android:theme="@style/Theme.Settings.Home"
+                  android:theme="@style/Theme.SubSettings"
                   android:exported="true"
                   android:launchMode="singleTask">
             <intent-filter android:priority="1">
@@ -418,6 +418,7 @@
                 android:label="@string/apn_settings"
                 android:launchMode="singleTask"
                 android:exported="true"
+                android:theme="@style/Theme.SubSettings"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -2059,6 +2060,7 @@
         <activity android:name="Settings$ApnEditorActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:exported="true"
+                android:theme="@style/Theme.SubSettings"
                 android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -2999,6 +3001,7 @@
         <activity
             android:name="Settings$WifiCallingSettingsActivity"
             android:exported="true"
+            android:theme="@style/Theme.SubSettings"
             android:label="@string/wifi_calling_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />