diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-05-23 20:10:09 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-23 20:10:09 +0000 |
commit | 5370e2e7755082997d6811cba325941ead46518d (patch) | |
tree | 4fc55313f4710c91c4ba5d174bbd37b696530a40 | |
parent | 52ed90b31184dc68cfac0edeeae5ba18aa2eea94 (diff) | |
parent | a218d0ed735ab321103aa810599a7bd896786c6e (diff) | |
download | packages_apps_Settings-5370e2e7755082997d6811cba325941ead46518d.zip packages_apps_Settings-5370e2e7755082997d6811cba325941ead46518d.tar.gz packages_apps_Settings-5370e2e7755082997d6811cba325941ead46518d.tar.bz2 |
Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
22 files changed, 2 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_settings_development.png b/res/drawable-hdpi/ic_settings_development.png Binary files differindex bbc702b..7f38de0 100644 --- a/res/drawable-hdpi/ic_settings_development.png +++ b/res/drawable-hdpi/ic_settings_development.png diff --git a/res/drawable-hdpi/ic_settings_display.png b/res/drawable-hdpi/ic_settings_display.png Binary files differindex 1230978..24719b1 100644 --- a/res/drawable-hdpi/ic_settings_display.png +++ b/res/drawable-hdpi/ic_settings_display.png diff --git a/res/drawable-hdpi/ic_settings_nfc_payment.png b/res/drawable-hdpi/ic_settings_nfc_payment.png Binary files differindex 7b63e53..7431cb0 100644 --- a/res/drawable-hdpi/ic_settings_nfc_payment.png +++ b/res/drawable-hdpi/ic_settings_nfc_payment.png diff --git a/res/drawable-hdpi/ic_settings_print.png b/res/drawable-hdpi/ic_settings_print.png Binary files differnew file mode 100644 index 0000000..62624ee --- /dev/null +++ b/res/drawable-hdpi/ic_settings_print.png diff --git a/res/drawable-mdpi/ic_settings_development.png b/res/drawable-mdpi/ic_settings_development.png Binary files differindex 647ceb9..44aaa29 100644 --- a/res/drawable-mdpi/ic_settings_development.png +++ b/res/drawable-mdpi/ic_settings_development.png diff --git a/res/drawable-mdpi/ic_settings_display.png b/res/drawable-mdpi/ic_settings_display.png Binary files differindex 4585f60..c794f76 100644 --- a/res/drawable-mdpi/ic_settings_display.png +++ b/res/drawable-mdpi/ic_settings_display.png diff --git a/res/drawable-mdpi/ic_settings_nfc_payment.png b/res/drawable-mdpi/ic_settings_nfc_payment.png Binary files differindex c3101bc..1cf5e86 100644 --- a/res/drawable-mdpi/ic_settings_nfc_payment.png +++ b/res/drawable-mdpi/ic_settings_nfc_payment.png diff --git a/res/drawable-mdpi/ic_settings_print.png b/res/drawable-mdpi/ic_settings_print.png Binary files differnew file mode 100644 index 0000000..76234a6 --- /dev/null +++ b/res/drawable-mdpi/ic_settings_print.png diff --git a/res/drawable-xhdpi/ic_settings_development.png b/res/drawable-xhdpi/ic_settings_development.png Binary files differindex 18d2dc8..2205036 100644 --- a/res/drawable-xhdpi/ic_settings_development.png +++ b/res/drawable-xhdpi/ic_settings_development.png diff --git a/res/drawable-xhdpi/ic_settings_display.png b/res/drawable-xhdpi/ic_settings_display.png Binary files differindex ab05aeb..be367f3 100644 --- a/res/drawable-xhdpi/ic_settings_display.png +++ b/res/drawable-xhdpi/ic_settings_display.png diff --git a/res/drawable-xhdpi/ic_settings_nfc_payment.png b/res/drawable-xhdpi/ic_settings_nfc_payment.png Binary files differindex e4d8173..4cf007d 100644 --- a/res/drawable-xhdpi/ic_settings_nfc_payment.png +++ b/res/drawable-xhdpi/ic_settings_nfc_payment.png diff --git a/res/drawable-xhdpi/ic_settings_print.png b/res/drawable-xhdpi/ic_settings_print.png Binary files differnew file mode 100644 index 0000000..9ea3b85 --- /dev/null +++ b/res/drawable-xhdpi/ic_settings_print.png diff --git a/res/drawable-xxhdpi/ic_settings_development.png b/res/drawable-xxhdpi/ic_settings_development.png Binary files differnew file mode 100644 index 0000000..35555d4 --- /dev/null +++ b/res/drawable-xxhdpi/ic_settings_development.png diff --git a/res/drawable-xxhdpi/ic_settings_display.png b/res/drawable-xxhdpi/ic_settings_display.png Binary files differindex f5a7a1c..a16ee17 100644 --- a/res/drawable-xxhdpi/ic_settings_display.png +++ b/res/drawable-xxhdpi/ic_settings_display.png diff --git a/res/drawable-xxhdpi/ic_settings_nfc_payment.png b/res/drawable-xxhdpi/ic_settings_nfc_payment.png Binary files differindex cdb495e..0b9e41e 100644 --- a/res/drawable-xxhdpi/ic_settings_nfc_payment.png +++ b/res/drawable-xxhdpi/ic_settings_nfc_payment.png diff --git a/res/drawable-xxhdpi/ic_settings_print.png b/res/drawable-xxhdpi/ic_settings_print.png Binary files differnew file mode 100644 index 0000000..a0058dc --- /dev/null +++ b/res/drawable-xxhdpi/ic_settings_print.png diff --git a/res/drawable-xxxhdpi/ic_settings_development.png b/res/drawable-xxxhdpi/ic_settings_development.png Binary files differnew file mode 100644 index 0000000..eaf1f2c --- /dev/null +++ b/res/drawable-xxxhdpi/ic_settings_development.png diff --git a/res/drawable-xxxhdpi/ic_settings_display.png b/res/drawable-xxxhdpi/ic_settings_display.png Binary files differindex 169c94f..4f6933d 100644 --- a/res/drawable-xxxhdpi/ic_settings_display.png +++ b/res/drawable-xxxhdpi/ic_settings_display.png diff --git a/res/drawable-xxxhdpi/ic_settings_nfc_payment.png b/res/drawable-xxxhdpi/ic_settings_nfc_payment.png Binary files differnew file mode 100644 index 0000000..01e1e0b --- /dev/null +++ b/res/drawable-xxxhdpi/ic_settings_nfc_payment.png diff --git a/res/drawable-xxxhdpi/ic_settings_print.png b/res/drawable-xxxhdpi/ic_settings_print.png Binary files differnew file mode 100644 index 0000000..f0ffb52 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_settings_print.png diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml index 63949cb..4180f14 100644 --- a/res/xml/dashboard_categories.xml +++ b/res/xml/dashboard_categories.xml @@ -228,7 +228,7 @@ android:id="@+id/print_settings" android:title="@string/print_settings" android:fragment="com.android.settings.print.PrintSettingsFragment" - android:icon="@*android:drawable/ic_print" + android:icon="@drawable/ic_settings_print" /> <!-- Development --> diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java index 03f06e6..7b87be2 100644 --- a/src/com/android/settings/search/SearchIndexableResources.java +++ b/src/com/android/settings/search/SearchIndexableResources.java @@ -215,7 +215,7 @@ public final class SearchIndexableResources { new SearchIndexableResource(RANK_PRINTING, NO_DATA_RES_ID, PrintSettingsFragment.class.getName(), - com.android.internal.R.drawable.ic_print)); + R.drawable.ic_settings_print)); sResMap.put(DevelopmentSettings.class.getName(), new SearchIndexableResource(RANK_DEVELOPEMENT, |