diff options
8 files changed, 62 insertions, 7 deletions
diff --git a/packages/SystemUI/res/drawable/volume_dialog_background.xml b/packages/SystemUI/res/drawable/volume_dialog_background.xml index f09c01b..8ac471f 100644 --- a/packages/SystemUI/res/drawable/volume_dialog_background.xml +++ b/packages/SystemUI/res/drawable/volume_dialog_background.xml @@ -19,4 +19,4 @@ <corners android:radius="@dimen/notification_material_rounded_rect_radius" /> -</shape>
\ No newline at end of file +</shape> diff --git a/packages/SystemUI/res/drawable/zen_mode_panel_background.xml b/packages/SystemUI/res/drawable/zen_mode_panel_background.xml new file mode 100644 index 0000000..a91520a --- /dev/null +++ b/packages/SystemUI/res/drawable/zen_mode_panel_background.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2015 The CyanogenMod Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@color/system_secondary_color" /> + <corners + android:topLeftRadius="0dp" + android:topRightRadius="0dp" + android:bottomLeftRadius="@dimen/zen_mode_panel_radius" + android:bottomRightRadius="@dimen/zen_mode_panel_radius"/> +</shape> diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index ed78abd..6f2870a 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -26,7 +26,7 @@ android:paddingStart="@dimen/notification_side_padding" android:paddingEnd="@dimen/notification_side_padding" android:baselineAligned="false" - android:elevation="4dp" + android:elevation="@dimen/status_bar_expanded_header_elevation" android:background="@drawable/notification_header_bg" android:clickable="true" android:focusable="true" diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index 7617ed4..a766261 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -22,7 +22,7 @@ android:layout_marginLeft="@dimen/notification_side_padding" android:layout_marginRight="@dimen/notification_side_padding" android:background="@drawable/volume_dialog_background" - android:translationZ="4dp" > + android:translationZ="@dimen/volume_panel_z"> <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/volume_expand_button" @@ -48,4 +48,4 @@ <include layout="@layout/volume_zen_footer" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/packages/SystemUI/res/values/arrays.xml b/packages/SystemUI/res/values/arrays.xml index 6102aa6..79a4649 100644 --- a/packages/SystemUI/res/values/arrays.xml +++ b/packages/SystemUI/res/values/arrays.xml @@ -26,7 +26,7 @@ </array> <array name="batterymeter_color_values"> <item>@*android:color/battery_saver_mode_color</item> - <item>#FFFFFFFF</item> + <item>@color/batterymeter_base_color</item> </array> <array name="batterymeter_bolt_points"> <item>73</item> <item>0</item> diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml index c25cc79..fcb3e5e 100644 --- a/packages/SystemUI/res/values/cm_colors.xml +++ b/packages/SystemUI/res/values/cm_colors.xml @@ -37,4 +37,18 @@ <color name="status_bar_temperature_text_color">#FFFFFFFF</color> <color name="status_bar_temperature_location_text_color">#FFFFFFFF</color> + <!-- tint of the Visualizer tile --> + <color name="visualizer_fill_color">#96FFFFFF</color> + + <!-- Background of the volume panel. See also: volume_dialog_background --> + <color name="volume_panel_background_color">@color/system_secondary_color</color> + + <!-- Battery base color --> + <color name="batterymeter_base_color">#FFFFFFFF</color> + + <!-- Color for notification icons --> + <color name="notification_icon_color">#FFFFFFFF</color> + + <!-- Navigation button ripple color --> + <color name="navbutton_ripple_color">#FFFFFFFF</color> </resources> diff --git a/packages/SystemUI/res/values/cm_dimens.xml b/packages/SystemUI/res/values/cm_dimens.xml index eacf1d9..c839fc9 100644 --- a/packages/SystemUI/res/values/cm_dimens.xml +++ b/packages/SystemUI/res/values/cm_dimens.xml @@ -16,4 +16,18 @@ --> <resources> <dimen name="weather_text_size">12sp</dimen> -</resources>
\ No newline at end of file + <dimen name="detail_radio_group_padding_left">16dp</dimen> + <dimen name="detail_radio_group_padding">8dp</dimen> + + <!-- Themes: radius of the corners of the notification dropshadow + See also: notification_material_rounded_rect_radius + --> + <dimen name="notification_material_shadow_rounded_rect_radius">0dp</dimen> + + <dimen name="zen_mode_panel_radius">@dimen/notification_material_rounded_rect_radius</dimen> + + <dimen name="status_bar_expanded_header_elevation">4dp</dimen> + + <dimen name="volume_panel_z">4dp</dimen> + +</resources> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java index 3f63b5f..ed41121 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonRipple.java @@ -66,16 +66,19 @@ public class KeyButtonRipple extends Drawable { private final HashSet<Animator> mRunningAnimations = new HashSet<>(); private final ArrayList<Animator> mTmpArray = new ArrayList<>(); + private int mRippleColor; + public KeyButtonRipple(Context ctx, View targetView) { mMaxWidth = ctx.getResources().getDimensionPixelSize(R.dimen.key_button_ripple_max_width); mTargetView = targetView; + mRippleColor = ctx.getResources().getColor(R.color.navbutton_ripple_color); } private Paint getRipplePaint() { if (mRipplePaint == null) { mRipplePaint = new Paint(); mRipplePaint.setAntiAlias(true); - mRipplePaint.setColor(0xffffffff); + mRipplePaint.setColor(mRippleColor); } return mRipplePaint; } |