Merge "Consistent color between status bar and app bar" into sc-dev (3d5fd19e) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+1 −18

Original line number	Diff line number	Diff line
		@@ -140,7 +140,6 @@

		<activity android:name=".network.telephony.MobileNetworkActivity"
		android:label="@string/network_settings_title"
		android:theme="@style/Theme.SubSettings"
		android:exported="true"
		android:launchMode="singleTask">
		<intent-filter android:priority="1">
		@@ -181,7 +180,6 @@

		<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" />
		@@ -418,7 +416,6 @@
		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" />
		@@ -473,7 +470,6 @@

		<activity android:name="Settings$FaceSettingsActivity"
		android:label="@string/security_settings_face_preference_title"
		android:theme="@style/Theme.SubSettings"
		android:exported="true"
		android:icon="@drawable/ic_face_header">
		<intent-filter>
		@@ -498,7 +494,6 @@

		<activity android:name="Settings$CombinedBiometricSettingsActivity"
		android:label="@string/security_settings_biometric_preference_title"
		android:theme="@style/Theme.SubSettings"
		android:exported="false">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.biometrics.combination.CombinedBiometricSettings" />
		@@ -506,7 +501,6 @@

		<activity android:name="Settings$CombinedBiometricProfileSettingsActivity"
		android:label="@string/security_settings_biometric_preference_title"
		android:theme="@style/Theme.SubSettings"
		android:exported="false">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.biometrics.combination.CombinedBiometricProfileSettings" />
		@@ -712,8 +706,7 @@
		<activity
		android:name="Settings$ManageAssistActivity"
		android:exported="true"
		android:label="@string/assist_and_voice_input_title"
		android:theme="@style/Theme.SubSettings">
		android:label="@string/assist_and_voice_input_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.VOICE_INPUT_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1153,7 +1146,6 @@
		<activity
		android:name="Settings$ManageDomainUrlsActivity"
		android:exported="true"
		android:theme="@style/Theme.SubSettings"
		android:label="@string/domain_urls_title">
		<intent-filter>
		<action android:name="android.settings.MANAGE_DOMAIN_URLS" />
		@@ -1331,7 +1323,6 @@
		<activity
		android:name=".notification.history.NotificationHistoryActivity"
		android:exported="true"
		android:theme="@style/Theme.SubSettings"
		android:label="@string/notification_history_title">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NOTIFICATION_HISTORY" />
		@@ -1494,7 +1485,6 @@
		</activity>

		<activity android:name=".security.RequestManageCredentials"
		android:theme="@style/Theme.SubSettings"
		android:exported="true">
		<intent-filter>
		<action android:name="android.security.MANAGE_CREDENTIALS"/>
		@@ -1527,7 +1517,6 @@
		<activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
		android:label="@string/device_admin_add_title"
		android:exported="true"
		android:theme="@style/Theme.SubSettings"
		android:clearTaskOnLaunch="true">
		<intent-filter>
		<action android:name="android.app.action.ADD_DEVICE_ADMIN" />
		@@ -2087,7 +2076,6 @@
		<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" />
		@@ -2458,7 +2446,6 @@

		<activity
		android:name="com.android.settings.accounts.AddAccountSettings"
		android:theme="@style/Theme.SubSettings"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:exported="true"
		android:label="@string/header_add_an_account">
		@@ -2472,7 +2459,6 @@

		<activity android:name="Settings$ChooseAccountActivity"
		android:label="@string/header_add_an_account"
		android:theme="@style/Theme.SubSettings"
		android:configChanges="orientation\|keyboardHidden\|screenSize">
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.accounts.ChooseAccountFragment" />
		@@ -3033,7 +3019,6 @@
		<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" />
		@@ -3723,7 +3708,6 @@
		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" />
		@@ -3807,7 +3791,6 @@
		android:permission="android.permission.BIND_JOB_SERVICE" />

		<activity android:name=".sim.smartForwarding.SmartForwardingActivity"
		android:theme="@style/Theme.SubSettings.Base"
		android:exported="true"
		android:launchMode="singleTask">
		</activity>

res/values-night/themes.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,9 @@
		<item name="colorPrimary">@*android:color/primary_device_default_settings</item>
		<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
		<item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
		<!-- Homepage should follow device default design, the values is same as device default theme.-->
		<item name="android:navigationBarColor">@android:color/black</item>
		<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
		</style>

		<style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>

res/values/themes.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,10 @@
		<item name="face_layout_theme">@style/FaceLayoutTheme</item>
		<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>

		<!-- For edge-to-edge -->
		<item name="android:navigationBarColor">@android:color/transparent</item>
		<item name="android:statusBarColor">@android:color/transparent</item>

		<!-- For wifi icon -->
		<item name="wifi_signal">@drawable/wifi_signal</item>
		<item name="wifi_signal_color">?android:attr/colorAccent</item>
		@@ -211,6 +215,9 @@
		<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
		<item name="android:windowLightStatusBar">true</item>
		<item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
		<!-- Homepage should follow device default design, the values is same as device default theme.-->
		<item name="android:navigationBarColor">@android:color/white</item>
		<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
		</style>

		<style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">