diff options
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 7 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 17 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 15 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 27 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 23 |
6 files changed, 74 insertions, 20 deletions
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index c453618..8473d96 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -54,5 +54,10 @@ <enum name="horizontal" value="0" /> <enum name="vertical" value="1" /> </attr> + <declare-styleable name="UserAvatarView"> + <attr name="frameWidth" format="dimension" /> + <attr name="activeFrameColor" format="color" /> + <attr name="frameColor" /> + </declare-styleable> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 8c1a9c7..4e38da6 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -46,9 +46,7 @@ <color name="keyguard_overflow_content_color">#ff686868</color> <!-- The default recents task bar background color. --> - <color name="recents_task_bar_default_background_color">#e6444444</color> - <!-- The default recents task bar text color. --> - <color name="recents_task_bar_default_text_color">#ffeeeeee</color> + <color name="recents_task_bar_default_background_color">#ffe6e6e6</color> <!-- The recents task bar light text color to be drawn on top of dark backgrounds. --> <color name="recents_task_bar_light_text_color">#ffeeeeee</color> <!-- The recents task bar dark text color to be drawn on top of light backgrounds. --> @@ -62,6 +60,9 @@ <color name="keyguard_affordance">#ffffffff</color> + <!-- The color of the circle around the primary user in the user switcher --> + <color name="current_user_border_color">@color/primary_color</color> + <!-- Our material color palette (deep teal) --> <color name="primary_color">#ff7fcac3</color> <color name="background_color_1">#ff384248</color> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 1ef5bcd..c1f971a 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -108,17 +108,25 @@ <!-- milliseconds before the heads up notification accepts touches. --> <integer name="heads_up_sensitivity_delay">700</integer> + <!-- The duration in seconds to wait before the dismiss buttons are shown. --> + <integer name="recents_task_bar_dismiss_delay_seconds">1</integer> <!-- The min animation duration for animating views that are currently visible. --> - <integer name="recents_filter_animate_current_views_min_duration">175</integer> + <integer name="recents_filter_animate_current_views_duration">250</integer> <!-- The min animation duration for animating views that are newly visible. --> - <integer name="recents_filter_animate_new_views_min_duration">125</integer> + <integer name="recents_filter_animate_new_views_duration">250</integer> <!-- The min animation duration for animating the task bar in. --> - <integer name="recents_animate_task_bar_enter_duration">250</integer> + <integer name="recents_animate_task_bar_enter_duration">275</integer> <!-- The animation delay for animating the first task in. This should roughly be the animation duration of the transition in to recents. --> <integer name="recents_animate_task_bar_enter_delay">225</integer> <!-- The min animation duration for animating the task bar out. --> + <integer name="recents_animate_task_exit_to_home_duration">225</integer> + <!-- The min animation duration for animating the task bar out. --> <integer name="recents_animate_task_bar_exit_duration">125</integer> + <!-- The min animation duration for animating the task in when transitioning from home. --> + <integer name="recents_animate_task_enter_from_home_duration">275</integer> + <!-- The animation stagger to apply to each task animation when transitioning from home. --> + <integer name="recents_animate_task_enter_from_home_delay">10</integer> <!-- The min animation duration for animating the nav bar scrim in. --> <integer name="recents_nav_bar_scrim_enter_duration">400</integer> <!-- The animation duration for animating the removal of a task view. --> @@ -146,5 +154,8 @@ Notification.tickerText across the status bar for what seems like an eternity. --> <bool name="enable_ticker">false</bool> + + <!-- Set to true to enable the user switcher on the keyguard. --> + <bool name="config_keyguardUserSwitcher">false</bool> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 4a15363..36c1994 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -212,7 +212,7 @@ <dimen name="glowpadview_inner_radius">15dip</dimen> <!-- The size of the application icon in the recents task view. --> - <dimen name="recents_task_view_application_icon_size">32dp</dimen> + <dimen name="recents_task_view_application_icon_size">48dp</dimen> <!-- The size of the activity icon in the recents task view. --> <dimen name="recents_task_view_activity_icon_size">60dp</dimen> @@ -235,9 +235,6 @@ <!-- The amount of highlight to make on each task view. --> <dimen name="recents_task_view_highlight">1dp</dimen> - <!-- The amount of space a user has to scroll to dismiss any info panes. --> - <dimen name="recents_task_stack_scroll_dismiss_info_pane_distance">50dp</dimen> - <!-- The height of the search bar space. --> <dimen name="recents_search_bar_space_height">64dp</dimen> @@ -323,6 +320,9 @@ device. --> <dimen name="unlock_move_distance">75dp</dimen> + <!-- Distance after which the scrim starts fading in when dragging down the quick settings --> + <dimen name="notification_scrim_wait_distance">100dp</dimen> + <!-- Move distance for the unlock hint animation on the lockscreen --> <dimen name="hint_move_distance">75dp</dimen> @@ -335,4 +335,11 @@ <!-- end margin for multi user switch in expanded quick settings --> <dimen name="multi_user_switch_expanded_margin">8dp</dimen> + + <!-- end margin for system icons if multi user switch is hidden --> + <dimen name="system_icons_switcher_hidden_expanded_margin">16dp</dimen> + + <!-- The thickness of the colored border around the current user. --> + <dimen name="keyguard_user_switcher_border_thickness">2dp</dimen> + </resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 260f59c..f021253 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -549,6 +549,18 @@ <string name="recents_search_bar_label">search</string> + <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] --> + <string name="expanded_header_battery_charged">Charged</string> + + <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] --> + <string name="expanded_header_battery_charging">Charging</string> + + <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] --> + <string name="expanded_header_battery_charging_with_time"><xliff:g id="charging_time" example="2 hrs 25 min">%s</xliff:g> until full</string> + + <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] --> + <string name="expanded_header_battery_not_charging">Not charging</string> + <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. --> <string name="battery_meter_very_low_overlay_symbol">!</string> @@ -565,14 +577,6 @@ <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] --> <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string> - <!-- Zen mode: Summary notification content title. [CHAR LIMIT=NONE] --> - <plurals name="zen_mode_notification_title"> - <item quantity="one">Notification hidden</item> - <item quantity="other">%d notifications hidden</item> - </plurals> - <!-- Zen mode: Summary notification content text. [CHAR LIMIT=NONE] --> - <string name="zen_mode_notification_text">Touch to show</string> - <!-- Zen mode: Short title. [CHAR LIMIT=40] --> <string name="zen_mode_title">Do not disturb</string> @@ -602,6 +606,13 @@ <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]--> <string name="keyguard_indication_charging_time">Charging (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> until full)</string> + <!-- Related to user switcher --><skip/> + <!-- Name for the guest user --> + <string name="guest_nickname">Guest</string> + + <!-- Label for adding a new guest --> + <string name="guest_new_guest">+ Guest</string> + <!-- Zen mode condition: time duration in minutes. [CHAR LIMIT=NONE] --> <plurals name="zen_mode_duration_minutes"> <item quantity="one">For one minute</item> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 79a13f8..e5d5b03 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -70,17 +70,29 @@ <style name="TextAppearance.StatusBar.Expanded" parent="@*android:style/TextAppearance.StatusBar" /> <style name="TextAppearance.StatusBar.Expanded.Clock"> - <item name="android:textSize">18dp</item> + <item name="android:textSize">16dp</item> <item name="android:textStyle">normal</item> <item name="android:textColor">#ffffff</item> </style> <style name="TextAppearance.StatusBar.Expanded.Date"> + <item name="android:textSize">14dp</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">#99ffffff</item> + </style> + + <style name="TextAppearance.StatusBar.Expanded.AboveDateTime"> <item name="android:textSize">12dp</item> <item name="android:textStyle">normal</item> - <item name="android:textColor">#afb3b6</item> + <item name="android:textColor">#99ffffff</item> </style> + <style name="TextAppearance.StatusBar.Expanded.EmergencyCallsOnly" + parent="TextAppearance.StatusBar.Expanded.AboveDateTime" /> + + <style name="TextAppearance.StatusBar.Expanded.ChargingInfo" + parent="TextAppearance.StatusBar.Expanded.AboveDateTime" /> + <style name="TextAppearance.StatusBar.Expanded.Network" parent="@style/TextAppearance.StatusBar.Expanded.Date"> <item name="android:textColor">#999999</item> </style> @@ -88,6 +100,13 @@ <style name="TextAppearance.StatusBar.Expanded.Network.EmergencyOnly"> </style> + <style name="TextAppearance.StatusBar.Expanded.UserSwitcher"> + <item name="android:textSize">16sp</item> + <item name="android:textStyle">normal</item> + <item name="android:textColor">#ffffff</item> + </style> + <style name="TextAppearance.StatusBar.Expanded.UserSwitcher.UserName" /> + <style name="TextAppearance" /> <style name="TextAppearance.QuickSettings" /> |