From 3250885c9feb9b42d60058a823c57a027c0dcf58 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Wed, 18 Jan 2017 09:17:13 -0500 Subject: [PATCH] Visual refresh for QS Adds circles and things Test: visual Change-Id: I7d974fcfe6257357abfd1a7d0ee521f0e6cee588 --- .../src/com/android/settingslib/Utils.java | 29 ++++- ..._total_silence_disable_alpha_animation.xml | 26 ---- .../ic_hotspot_disable_animation_root.xml | 24 ---- .../anim/ic_hotspot_enable_animation_root.xml | 24 ---- ...c_invert_colors_disable_animation_root.xml | 24 ---- ...ic_invert_colors_enable_animation_root.xml | 24 ---- ...signal_airplane_disable_animation_root.xml | 24 ---- ..._signal_airplane_enable_animation_root.xml | 24 ---- ...gnal_flashlight_disable_animation_root.xml | 24 ---- ...ignal_flashlight_enable_animation_root.xml | 24 ---- ...signal_location_disable_animation_root.xml | 24 ---- ..._signal_location_enable_animation_root.xml | 24 ---- ...signal_workmode_disable_animation_root.xml | 24 ---- ..._signal_workmode_enable_animation_root.xml | 24 ---- .../res/drawable/ic_access_alarms_small.xml | 4 +- .../res/drawable/ic_dnd_disable_animation.xml | 3 - ...ic_dnd_total_silence_disable_animation.xml | 3 - .../drawable/ic_hotspot_disable_animation.xml | 3 - .../res/drawable/ic_hotspot_enable.xml | 4 +- .../drawable/ic_hotspot_enable_animation.xml | 3 - .../res/drawable/ic_hotspot_unavailable.xml | 4 +- .../ic_invert_colors_disable_animation.xml | 3 - .../ic_invert_colors_enable_animation.xml | 3 - .../res/drawable/ic_qs_battery_saver.xml | 28 ++++ .../res/drawable/ic_qs_bluetooth_off.xml | 2 +- .../SystemUI/res/drawable/ic_qs_cast_off.xml | 5 +- .../SystemUI/res/drawable/ic_qs_cast_on.xml | 3 +- .../SystemUI/res/drawable/ic_qs_circle.xml | 7 +- .../res/drawable/ic_qs_data_disabled.xml | 9 +- .../SystemUI/res/drawable/ic_qs_dnd_off.xml | 4 +- .../SystemUI/res/drawable/ic_qs_dnd_on.xml | 3 +- .../drawable/ic_qs_dnd_on_total_silence.xml | 3 +- .../SystemUI/res/drawable/ic_qs_minus.xml | 3 +- .../res/drawable/ic_qs_night_display_off.xml | 6 +- .../res/drawable/ic_qs_night_display_on.xml | 5 +- .../SystemUI/res/drawable/ic_qs_no_sim.xml | 5 +- packages/SystemUI/res/drawable/ic_qs_plus.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_0.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_1.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_1x.xml | 5 +- .../SystemUI/res/drawable/ic_qs_signal_2.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_3.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_3g.xml | 5 +- .../SystemUI/res/drawable/ic_qs_signal_4.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_4g.xml | 5 +- .../res/drawable/ic_qs_signal_4g_plus.xml | 7 +- .../ic_qs_signal_carrier_network_change.xml | 3 +- .../res/drawable/ic_qs_signal_disabled.xml | 7 +- .../SystemUI/res/drawable/ic_qs_signal_e.xml | 5 +- .../res/drawable/ic_qs_signal_full_0.xml | 3 +- .../res/drawable/ic_qs_signal_full_1.xml | 3 +- .../res/drawable/ic_qs_signal_full_2.xml | 3 +- .../res/drawable/ic_qs_signal_full_3.xml | 3 +- .../res/drawable/ic_qs_signal_full_4.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_g.xml | 5 +- .../SystemUI/res/drawable/ic_qs_signal_h.xml | 5 +- .../SystemUI/res/drawable/ic_qs_signal_in.xml | 3 +- .../res/drawable/ic_qs_signal_lte.xml | 5 +- .../res/drawable/ic_qs_signal_lte_plus.xml | 7 +- .../res/drawable/ic_qs_signal_no_signal.xml | 5 +- .../res/drawable/ic_qs_signal_out.xml | 3 +- .../SystemUI/res/drawable/ic_qs_signal_r.xml | 5 +- packages/SystemUI/res/drawable/ic_qs_vpn.xml | 2 +- .../SystemUI/res/drawable/ic_qs_wifi_0.xml | 3 +- .../SystemUI/res/drawable/ic_qs_wifi_1.xml | 3 +- .../SystemUI/res/drawable/ic_qs_wifi_2.xml | 3 +- .../SystemUI/res/drawable/ic_qs_wifi_3.xml | 3 +- .../SystemUI/res/drawable/ic_qs_wifi_4.xml | 3 +- .../res/drawable/ic_qs_wifi_disabled.xml | 7 +- .../res/drawable/ic_qs_wifi_disconnected.xml | 3 +- .../res/drawable/ic_qs_wifi_full_0.xml | 3 +- .../res/drawable/ic_qs_wifi_full_1.xml | 3 +- .../res/drawable/ic_qs_wifi_full_2.xml | 3 +- .../res/drawable/ic_qs_wifi_full_3.xml | 3 +- .../res/drawable/ic_qs_wifi_full_4.xml | 3 +- .../res/drawable/ic_qs_wifi_no_network.xml | 5 +- .../res/drawable/ic_settings_20dp.xml | 3 +- .../drawable/ic_signal_airplane_disable.xml | 3 +- .../ic_signal_airplane_disable_animation.xml | 3 - .../drawable/ic_signal_airplane_enable.xml | 4 +- .../ic_signal_airplane_enable_animation.xml | 3 - .../drawable/ic_signal_flashlight_disable.xml | 3 +- ...ic_signal_flashlight_disable_animation.xml | 3 - .../drawable/ic_signal_flashlight_enable.xml | 4 +- .../ic_signal_flashlight_enable_animation.xml | 3 - .../drawable/ic_signal_location_disable.xml | 3 +- .../ic_signal_location_disable_animation.xml | 3 - .../drawable/ic_signal_location_enable.xml | 4 +- .../ic_signal_location_enable_animation.xml | 3 - .../ic_signal_workmode_disable_animation.xml | 3 - .../drawable/ic_signal_workmode_enable.xml | 1 - .../ic_signal_workmode_enable_animation.xml | 3 - packages/SystemUI/res/drawable/minor_a_b.xml | 4 +- packages/SystemUI/res/drawable/minor_b_a.xml | 4 +- packages/SystemUI/res/drawable/minor_b_c.xml | 4 +- packages/SystemUI/res/drawable/minor_c_b.xml | 4 +- .../res/drawable/qs_dual_tile_caret.xml | 25 ++++ .../SystemUI/res/drawable/qs_ic_wifi_lock.xml | 3 +- ..._sys_managed_profile_disable_animation.xml | 1 - .../res/layout/qs_customize_tile_frame.xml | 5 +- packages/SystemUI/res/layout/qs_detail.xml | 20 +-- .../SystemUI/res/layout/qs_detail_item.xml | 4 +- .../SystemUI/res/layout/qs_detail_items.xml | 3 +- .../qs_page_indicator.xml} | 24 ++-- .../res/layout/qs_paged_tile_layout.xml | 9 -- packages/SystemUI/res/layout/qs_panel.xml | 5 +- .../SystemUI/res/layout/qs_tile_label.xml | 7 +- .../quick_settings_brightness_dialog.xml | 1 + .../quick_status_bar_expanded_header.xml | 120 ++++++++++++------ .../SystemUI/res/layout/split_clock_view.xml | 5 +- packages/SystemUI/res/layout/status_bar.xml | 2 +- .../res/layout/status_bar_alarm_group.xml | 1 + .../res/layout/zen_mode_condition.xml | 2 + packages/SystemUI/res/values/attrs.xml | 5 +- packages/SystemUI/res/values/dimens.xml | 8 +- packages/SystemUI/res/values/styles.xml | 16 ++- .../systemui/BatteryMeterDrawable.java | 6 +- .../android/systemui/BatteryMeterView.java | 8 +- .../android/systemui/qs/PageIndicator.java | 10 +- .../android/systemui/qs/PagedTileLayout.java | 20 ++- .../com/android/systemui/qs/QSAnimator.java | 4 +- .../android/systemui/qs/QSContainerImpl.java | 8 +- .../com/android/systemui/qs/QSIconView.java | 44 ++++++- .../src/com/android/systemui/qs/QSPanel.java | 41 +++--- .../src/com/android/systemui/qs/QSTile.java | 34 ++++- .../android/systemui/qs/QSTileBaseView.java | 78 ++++++++++-- .../com/android/systemui/qs/QSTileView.java | 62 +++++---- .../com/android/systemui/qs/QuickQSPanel.java | 7 +- .../android/systemui/qs/SignalTileView.java | 14 -- .../systemui/qs/external/CustomTile.java | 33 ++--- .../systemui/qs/tiles/AirplaneModeTile.java | 2 + .../systemui/qs/tiles/BatteryTile.java | 40 ++---- .../systemui/qs/tiles/BluetoothTile.java | 7 +- .../android/systemui/qs/tiles/CastTile.java | 7 + .../systemui/qs/tiles/CellularTile.java | 14 +- .../systemui/qs/tiles/ColorInversionTile.java | 2 + .../systemui/qs/tiles/DataSaverTile.java | 2 + .../android/systemui/qs/tiles/DndTile.java | 24 ++-- .../systemui/qs/tiles/FlashlightTile.java | 13 +- .../systemui/qs/tiles/HotspotTile.java | 8 +- .../systemui/qs/tiles/LocationTile.java | 2 + .../systemui/qs/tiles/NightDisplayTile.java | 2 + .../systemui/qs/tiles/RotationLockTile.java | 2 + .../android/systemui/qs/tiles/WifiTile.java | 6 +- .../systemui/qs/tiles/WorkModeTile.java | 2 + .../systemui/statusbar/SignalClusterView.java | 6 +- .../statusbar/phone/PhoneStatusBar.java | 1 + .../statusbar/phone/QuickStatusBarHeader.java | 50 ++++++-- .../statusbar/policy/TelephonyIcons.java | 2 +- 149 files changed, 684 insertions(+), 819 deletions(-) delete mode 100644 packages/SystemUI/res/anim/ic_dnd_total_silence_disable_alpha_animation.xml delete mode 100644 packages/SystemUI/res/anim/ic_hotspot_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_hotspot_enable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_invert_colors_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_invert_colors_enable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_airplane_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_airplane_enable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_flashlight_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_flashlight_enable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_location_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_location_enable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_workmode_disable_animation_root.xml delete mode 100644 packages/SystemUI/res/anim/ic_signal_workmode_enable_animation_root.xml create mode 100644 packages/SystemUI/res/drawable/ic_qs_battery_saver.xml create mode 100644 packages/SystemUI/res/drawable/qs_dual_tile_caret.xml rename packages/SystemUI/res/{anim/ic_dnd_disable_alpha_animation.xml => layout/qs_page_indicator.xml} (54%) diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java index 6179244a27f68..24c03c96265fe 100644 --- a/packages/SettingsLib/src/com/android/settingslib/Utils.java +++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java @@ -13,6 +13,7 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; import android.os.BatteryManager; @@ -160,10 +161,7 @@ public class Utils { @ColorInt public static int getColorAccent(Context context) { - TypedArray ta = context.obtainStyledAttributes(new int[]{android.R.attr.colorAccent}); - @ColorInt int colorAccent = ta.getColor(0, 0); - ta.recycle(); - return colorAccent; + return getColorAttr(context, android.R.attr.colorAccent); } @ColorInt @@ -182,6 +180,29 @@ public class Utils { return list.getDefaultColor(); } + @ColorInt + public static int getDisabled(Context context, int inputColor) { + return applyAlphaAttr(context, android.R.attr.disabledAlpha, inputColor); + } + + @ColorInt + public static int applyAlphaAttr(Context context, int attr, int inputColor) { + TypedArray ta = context.obtainStyledAttributes(new int[]{attr}); + float alpha = ta.getFloat(0, 0); + ta.recycle(); + alpha *= Color.alpha(inputColor); + return Color.argb((int) (alpha), Color.red(inputColor), Color.green(inputColor), + Color.blue(inputColor)); + } + + @ColorInt + public static int getColorAttr(Context context, int attr) { + TypedArray ta = context.obtainStyledAttributes(new int[]{attr}); + @ColorInt int colorAccent = ta.getColor(0, 0); + ta.recycle(); + return colorAccent; + } + /** * Determine whether a package is a "system package", in which case certain things (like * disabling notifications or disabling the package altogether) should be disallowed. diff --git a/packages/SystemUI/res/anim/ic_dnd_total_silence_disable_alpha_animation.xml b/packages/SystemUI/res/anim/ic_dnd_total_silence_disable_alpha_animation.xml deleted file mode 100644 index 21caab4fae18a..0000000000000 --- a/packages/SystemUI/res/anim/ic_dnd_total_silence_disable_alpha_animation.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_hotspot_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_hotspot_disable_animation_root.xml deleted file mode 100644 index 770c40149dcf8..0000000000000 --- a/packages/SystemUI/res/anim/ic_hotspot_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_hotspot_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_hotspot_enable_animation_root.xml deleted file mode 100644 index 387ca290a1cad..0000000000000 --- a/packages/SystemUI/res/anim/ic_hotspot_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_invert_colors_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_invert_colors_disable_animation_root.xml deleted file mode 100644 index 770c40149dcf8..0000000000000 --- a/packages/SystemUI/res/anim/ic_invert_colors_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_invert_colors_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_invert_colors_enable_animation_root.xml deleted file mode 100644 index 387ca290a1cad..0000000000000 --- a/packages/SystemUI/res/anim/ic_invert_colors_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_airplane_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_airplane_disable_animation_root.xml deleted file mode 100644 index 770c40149dcf8..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_airplane_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_airplane_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_airplane_enable_animation_root.xml deleted file mode 100644 index 387ca290a1cad..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_airplane_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_flashlight_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_flashlight_disable_animation_root.xml deleted file mode 100644 index 770c40149dcf8..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_flashlight_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_flashlight_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_flashlight_enable_animation_root.xml deleted file mode 100644 index 387ca290a1cad..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_flashlight_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_location_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_location_disable_animation_root.xml deleted file mode 100644 index 770c40149dcf8..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_location_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_location_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_location_enable_animation_root.xml deleted file mode 100644 index 387ca290a1cad..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_location_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_workmode_disable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_workmode_disable_animation_root.xml deleted file mode 100644 index 72834c90f4b91..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_workmode_disable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/anim/ic_signal_workmode_enable_animation_root.xml b/packages/SystemUI/res/anim/ic_signal_workmode_enable_animation_root.xml deleted file mode 100644 index 85573e05bc81f..0000000000000 --- a/packages/SystemUI/res/anim/ic_signal_workmode_enable_animation_root.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/packages/SystemUI/res/drawable/ic_access_alarms_small.xml b/packages/SystemUI/res/drawable/ic_access_alarms_small.xml index 994274a580f51..b94cc8e4dc125 100644 --- a/packages/SystemUI/res/drawable/ic_access_alarms_small.xml +++ b/packages/SystemUI/res/drawable/ic_access_alarms_small.xml @@ -18,9 +18,9 @@ Copyright (C) 2014 The Android Open Source Project android:height="16dp" android:viewportWidth="24.0" android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:tint="?android:attr/textColorTertiary"> diff --git a/packages/SystemUI/res/drawable/ic_dnd_disable_animation.xml b/packages/SystemUI/res/drawable/ic_dnd_disable_animation.xml index 13ed767d0ca0c..d7554811d2eab 100644 --- a/packages/SystemUI/res/drawable/ic_dnd_disable_animation.xml +++ b/packages/SystemUI/res/drawable/ic_dnd_disable_animation.xml @@ -23,7 +23,4 @@ - diff --git a/packages/SystemUI/res/drawable/ic_dnd_total_silence_disable_animation.xml b/packages/SystemUI/res/drawable/ic_dnd_total_silence_disable_animation.xml index c0b2d69e2524c..f796d62a94424 100644 --- a/packages/SystemUI/res/drawable/ic_dnd_total_silence_disable_animation.xml +++ b/packages/SystemUI/res/drawable/ic_dnd_total_silence_disable_animation.xml @@ -23,7 +23,4 @@ - diff --git a/packages/SystemUI/res/drawable/ic_hotspot_disable_animation.xml b/packages/SystemUI/res/drawable/ic_hotspot_disable_animation.xml index 694c23f709b2b..e446a32494f8f 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_disable_animation.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_disable_animation.xml @@ -16,9 +16,6 @@ --> - diff --git a/packages/SystemUI/res/drawable/ic_hotspot_enable.xml b/packages/SystemUI/res/drawable/ic_hotspot_enable.xml index 31e7fe1d56aea..7a99630867f17 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_enable.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_enable.xml @@ -16,12 +16,10 @@ --> + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml index 83f46e590a1dd..7641998a8cd9b 100644 --- a/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml +++ b/packages/SystemUI/res/drawable/ic_hotspot_unavailable.xml @@ -19,9 +19,7 @@ android:height="48dp" android:width="48dp" android:viewportHeight="48" - android:viewportWidth="48" - android:alpha="0.25" - android:tint="?android:attr/colorControlNormal" > + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_invert_colors_enable_animation.xml b/packages/SystemUI/res/drawable/ic_invert_colors_enable_animation.xml index 879066c351617..85928aca6eeab 100644 --- a/packages/SystemUI/res/drawable/ic_invert_colors_enable_animation.xml +++ b/packages/SystemUI/res/drawable/ic_invert_colors_enable_animation.xml @@ -16,9 +16,6 @@ --> - diff --git a/packages/SystemUI/res/drawable/ic_qs_battery_saver.xml b/packages/SystemUI/res/drawable/ic_qs_battery_saver.xml new file mode 100644 index 0000000000000..7b29740be3387 --- /dev/null +++ b/packages/SystemUI/res/drawable/ic_qs_battery_saver.xml @@ -0,0 +1,28 @@ + + + + diff --git a/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml index 36eb418757df2..3148a2c9c2366 100644 --- a/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml +++ b/packages/SystemUI/res/drawable/ic_qs_bluetooth_off.xml @@ -21,6 +21,6 @@ Copyright (C) 2014 The Android Open Source Project android:tint="?android:attr/colorControlNormal"> diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_off.xml b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml index 0fdbe1f06fc71..06a088678ab4b 100644 --- a/packages/SystemUI/res/drawable/ic_qs_cast_off.xml +++ b/packages/SystemUI/res/drawable/ic_qs_cast_off.xml @@ -17,10 +17,9 @@ Copyright (C) 2014 The Android Open Source Project android:width="64dp" android:height="64dp" android:viewportWidth="48.0" - android:viewportHeight="48.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="48.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_cast_on.xml b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml index d2e9eb2feaaaf..794eb9e6bd588 100644 --- a/packages/SystemUI/res/drawable/ic_qs_cast_on.xml +++ b/packages/SystemUI/res/drawable/ic_qs_cast_on.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="64dp" android:height="64dp" android:viewportWidth="48.0" - android:viewportHeight="48.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="48.0"> + android:width="17dp" + android:height="17.0dp" + android:viewportWidth="20.0" + android:viewportHeight="20.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_dnd_off.xml b/packages/SystemUI/res/drawable/ic_qs_dnd_off.xml index 164a5577fa42d..9168dbc417f7e 100644 --- a/packages/SystemUI/res/drawable/ic_qs_dnd_off.xml +++ b/packages/SystemUI/res/drawable/ic_qs_dnd_off.xml @@ -17,9 +17,7 @@ Copyright (C) 2015 The Android Open Source Project android:height="64dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:alpha=".3" - android:width="64dp" - android:tint="?android:attr/colorControlNormal" > + android:width="64dp" > + android:viewportHeight="48.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_dnd_on_total_silence.xml b/packages/SystemUI/res/drawable/ic_qs_dnd_on_total_silence.xml index 5f4fa11b66ea5..fb26c096f9dcb 100644 --- a/packages/SystemUI/res/drawable/ic_qs_dnd_on_total_silence.xml +++ b/packages/SystemUI/res/drawable/ic_qs_dnd_on_total_silence.xml @@ -17,8 +17,7 @@ android:width="64dp" android:height="64dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:width="24.0dp" > + android:viewportHeight="24"> diff --git a/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml b/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml index d875592dfd874..aaca663e59e97 100644 --- a/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml +++ b/packages/SystemUI/res/drawable/ic_qs_night_display_on.xml @@ -17,11 +17,10 @@ android:width="64dp" android:height="64dp" android:viewportWidth="24" - android:viewportHeight="24" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24"> diff --git a/packages/SystemUI/res/drawable/ic_qs_no_sim.xml b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml index 2d831b2e3e3f0..69869fe9c9bed 100644 --- a/packages/SystemUI/res/drawable/ic_qs_no_sim.xml +++ b/packages/SystemUI/res/drawable/ic_qs_no_sim.xml @@ -17,10 +17,9 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_plus.xml b/packages/SystemUI/res/drawable/ic_qs_plus.xml index 1f254d1ee86b6..393f51c00781d 100644 --- a/packages/SystemUI/res/drawable/ic_qs_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_plus.xml @@ -17,8 +17,7 @@ android:height="24.0dp" android:viewportHeight="48.0" android:viewportWidth="48.0" - android:width="24.0dp" - android:tint="?android:attr/colorControlNormal" > + android:width="24.0dp" > + android:viewportHeight="24.0"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml index 3a55623132000..195849a932beb 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_1x.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="12.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml index e9f5a0b0a50ee..8a488170e4381 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_2.xml @@ -18,8 +18,7 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml index 769d64891e019..39cc94cad4dbc 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_3.xml @@ -18,8 +18,7 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:viewportHeight="13.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml index 1bec1b8aed9bd..012e95e985ce5 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4.xml @@ -18,8 +18,7 @@ android:width="32.0dp" android:height="32.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml index 8e1f8eb418738..61ecc9c02a45e 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="12.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml index e0c6b68cf618d..54c52bfa4fc41 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_4g_plus.xml @@ -14,11 +14,10 @@ limitations under the License. --> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml b/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml index 1c068e5b4fb26..96e2fd4e5f826 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_carrier_network_change.xml @@ -17,8 +17,7 @@ android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml index 4c904219cf14a..dd0f2715fa293 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_e.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_e.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="5.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml index db4df76184962..326373ddc9e81 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_0.xml @@ -18,8 +18,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml index 6e5439d16d503..8baa4ebd0c267 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml @@ -18,8 +18,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml index 194edc3089ac9..bf19a718e0fc9 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_2.xml @@ -18,8 +18,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml index b57af5c265f34..01839e8589ef0 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_3.xml @@ -18,8 +18,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml index 7d754a856ec77..48151ad78a6c2 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_full_4.xml @@ -18,8 +18,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml index 64aadf94a582b..3b47c0d20f3f4 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_g.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_g.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="7.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml index 31918a99617d2..d694e61453275 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_h.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_h.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="6.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_in.xml b/packages/SystemUI/res/drawable/ic_qs_signal_in.xml index 4122b76da01ab..236fdac09c4bd 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_in.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_in.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="6.0dp" android:height="32dp" android:viewportWidth="6.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml index 87660756989a4..a381d03e272ad 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="13.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml index 5ff7d8575a771..3bed28a33609e 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_lte_plus.xml @@ -14,11 +14,10 @@ limitations under the License. --> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml index 4e65004080609..c8c857c7ef0ca 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_no_signal.xml @@ -18,9 +18,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32dp" android:height="32dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_out.xml b/packages/SystemUI/res/drawable/ic_qs_signal_out.xml index a3823ae083758..c510972a5df8f 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_out.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_out.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="6.0dp" android:height="32dp" android:viewportWidth="6.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_signal_r.xml b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml index 2c10dc3f86ba8..40bfbe694cca8 100644 --- a/packages/SystemUI/res/drawable/ic_qs_signal_r.xml +++ b/packages/SystemUI/res/drawable/ic_qs_signal_r.xml @@ -14,11 +14,10 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> + android:viewportHeight="6.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_vpn.xml b/packages/SystemUI/res/drawable/ic_qs_vpn.xml index e7ef02a29f6ad..cf24e1277d6d6 100644 --- a/packages/SystemUI/res/drawable/ic_qs_vpn.xml +++ b/packages/SystemUI/res/drawable/ic_qs_vpn.xml @@ -19,6 +19,6 @@ Copyright (C) 2014 The Android Open Source Project android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml index fe963b153ffaf..e6f9292657096 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_0.xml @@ -17,8 +17,7 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml index f30ba76204552..1982130fb1c65 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_2.xml @@ -17,8 +17,7 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml index 8a17083d01484..b35011181a867 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_3.xml @@ -17,8 +17,7 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml index fcd57d0b4de84..136a004354308 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_4.xml @@ -17,8 +17,7 @@ android:width="24.0dp" android:height="24.0dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_disabled.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_disabled.xml index bbff2e15ea357..bed37b1cbf1aa 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_disabled.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_disabled.xml @@ -17,12 +17,11 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml index 071892a54698f..2dcdb71194d17 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_disconnected.xml @@ -17,8 +17,7 @@ android:width="26.0dp" android:height="24.0dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml index f6092955a35d8..58561159e6a99 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_1.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml index f44b303d1b81d..4a5e1f8fa1b15 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_2.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml index 850f5b90afc35..965442d4c2630 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_3.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml index 8ccc1fd91968a..b29d3f932b62d 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_full_4.xml @@ -17,8 +17,7 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml b/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml index 45cfc1c57b82b..e59e7f4b61e3f 100644 --- a/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml +++ b/packages/SystemUI/res/drawable/ic_qs_wifi_no_network.xml @@ -17,9 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="32.0dp" android:height="29.5dp" android:viewportWidth="26.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_settings_20dp.xml b/packages/SystemUI/res/drawable/ic_settings_20dp.xml index 45ee94f55e8ad..3170f86811ed5 100644 --- a/packages/SystemUI/res/drawable/ic_settings_20dp.xml +++ b/packages/SystemUI/res/drawable/ic_settings_20dp.xml @@ -17,8 +17,7 @@ android:width="20dp" android:height="20dp" android:viewportWidth="24.0" - android:viewportHeight="24.0" - android:tint="?android:attr/colorControlNormal"> + android:viewportHeight="24.0"> diff --git a/packages/SystemUI/res/drawable/ic_signal_airplane_disable.xml b/packages/SystemUI/res/drawable/ic_signal_airplane_disable.xml index 2ff0de4d5eedb..09a67e1c41b56 100644 --- a/packages/SystemUI/res/drawable/ic_signal_airplane_disable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_airplane_disable.xml @@ -20,8 +20,7 @@ android:height="48dp" android:width="48dp" android:viewportHeight="48" - android:viewportWidth="48" - android:tint="?android:attr/colorControlNormal" > + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_airplane_enable.xml b/packages/SystemUI/res/drawable/ic_signal_airplane_enable.xml index 998727917b9b9..b7ac0134b2213 100644 --- a/packages/SystemUI/res/drawable/ic_signal_airplane_enable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_airplane_enable.xml @@ -16,12 +16,10 @@ --> + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_flashlight_disable.xml b/packages/SystemUI/res/drawable/ic_signal_flashlight_disable.xml index 542797a080c40..35844b72b9ec6 100644 --- a/packages/SystemUI/res/drawable/ic_signal_flashlight_disable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_flashlight_disable.xml @@ -20,8 +20,7 @@ android:height="48dp" android:width="48dp" android:viewportHeight="48" - android:viewportWidth="48" - android:tint="?android:attr/colorControlNormal" > + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_flashlight_enable.xml b/packages/SystemUI/res/drawable/ic_signal_flashlight_enable.xml index a5ba05bcfecbb..c2215f12a3e90 100644 --- a/packages/SystemUI/res/drawable/ic_signal_flashlight_enable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_flashlight_enable.xml @@ -16,12 +16,10 @@ --> + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_location_disable.xml b/packages/SystemUI/res/drawable/ic_signal_location_disable.xml index e36f270d75603..439851d3500a1 100644 --- a/packages/SystemUI/res/drawable/ic_signal_location_disable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_location_disable.xml @@ -20,8 +20,7 @@ android:height="48dp" android:width="48dp" android:viewportHeight="48" - android:viewportWidth="48" - android:tint="?android:attr/colorControlNormal" > + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_location_enable.xml b/packages/SystemUI/res/drawable/ic_signal_location_enable.xml index 46a72bc7e4551..d4b8673e070f4 100644 --- a/packages/SystemUI/res/drawable/ic_signal_location_enable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_location_enable.xml @@ -16,12 +16,10 @@ --> + android:viewportWidth="48" > - diff --git a/packages/SystemUI/res/drawable/ic_signal_workmode_disable_animation.xml b/packages/SystemUI/res/drawable/ic_signal_workmode_disable_animation.xml index a15a1271dace7..9c2312686024f 100644 --- a/packages/SystemUI/res/drawable/ic_signal_workmode_disable_animation.xml +++ b/packages/SystemUI/res/drawable/ic_signal_workmode_disable_animation.xml @@ -16,9 +16,6 @@ --> - diff --git a/packages/SystemUI/res/drawable/ic_signal_workmode_enable.xml b/packages/SystemUI/res/drawable/ic_signal_workmode_enable.xml index ad14505795d04..f962594803408 100644 --- a/packages/SystemUI/res/drawable/ic_signal_workmode_enable.xml +++ b/packages/SystemUI/res/drawable/ic_signal_workmode_enable.xml @@ -16,7 +16,6 @@ --> - diff --git a/packages/SystemUI/res/drawable/minor_a_b.xml b/packages/SystemUI/res/drawable/minor_a_b.xml index 0622aacd134e7..4bb330cbcac56 100644 --- a/packages/SystemUI/res/drawable/minor_a_b.xml +++ b/packages/SystemUI/res/drawable/minor_a_b.xml @@ -17,12 +17,10 @@ + android:viewportHeight="8" > + android:viewportHeight="8" > + android:viewportHeight="8" > + android:viewportHeight="8" > + + + + diff --git a/packages/SystemUI/res/drawable/qs_ic_wifi_lock.xml b/packages/SystemUI/res/drawable/qs_ic_wifi_lock.xml index 2ac223b057fb1..b7da30b035769 100644 --- a/packages/SystemUI/res/drawable/qs_ic_wifi_lock.xml +++ b/packages/SystemUI/res/drawable/qs_ic_wifi_lock.xml @@ -17,7 +17,8 @@ Copyright (C) 2014 The Android Open Source Project android:width="24.0dp" android:height="24.0dp" android:viewportWidth="72.0" - android:viewportHeight="72.0"> + android:viewportHeight="72.0" + android:tint="?android:attr/textColorPrimary"> diff --git a/packages/SystemUI/res/drawable/stat_sys_managed_profile_disable_animation.xml b/packages/SystemUI/res/drawable/stat_sys_managed_profile_disable_animation.xml index c6a2fdd089b49..1e41a31ae130f 100644 --- a/packages/SystemUI/res/drawable/stat_sys_managed_profile_disable_animation.xml +++ b/packages/SystemUI/res/drawable/stat_sys_managed_profile_disable_animation.xml @@ -16,7 +16,6 @@ Copyright (C) 2015 The Android Open Source Project + android:paddingTop="8dp" + android:gravity="center" /> diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index 50ee64a321b84..25d52263957b3 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -20,10 +20,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/qs_detail_background" - android:paddingBottom="8dp" android:clickable="true" - android:visibility="invisible" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingBottom="8dp" + android:visibility="invisible"> + android:layout_height="wrap_content" + /> + - + diff --git a/packages/SystemUI/res/layout/qs_detail_item.xml b/packages/SystemUI/res/layout/qs_detail_item.xml index 7876ada2590d6..6edf13566ad04 100644 --- a/packages/SystemUI/res/layout/qs_detail_item.xml +++ b/packages/SystemUI/res/layout/qs_detail_item.xml @@ -29,7 +29,8 @@ android:layout_width="@dimen/qs_detail_item_icon_size" android:layout_height="@dimen/qs_detail_item_icon_size" android:layout_marginStart="@dimen/qs_detail_item_icon_marginStart" - android:layout_marginEnd="@dimen/qs_detail_item_icon_marginEnd" /> + android:layout_marginEnd="@dimen/qs_detail_item_icon_marginEnd" + android:tint="?android:attr/textColorPrimary"/> diff --git a/packages/SystemUI/res/layout/qs_detail_items.xml b/packages/SystemUI/res/layout/qs_detail_items.xml index 9a7e1b67ccd3a..b9cdf28aa4560 100644 --- a/packages/SystemUI/res/layout/qs_detail_items.xml +++ b/packages/SystemUI/res/layout/qs_detail_items.xml @@ -43,7 +43,8 @@ + android:layout_height="56dp" + android:tint="?android:attr/textColorSecondary" /> - - - + \ No newline at end of file diff --git a/packages/SystemUI/res/layout/qs_paged_tile_layout.xml b/packages/SystemUI/res/layout/qs_paged_tile_layout.xml index 8b6060f5eb8b6..8ff1d1e3ba18d 100644 --- a/packages/SystemUI/res/layout/qs_paged_tile_layout.xml +++ b/packages/SystemUI/res/layout/qs_paged_tile_layout.xml @@ -28,15 +28,6 @@ android:layout_height="48dp" android:layout_gravity="bottom"> - - diff --git a/packages/SystemUI/res/layout/qs_panel.xml b/packages/SystemUI/res/layout/qs_panel.xml index 9e0a6fe4f6c51..895185bbfaac2 100644 --- a/packages/SystemUI/res/layout/qs_panel.xml +++ b/packages/SystemUI/res/layout/qs_panel.xml @@ -26,10 +26,9 @@ + android:layout_height="wrap_content" /> diff --git a/packages/SystemUI/res/layout/qs_tile_label.xml b/packages/SystemUI/res/layout/qs_tile_label.xml index 5b0f0df475007..a093b8734dbbc 100644 --- a/packages/SystemUI/res/layout/qs_tile_label.xml +++ b/packages/SystemUI/res/layout/qs_tile_label.xml @@ -18,11 +18,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" + android:paddingTop="16dp"> - \ No newline at end of file + diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml index 080f553e123e2..6988c765cf96a 100644 --- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml +++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml @@ -17,6 +17,7 @@ xmlns:systemui="http://schemas.android.com/apk/res-auto" android:layout_height="48dp" android:layout_width="match_parent" + android:layout_marginBottom="24dp" android:paddingLeft="16dp" android:paddingRight="16dp" style="@style/BrightnessDialogContainer"> diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 53acb9f14ad9f..4122707de740e 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -23,30 +23,35 @@ android:layout_width="match_parent" android:layout_height="@dimen/status_bar_header_height" android:layout_gravity="@integer/notification_panel_layout_gravity" - android:clipChildren="false" - android:clipToPadding="false" android:baselineAligned="false" android:clickable="false" + android:clipChildren="false" + android:clipToPadding="false" + android:paddingTop="0dp" + android:paddingEnd="0dp" + android:paddingStart="0dp" > + android:gravity="center" + android:paddingEnd="4dp" + android:orientation="horizontal"> - - + + + android:focusable="true" + android:padding="14dp" + android:src="@drawable/ic_mode_edit" + android:tint="?android:attr/colorForeground"/> + + + + + + + + + + + android:tint="?android:attr/colorForeground"/> + + android:src="@drawable/tuner" + android:tint="?android:attr/textColorTertiary" + android:visibility="invisible"/> @@ -106,23 +142,26 @@ + android:text="@*android:string/emergency_calls_only" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.EmergencyCallsOnly" + android:visibility="gone"/> @@ -130,38 +169,41 @@ android:id="@+id/quick_qs_panel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="52dp" - android:layout_marginStart="12dp" - android:layout_marginEnd="12dp" android:layout_alignParentEnd="true" + android:layout_marginTop="54dp" + android:layout_marginBottom="24dp" + android:layout_alignParentTop="true" + android:accessibilityTraversalAfter="@+id/date_time_group" + android:accessibilityTraversalBefore="@id/expand_indicator" android:clipChildren="false" android:clipToPadding="false" - android:importantForAccessibility="yes" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:focusable="true" - android:accessibilityTraversalAfter="@+id/date_time_group" - android:accessibilityTraversalBefore="@id/expand_indicator" /> + android:importantForAccessibility="yes" + android:paddingTop="0dp"/> diff --git a/packages/SystemUI/res/layout/split_clock_view.xml b/packages/SystemUI/res/layout/split_clock_view.xml index ae5136f2a3996..8198f0333a941 100644 --- a/packages/SystemUI/res/layout/split_clock_view.xml +++ b/packages/SystemUI/res/layout/split_clock_view.xml @@ -28,6 +28,7 @@ android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock" android:textSize="@dimen/qs_time_collapsed_size" + android:textColor="?android:attr/textColorPrimary" /> @@ -44,8 +46,9 @@ android:id="@+id/empty_time_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="invisible" + android:visibility="gone" android:singleLine="true" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock" + android:textColor="?android:attr/textColorPrimary" /> diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index 6784254796a2f..63af3e0c9f307 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -42,7 +42,7 @@ diff --git a/packages/SystemUI/res/layout/status_bar_alarm_group.xml b/packages/SystemUI/res/layout/status_bar_alarm_group.xml index a02e9af674faf..745320e90fb62 100644 --- a/packages/SystemUI/res/layout/status_bar_alarm_group.xml +++ b/packages/SystemUI/res/layout/status_bar_alarm_group.xml @@ -41,6 +41,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:src="@drawable/ic_access_alarms_small" + android:tint="?android:attr/textColorPrimary" android:paddingStart="6dp" android:gravity="center" android:visibility="gone" /> diff --git a/packages/SystemUI/res/layout/zen_mode_condition.xml b/packages/SystemUI/res/layout/zen_mode_condition.xml index ca4f7278a5aea..2b4a0f59195e9 100644 --- a/packages/SystemUI/res/layout/zen_mode_condition.xml +++ b/packages/SystemUI/res/layout/zen_mode_condition.xml @@ -63,6 +63,7 @@ android:scaleType="center" android:layout_toStartOf="@android:id/button2" android:contentDescription="@string/accessibility_quick_settings_less_time" + android:tint="?android:attr/textColorPrimary" android:src="@drawable/ic_qs_minus" /> \ No newline at end of file diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index a2298663740e2..7fb513cda395b 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -40,8 +40,9 @@ + - + @@ -60,7 +61,7 @@ - + diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 6ffdbcb9380e6..79529a7abcbce 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -164,7 +164,7 @@ 32dp - 104dp + 126dp 116dp @@ -204,8 +204,8 @@ 25dp - 88dp - 16dp + 80dp + 36dp 16dp 48dp 12dp @@ -421,7 +421,7 @@ 14sp - 20sp + 14sp 12sp diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index a9c858c0e7218..f53e30f8b82a7 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -106,24 +106,28 @@ @color/status_bar_clock_color -