Merge "Make homepage icons more colorful!" (99f5ef7d) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+15 −15

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@
		<activity android:name=".Settings$NetworkDashboardActivity"
		android:taskAffinity="com.android.settings"
		android:label="@string/network_dashboard_title"
		android:icon="@drawable/ic_settings_wireless"
		android:icon="@drawable/ic_homepage_network"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.WIRELESS_SETTINGS" />
		@@ -184,7 +184,7 @@
		<activity android:name=".Settings$ConnectedDeviceDashboardActivity"
		android:taskAffinity="com.android.settings"
		android:label="@string/connected_devices_dashboard_title"
		android:icon="@drawable/ic_devices_other"
		android:icon="@drawable/ic_homepage_connected_device"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NFC_SETTINGS" />
		@@ -210,7 +210,7 @@
		android:enabled="false"
		android:taskAffinity="com.android.settings"
		android:label="@string/connected_devices_dashboard_title"
		android:icon="@drawable/ic_devices_other"
		android:icon="@drawable/ic_homepage_connected_device"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NFC_SETTINGS" />
		@@ -903,7 +903,7 @@

		<activity android:name="Settings$DisplaySettingsActivity"
		android:label="@string/display_settings"
		android:icon="@drawable/ic_settings_display"
		android:icon="@drawable/ic_homepage_display"
		android:taskAffinity="">
		<intent-filter android:priority="1">
		<action android:name="com.android.settings.DISPLAY_SETTINGS" />
		@@ -1284,7 +1284,7 @@

		<activity android:name="Settings$SecuritySettingsActivity"
		android:label="@string/security_settings_title"
		android:icon="@drawable/ic_settings_security"
		android:icon="@drawable/ic_homepage_security"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:taskAffinity=""
		android:parentActivityName="Settings">
		@@ -1312,7 +1312,7 @@
		<!-- TODO(32953042) Merge with Settings$SecuritySettingsActivity -->
		<activity android:name="Settings$SecuritySettingsActivityV2"
		android:label="@string/security_settings_title"
		android:icon="@drawable/ic_settings_security"
		android:icon="@drawable/ic_homepage_security"
		android:enabled="false"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:taskAffinity=""
		@@ -1475,7 +1475,7 @@

		<activity android:name="Settings$AccessibilitySettingsActivity"
		android:label="@string/accessibility_settings"
		android:icon="@drawable/ic_settings_accessibility"
		android:icon="@drawable/ic_homepage_accessibility"
		android:configChanges="orientation\|keyboardHidden\|screenSize"
		android:taskAffinity="">
		<intent-filter android:priority="1">
		@@ -1805,7 +1805,7 @@

		<activity android:name=".Settings$StorageDashboardActivity"
		android:label="@string/storage_settings"
		android:icon="@drawable/ic_settings_storage"
		android:icon="@drawable/ic_homepage_storage"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		@@ -2227,7 +2227,7 @@

		<activity android:name="Settings$PowerUsageSummaryActivity"
		android:label="@string/power_usage_summary_title"
		android:icon="@drawable/ic_settings_battery"
		android:icon="@drawable/ic_homepage_battery"
		android:enabled="false">
		<intent-filter android:priority="1">
		<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
		@@ -2258,7 +2258,7 @@

		<activity android:name=".Settings$PowerUsageSummaryLegacyActivity"
		android:label="@string/power_usage_summary_title"
		android:icon="@drawable/ic_settings_battery">
		android:icon="@drawable/ic_homepage_battery">
		<intent-filter>
		<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -2643,7 +2643,7 @@
		<!-- Keep compatibility with old shortcuts. -->
		<activity android:name="Settings$SoundSettingsActivity"
		android:label="@string/sound_settings"
		android:icon="@drawable/ic_settings_sound"
		android:icon="@drawable/ic_homepage_sound"
		android:taskAffinity=""
		android:exported="true">
		<intent-filter android:priority="1">
		@@ -3086,7 +3086,7 @@
		<!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
		<activity android:name=".Settings$AppAndNotificationDashboardActivity"
		android:label="@string/app_and_notification_dashboard_title"
		android:icon="@drawable/ic_apps">
		android:icon="@drawable/ic_homepage_apps">
		<intent-filter android:priority="9">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		@@ -3100,7 +3100,7 @@

		<activity android:name=".Settings$UserAndAccountDashboardActivity"
		android:label="@string/account_dashboard_title"
		android:icon="@drawable/ic_settings_accounts">
		android:icon="@drawable/ic_homepage_accounts">
		<intent-filter android:priority="3">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		@@ -3118,7 +3118,7 @@

		<activity android:name=".Settings$SystemDashboardActivity"
		android:label="@string/header_category_system"
		android:icon="@drawable/ic_settings_about">
		android:icon="@drawable/ic_homepage_system_dashboard">
		<intent-filter android:priority="-1">
		<action android:name="com.android.settings.action.SETTINGS"/>
		</intent-filter>
		@@ -3132,7 +3132,7 @@

		<activity android:name=".support.SupportDashboardActivity"
		android:label="@string/page_tab_title_support"
		android:icon="@drawable/ic_help"
		android:icon="@drawable/ic_homepage_support"
		android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
		android:enabled="@bool/config_support_enabled">
		<intent-filter android:priority="-2">

color-check-baseline.xml

+423 −23

File changed.

Preview size limit exceeded, changes collapsed.

res/drawable/ic_apps.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		android:viewportHeight="24.0">
		<path
		android:pathData="M6 8c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6 12c1.1 0 2-.9 2-2s-.9-2-2-2-2
		.9-2 2 .9 2 2 2zm-6 0c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm0-6c1.1 0 2-.9

res/drawable/ic_devices_other.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		android:viewportHeight="24.0">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M3,6h17c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H3C1.9,4,1,4.9,1,6v12c0,1.1,0.9,2,2,2h3c0.55,0,1-0.45,1-1v0

res/drawable/ic_help.xml

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?android:attr/colorControlNormal">
		android:viewportHeight="24.0">
		<path
		android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 16.81c-.72
		0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3 .58 1.3 1.3-.58 1.3-1.3