From 1f0879955c0b95d5008752f6b5a61cd526a339bf Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Mon, 24 Sep 2018 14:01:17 -0700 Subject: [PATCH] Settings icon pack refresh * ic_add_24dp * ic_airplane * ic_arrow_down_24dp * ic_cellular_off * ic_data_saver * ic_device_others * ic_info_outline_24dp * ic_search * ic_night_display * ic_lock_open * ic_wifi * ic_sync * ic_wallpaper * ic_phone Bug: 116360411 Test: visual Change-Id: I626cbb88043c36d32ab34b90fc83170bca0be12a --- res/drawable/drag_handle.xml | 16 +++--- res/drawable/ic_add.xml | 24 -------- res/drawable/ic_add_24dp.xml | 3 +- res/drawable/ic_airplane.xml | 57 ------------------- res/drawable/ic_arrow_down_24dp.xml | 27 --------- res/drawable/ic_cellular_off.xml | 16 ++++-- res/drawable/ic_data_saver.xml | 18 ++++-- res/drawable/ic_devices_other.xml | 17 ++---- res/drawable/ic_devices_other_black.xml | 11 +--- res/drawable/ic_info_outline_24dp.xml | 4 +- res/drawable/ic_local_phone_24_lib.xml | 8 +-- res/drawable/ic_search_24dp.xml | 19 +++---- res/drawable/ic_settings_night_display.xml | 16 +++--- res/drawable/ic_settings_security.xml | 15 +++-- res/drawable/ic_settings_security_white.xml | 14 +++-- res/drawable/ic_settings_wireless.xml | 2 +- res/drawable/ic_settings_wireless_white.xml | 2 +- res/drawable/ic_sync.xml | 11 ++-- res/drawable/ic_wallpaper.xml | 10 ++-- res/menu/time_zone_base_search_menu.xml | 2 +- res/values/aliases.xml | 1 - .../AirplaneModeConditionCard.java | 2 +- .../widget/EntityHeaderControllerTest.java | 4 +- 23 files changed, 99 insertions(+), 200 deletions(-) delete mode 100644 res/drawable/ic_add.xml delete mode 100644 res/drawable/ic_airplane.xml delete mode 100644 res/drawable/ic_arrow_down_24dp.xml diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml index 835ac5b58ac..1e3efeb3d45 100644 --- a/res/drawable/drag_handle.xml +++ b/res/drawable/drag_handle.xml @@ -15,13 +15,13 @@ --> - - - + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> + + diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml deleted file mode 100644 index e4ced7d817a..00000000000 --- a/res/drawable/ic_add.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml index f87a882a74b..f8c93ee9034 100644 --- a/res/drawable/ic_add_24dp.xml +++ b/res/drawable/ic_add_24dp.xml @@ -21,5 +21,6 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M21,16v-2l-8,-5V3.5C13,2.67 12.33,2 11.5,2S10,2.67 10,3.5V9l-8,5v2l8,-2.5V19l-2,1.5V22l3.5,-1l3.5,1v-1.5L13,19v-5.5L21,16z"/> + diff --git a/res/drawable/ic_airplane.xml b/res/drawable/ic_airplane.xml deleted file mode 100644 index b3e0ba0b5e8..00000000000 --- a/res/drawable/ic_airplane.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml deleted file mode 100644 index f334902646b..00000000000 --- a/res/drawable/ic_arrow_down_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml index 4f767cfbb11..76dbed574d3 100644 --- a/res/drawable/ic_cellular_off.xml +++ b/res/drawable/ic_cellular_off.xml @@ -14,15 +14,19 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="24" + android:viewportWidth="24" + android:tint="?android:attr/colorAccent"> + android:pathData="M21.19,21.19l-2.69,-2.69l-1.41,-1.41l-1.09,-1.09l-2,-2l-4,-4l-2,-2l-5.19,-5.19l-1.42,1.41l6.61,6.61l0,2.17l2.17,0l3.83,3.83l0,1.34l-2.59,-2.58l-1.41,1.41l5,5l2.09,-2.09l2.69,2.7z"/> + android:pathData="M14,11.17l2,2l0,-2.17l-2,0z"/> + diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml index d2d55a9581b..aefcd849421 100644 --- a/res/drawable/ic_data_saver.xml +++ b/res/drawable/ic_data_saver.xml @@ -14,12 +14,20 @@ limitations under the License. --> + android:pathData="M11,8l0,3l-3,0l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3z"/> + + + diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml index b40acebef83..c7b6cf2ead2 100644 --- a/res/drawable/ic_devices_other.xml +++ b/res/drawable/ic_devices_other.xml @@ -16,16 +16,11 @@ + android:autoMirrored="true" + android:viewportHeight="24" + android:viewportWidth="24"> + android:fillColor="@android:color/white" + android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/> + diff --git a/res/drawable/ic_devices_other_black.xml b/res/drawable/ic_devices_other_black.xml index babcc637652..926f02cd00f 100644 --- a/res/drawable/ic_devices_other_black.xml +++ b/res/drawable/ic_devices_other_black.xml @@ -19,12 +19,7 @@ android:width="24dp" android:height="24dp" android:tint="?android:attr/colorControlNormal"> - - + \ No newline at end of file diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml index 3d8b89fc557..634d797c7f2 100644 --- a/res/drawable/ic_info_outline_24dp.xml +++ b/res/drawable/ic_info_outline_24dp.xml @@ -17,8 +17,8 @@ + android:viewportWidth="24"> - + android:pathData="M16.01,14.46l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3L4,3C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1l0,-4.15c0,-0.48 -0.34,-0.89 -0.8,-0.98l-3.26,-0.65C16.58,14.12 16.24,14.23 16.01,14.46z"/> diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml index 8f14e888f71..d63711a5bd9 100644 --- a/res/drawable/ic_search_24dp.xml +++ b/res/drawable/ic_search_24dp.xml @@ -16,15 +16,12 @@ --> - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> - \ No newline at end of file + android:fillColor="#FF000000" + android:pathData="M20.49,19l-5.73,-5.73C15.53,12.2 16,10.91 16,9.5C16,5.91 13.09,3 9.5,3S3,5.91 3,9.5C3,13.09 5.91,16 9.5,16c1.41,0 2.7,-0.47 3.77,-1.24L19,20.49L20.49,19zM5,9.5C5,7.01 7.01,5 9.5,5S14,7.01 14,9.5S11.99,14 9.5,14S5,11.99 5,9.5z"/> + diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml index 178b1315545..3292ed44180 100644 --- a/res/drawable/ic_settings_night_display.xml +++ b/res/drawable/ic_settings_night_display.xml @@ -14,12 +14,12 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:tint="?android:attr/colorControlNormal" + android:viewportHeight="24" + android:viewportWidth="24"> - \ No newline at end of file + android:fillColor="#FF000000" + android:pathData="M15.5,22c1.05,0 2.05,-0.16 3,-0.46c-4.06,-1.27 -7,-5.06 -7,-9.54s2.94,-8.27 7,-9.54C17.55,2.16 16.55,2 15.5,2c-5.52,0 -10,4.48 -10,10S9.98,22 15.5,22L15.5,22z"/> + diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml index 055babc768e..6065dd96746 100644 --- a/res/drawable/ic_settings_security.xml +++ b/res/drawable/ic_settings_security.xml @@ -14,12 +14,15 @@ limitations under the License. --> - + android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/> + + \ No newline at end of file diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml index 544ebef31d8..17794024f69 100644 --- a/res/drawable/ic_settings_security_white.xml +++ b/res/drawable/ic_settings_security_white.xml @@ -14,11 +14,15 @@ limitations under the License. --> + android:width="24dp" + android:height="24dp" + android:viewportHeight="24" + android:viewportWidth="24"> + android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/> + + diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml index 0c894eb0622..f9b4bbc4439 100644 --- a/res/drawable/ic_settings_wireless.xml +++ b/res/drawable/ic_settings_wireless.xml @@ -21,5 +21,5 @@ android:tint="?android:attr/colorControlNormal"> + android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/> diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml index 8dedb0d8ca7..3271b8b4f66 100644 --- a/res/drawable/ic_settings_wireless_white.xml +++ b/res/drawable/ic_settings_wireless_white.xml @@ -20,5 +20,5 @@ android:viewportHeight="24.0"> + android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/> diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml index 45a2dbdb911..ed16b03df57 100644 --- a/res/drawable/ic_sync.xml +++ b/res/drawable/ic_sync.xml @@ -16,10 +16,13 @@ + android:fillColor="#FFFFFFFF" + android:pathData="M17.26,6H19V4h-6v0.07V10h2V6.81c1.79,1.04 3,2.97 3,5.19c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,9.6 18.93,7.46 17.26,6z"/> + diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml index 20da9c33a66..d0fc6becdd8 100644 --- a/res/drawable/ic_wallpaper.xml +++ b/res/drawable/ic_wallpaper.xml @@ -14,12 +14,12 @@ limitations under the License. --> + android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/> diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml index 92241af4551..6df42c4260d 100644 --- a/res/menu/time_zone_base_search_menu.xml +++ b/res/menu/time_zone_base_search_menu.xml @@ -19,7 +19,7 @@ diff --git a/res/values/aliases.xml b/res/values/aliases.xml index 1be4350a99b..060ba1d4dad 100644 --- a/res/values/aliases.xml +++ b/res/values/aliases.xml @@ -23,6 +23,5 @@ @layout/fingerprint_enroll_enrolling_base @layout/fingerprint_enroll_finish_base @layout/choose_lock_pattern_common - @drawable/ic_search_24dp diff --git a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java b/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java index f56fcc34d98..2fbe80a2ded 100644 --- a/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java +++ b/src/com/android/settings/homepage/conditional/AirplaneModeConditionCard.java @@ -47,7 +47,7 @@ public class AirplaneModeConditionCard implements ConditionalCard { @Override public Drawable getIcon() { - return mAppContext.getDrawable(R.drawable.ic_airplane); + return mAppContext.getDrawable(R.drawable.ic_airplanemode_active); } @Override diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index ff93b7ee820..cc9bee099c2 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -125,7 +125,7 @@ public class EntityHeaderControllerTest { mController.setLabel(testString); mController.setSummary(testString); mController.setSecondSummary(testString); - mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add)); + mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp)); mController.done(mActivity); assertThat(label).isNotNull(); @@ -238,7 +238,7 @@ public class EntityHeaderControllerTest { when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class)); mController = EntityHeaderController.newInstance(mActivity, mFragment, view); String description = "Fake Description"; - mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add)); + mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp)); mController.setIconContentDescription(description); mController.done(mActivity); assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())