Merge "Fix color filling on some Wifi pages" into sc-dev am: b720318fd3

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439324

Change-Id: I0ac438a4a3fa145dbff54ffbe48c88b7db0d4c3f
This commit is contained in:
TreeHugger Robot
2021-05-06 07:06:43 +00:00
committed by Automerger Merge Worker

View File

@@ -142,7 +142,7 @@
<activity android:name=".network.telephony.MobileNetworkActivity" <activity android:name=".network.telephony.MobileNetworkActivity"
android:label="@string/network_settings_title" android:label="@string/network_settings_title"
android:theme="@style/Theme.Settings.Home" android:theme="@style/Theme.SubSettings"
android:exported="true" android:exported="true"
android:launchMode="singleTask"> android:launchMode="singleTask">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
@@ -419,6 +419,7 @@
android:label="@string/apn_settings" android:label="@string/apn_settings"
android:launchMode="singleTask" android:launchMode="singleTask"
android:exported="true" android:exported="true"
android:theme="@style/Theme.SubSettings"
android:configChanges="orientation|keyboardHidden|screenSize"> android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.APN_SETTINGS" /> <action android:name="android.settings.APN_SETTINGS" />
@@ -2061,6 +2062,7 @@
<activity android:name="Settings$ApnEditorActivity" <activity android:name="Settings$ApnEditorActivity"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true" android:exported="true"
android:theme="@style/Theme.SubSettings"
android:label="@string/apn_edit"> android:label="@string/apn_edit">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@@ -3001,6 +3003,7 @@
<activity <activity
android:name="Settings$WifiCallingSettingsActivity" android:name="Settings$WifiCallingSettingsActivity"
android:exported="true" android:exported="true"
android:theme="@style/Theme.SubSettings"
android:label="@string/wifi_calling_settings_title"> android:label="@string/wifi_calling_settings_title">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />