diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/layout/status_bar_expanded_header.xml | 10 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/cm_colors.xml | 11 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/cm_dimens.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/cm_styles.xml | 31 |
4 files changed, 52 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index eb2daa3..12c00cc 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -91,7 +91,7 @@ android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/header_battery_margin_expanded" android:paddingEnd="@dimen/battery_level_padding_end" - android:textColor="#ffffff" + android:textColor="@color/status_bar_battery_level_text_color" android:textSize="@dimen/battery_level_text_size" android:importantForAccessibility="noHideDescendants"/> </LinearLayout> @@ -159,7 +159,7 @@ android:layout_marginBottom="4dp" android:drawablePadding="6dp" android:drawableStart="@drawable/ic_access_alarms_small" - android:textColor="#64ffffff" + android:textColor="@color/status_bar_alarm_status_text_color" android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date" android:paddingEnd="6dp" android:paddingStart="6dp" @@ -183,19 +183,21 @@ android:id="@+id/weather_line_1" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingEnd="16dp" + android:paddingEnd="@dimen/status_bar_weather_padding_end" android:gravity="right" android:textColor="@color/status_bar_temperature_text_color" android:textSize="@dimen/weather_text_size" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.WeatherTemp" android:importantForAccessibility="noHideDescendants"/> <TextView android:id="@+id/weather_line_2" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingEnd="16dp" + android:paddingEnd="@dimen/status_bar_weather_padding_end" android:gravity="right" android:textColor="@color/status_bar_temperature_location_text_color" android:textSize="@dimen/weather_text_size" + android:textAppearance="@style/TextAppearance.StatusBar.Expanded.WeatherLocation" android:importantForAccessibility="noHideDescendants"/> </LinearLayout> diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml index fcb3e5e..74410bf 100644 --- a/packages/SystemUI/res/values/cm_colors.xml +++ b/packages/SystemUI/res/values/cm_colors.xml @@ -51,4 +51,15 @@ <!-- Navigation button ripple color --> <color name="navbutton_ripple_color">#FFFFFFFF</color> + + <!-- Expanded Status Bar Weather Text Colors --> + <color name="status_bar_temperature_text_color">#FFFFFFFF</color> + <color name="status_bar_temperature_location_text_color">#FFFFFFFF</color> + + <!-- Expanded Status Bar Alarm Status Text Color --> + <color name="status_bar_alarm_status_text_color">#64ffffff</color> + + <!-- Expanded Status Bar Battery Level Text Color --> + <color name="status_bar_battery_level_text_color">#ffffff</color> + </resources> diff --git a/packages/SystemUI/res/values/cm_dimens.xml b/packages/SystemUI/res/values/cm_dimens.xml index 5677b2c..8c3f91b 100644 --- a/packages/SystemUI/res/values/cm_dimens.xml +++ b/packages/SystemUI/res/values/cm_dimens.xml @@ -15,7 +15,7 @@ limitations under the License. --> <resources> - <dimen name="weather_text_size">12sp</dimen> + <dimen name="detail_radio_group_padding_left">16dp</dimen> <dimen name="detail_radio_group_padding">8dp</dimen> @@ -36,4 +36,7 @@ <!-- Side padding for the Quick Settings panel --> <dimen name="qs_panel_side_padding">@dimen/notification_side_padding</dimen> + <!-- Padding end for weather text --> + <dimen name="status_bar_weather_padding_end">16dp</dimen> + </resources> diff --git a/packages/SystemUI/res/values/cm_styles.xml b/packages/SystemUI/res/values/cm_styles.xml new file mode 100644 index 0000000..40b8929 --- /dev/null +++ b/packages/SystemUI/res/values/cm_styles.xml @@ -0,0 +1,31 @@ +<?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. +--> +<resources> + + <style name="TextAppearance.StatusBar.Expanded.WeatherTemp"> + <item name="android:textSize">12sp</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">@color/status_bar_temperature_text_color</item> + </style> + + <style name="TextAppearance.StatusBar.Expanded.WeatherLocation"> + <item name="android:textSize">12sp</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">@color/status_bar_temperature_location_text_color</item> + </style> + +</resources> |