diff options
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/attrs.xml | 10 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 16 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 8 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 37 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/ids.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 54 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 35 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/volume.xml | 87 |
8 files changed, 194 insertions, 55 deletions
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index 6ecdca3..24f92ef 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -72,5 +72,15 @@ <attr name="verticalSpacing" format="dimension" /> <attr name="horizontalSpacing" format="dimension" /> </declare-styleable> + + <!-- Theme for icons in the status bar (light/dark). background/fillColor is used for dual tone + icons like wifi and signal, and singleToneColor is used for icons with only one tone. + Contract: Pixel with fillColor blended over backgroundColor blended over translucent should + equal to singleToneColor blended over translucent. --> + <declare-styleable name="TonedIcon"> + <attr name="backgroundColor" format="integer" /> + <attr name="fillColor" format="integer" /> + <attr name="singleToneColor" format="integer" /> + </declare-styleable> </resources> diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index d4aeab6..1f1455a 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -44,6 +44,7 @@ <color name="qs_subhead">#99FFFFFF</color><!-- 60% white --> <color name="qs_detail_empty">#24B0BEC5</color><!-- 14% blue grey 200 --> <color name="qs_detail_button">#FFB0BEC5</color><!-- 100% blue grey 200 --> + <color name="qs_detail_button_white">#B3FFFFFF</color><!-- 70% white --> <color name="qs_detail_transition">#66FFFFFF</color> <color name="qs_detail_progress_track">#99009688</color><!-- 60% deep teal 500 --> <color name="data_usage_secondary">#99FFFFFF</color><!-- 60% white --> @@ -108,8 +109,7 @@ <color name="notification_guts_text_color">#b2FFFFFF</color> <color name="notification_guts_btn_color">#FFFFFFFF</color> - <color name="search_panel_circle_color">#ffffff</color> - <color name="search_panel_ripple_color">#ffbbbbbb</color> + <color name="assist_orb_color">#ffffff</color> <color name="keyguard_user_switcher_background_gradient_color">#77000000</color> <color name="doze_small_icon_background_color">#ff434343</color> @@ -129,6 +129,14 @@ <color name="segmented_button_selected">#FFFFFFFF</color> <color name="segmented_button_unselected">#B3B0BEC5</color><!-- 70% blue grey 200 --> - <color name="volume_panel_divider">#1FFFFFFF</color><!-- 12% white --> - <color name="light_mode_icon_color">#FF616161</color><!-- grey 700 --> + + <color name="dark_mode_icon_color_single_tone">#99000000</color> + <color name="dark_mode_icon_color_dual_tone_background">#3d000000</color> + <color name="dark_mode_icon_color_dual_tone_fill">#7a000000</color> + + <color name="light_mode_icon_color_single_tone">#ffffff</color> + <color name="light_mode_icon_color_dual_tone_background">#4dffffff</color> + <color name="light_mode_icon_color_dual_tone_fill">#ffffff</color> + + <color name="zen_introduction_message_background">#ff009688</color><!-- deep teal 500 --> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 2e9e9f7..2e44547 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -147,7 +147,7 @@ <integer name="heads_up_default_snooze_length_ms">60000</integer> <!-- Minimum display time for a heads up notification, in milliseconds. --> - <integer name="heads_up_notification_minimum_time">3000</integer> + <integer name="heads_up_notification_minimum_time">2000</integer> <!-- milliseconds before the heads up notification accepts touches. --> <integer name="heads_up_sensitivity_delay">700</integer> @@ -276,9 +276,6 @@ <!-- Doze: alpha to apply to small icons when dozing --> <integer name="doze_small_icon_alpha">222</integer><!-- 87% of 0xff --> - <!-- Volume: time to delay dismissing the volume panel after a click is performed --> - <integer name="volume_panel_dismiss_delay">200</integer> - <!-- Hotspot tile: number of days to show after feature is used. --> <integer name="days_to_show_hotspot_tile">30</integer> @@ -293,5 +290,8 @@ <!-- Enable the default volume dialog --> <bool name="enable_volume_ui">true</bool> + + <!-- Duration of the full carrier network change icon animation. --> + <integer name="carrier_network_change_anim_time">3000</integer> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index c24cd64..7e50454 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -330,7 +330,7 @@ keyguard_clock_height_fraction_* for the difference between min and max.--> <dimen name="keyguard_clock_notifications_margin_min">24dp</dimen> <dimen name="keyguard_clock_notifications_margin_max">36dp</dimen> - <dimen name="heads_up_window_height">250dp</dimen> + <dimen name="heads_up_scrim_height">250dp</dimen> <!-- The minimum amount the user needs to swipe to go to the camera / phone. --> <dimen name="keyguard_min_swipe_amount">110dp</dimen> @@ -344,15 +344,6 @@ <!-- The chevron padding to the circle when hinting --> <dimen name="hint_chevron_circle_padding">16dp</dimen> - <!-- Volume panel dialog y offset --> - <dimen name="volume_panel_top">0dp</dimen> - - <!-- Volume panel dialog width --> - <dimen name="volume_panel_width">344dp</dimen> - - <!-- Volume panel z depth --> - <dimen name="volume_panel_z">3dp</dimen> - <!-- Distance between notifications and header when they are considered to be colliding. --> <dimen name="header_notifications_collide_distance">48dp</dimen> @@ -471,22 +462,23 @@ <dimen name="go_to_full_shade_appearing_translation">200dp</dimen> <!-- The diameter of the search panel circle. --> - <dimen name="search_panel_circle_size">88dp</dimen> + <dimen name="assist_orb_size">144dp</dimen> - <!-- The margin to the edge of the screen from where the circle starts to appear --> - <dimen name="search_panel_circle_base_margin">80dp</dimen> + <!-- The margin to the edge of the screen from where the orb starts to appear --> + <dimen name="assist_orb_base_margin">22dp</dimen> - <!-- The amount the circle translates when appearing --> - <dimen name="search_panel_circle_travel_distance">80dp</dimen> + <!-- The amount the orb translates when appearing --> + <dimen name="assist_orb_travel_distance">26dp</dimen> - <!-- The elevation of the search panel circle --> - <dimen name="search_panel_circle_elevation">12dp</dimen> + <!-- The elevation of the orb --> + <dimen name="assist_orb_elevation">12dp</dimen> - <!-- The height of the scrim behind the search panel circle. --> - <dimen name="search_panel_scrim_height">250dp</dimen> + <!-- The height of the scrim behind the orb. --> + <dimen name="assist_orb_scrim_height">250dp</dimen> - <!-- How far the user needs to drag up to invoke search. --> - <dimen name="search_panel_threshold">100dp</dimen> + <!-- The height of the scrim behind the search panel circle. Should be navigation_bar_height + + 8dp. --> + <dimen name="assist_orb_navbar_scrim_height">56dp</dimen> <!-- The width/height of the phone/camera/unlock icon view on keyguard. --> <dimen name="keyguard_affordance_height">56dp</dimen> @@ -572,4 +564,7 @@ <!-- Screen pinning inner nav bar outer circle size --> <dimen name="screen_pinning_nav_highlight_outer_size">84dp</dimen> + <!-- Padding to be used on the bottom of the fingerprint icon on Keyguard so it better aligns + with the other icons. --> + <dimen name="fingerprint_icon_additional_padding">12dp</dimen> </resources> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 3fc75d2..6d84727 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -37,6 +37,8 @@ <item type="id" name="doze_saved_filter_tag"/> <item type="id" name="qs_icon_tag"/> <item type="id" name="scrim"/> + <item type="id" name="hun_scrim_alpha_start"/> + <item type="id" name="hun_scrim_alpha_end"/> <item type="id" name="notification_power"/> <item type="id" name="notification_screenshot"/> <item type="id" name="notification_hidden"/> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index b696787..67a0bc6 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -100,9 +100,6 @@ <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] --> <string name="status_bar_settings_wifi_button">Wi-Fi</string> - <!-- Label in the system panel for airplane mode (all radios are turned off)[CHAR LIMIT=30] --> - <string name="status_bar_settings_airplane">Airplane mode</string> - <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] --> <string name="status_bar_settings_auto_rotation">Auto-rotate screen</string> @@ -362,6 +359,9 @@ <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_airplane_mode">Airplane mode.</string> + <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_carrier_network_change_mode">Carrier network changing.</string> + <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_battery_level">Battery <xliff:g id="number">%d</xliff:g> percent.</string> @@ -413,6 +413,8 @@ <string name="accessibility_desc_settings">Settings</string> <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_desc_recent_apps">Overview.</string> + <!-- Content description for the confirm button in the zen mode panel introduction message. [CHAR LIMIT=NONE] --> + <string name="accessibility_desc_confirm">Confirm</string> <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_quick_settings_user">User <xliff:g id="user" example="John Doe">%s</xliff:g>.</string> @@ -438,6 +440,8 @@ <string name="accessibility_quick_settings_dnd_priority_on">Do not disturb on, priority only.</string> <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_quick_settings_dnd_none_on">Do not disturb on, no interruptions.</string> + <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_quick_settings_dnd_alarms_on">Do not disturb on, alarms only.</string> <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_quick_settings_dnd_off">Do not disturb off.</string> <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] --> @@ -566,12 +570,12 @@ <!-- Textual description of Ethernet connections --> <string name="ethernet_label">Ethernet</string> - <!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] --> - <string name="quick_settings_airplane_mode_label">Airplane mode</string> <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] --> <string name="quick_settings_dnd_label">Do not disturb</string> <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] --> <string name="quick_settings_dnd_priority_label">Priority only</string> + <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] --> + <string name="quick_settings_dnd_alarms_label">Alarms only</string> <!-- QuickSettings: Do not disturb - No interruptions [CHAR LIMIT=NONE] --> <string name="quick_settings_dnd_none_label">No interruptions</string> <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] --> @@ -724,12 +728,21 @@ <!-- Zen mode: No interruptions title, with a warning about alarms. [CHAR LIMIT=60] --> <string name="zen_no_interruptions_with_warning">No interruptions. Not even alarms.</string> + <!-- Zen mode: Priority only introduction message on first use --> + <string name="zen_priority_introduction">You won\'t be disturbed by sounds and vibrations, except from alarms, reminders, events, and callers you specify.</string> + + <!-- Zen mode: Priority only customization button label --> + <string name="zen_priority_customize_button">Customize</string> + <!-- Zen mode: No interruptions. [CHAR LIMIT=40] --> <string name="zen_no_interruptions">No interruptions</string> <!-- Zen mode: Only important interruptions. [CHAR LIMIT=40] --> <string name="zen_important_interruptions">Priority interruptions only</string> + <!-- Zen mode: Only alarms. [CHAR LIMIT=40] --> + <string name="zen_alarms">Alarms only</string> + <!-- Zen mode: Next alarm information - just a time. [CHAR LIMIT=40] --> <string name="zen_alarm_information_time">Your next alarm is at <xliff:g id="alarm_time" example="5:00 PM">%s</xliff:g></string> @@ -758,14 +771,26 @@ <string name="camera_hint">Swipe left for camera</string> <!-- Interruption level: None. [CHAR LIMIT=20] --> - <string name="interruption_level_none">None</string> + <string name="interruption_level_none">No interruptions</string> <!-- Interruption level: Priority. [CHAR LIMIT=20] --> - <string name="interruption_level_priority">Priority</string> + <string name="interruption_level_priority">Priority only</string> + + <!-- Interruption level: Alarms only. [CHAR LIMIT=20] --> + <string name="interruption_level_alarms">Alarms only</string> <!-- Interruption level: All. [CHAR LIMIT=20] --> <string name="interruption_level_all">All</string> + <!-- Interruption level: None. Optimized for narrow two-line display. [CHAR LIMIT=20] --> + <string name="interruption_level_none_twoline">No\ninterruptions</string> + + <!-- Interruption level: Priority. Optimized for narrow two-line display. [CHAR LIMIT=20] --> + <string name="interruption_level_priority_twoline">Priority\nonly</string> + + <!-- Interruption level: Alarms only. Optimized for narrow two-line display. [CHAR LIMIT=20] --> + <string name="interruption_level_alarms_twoline">Alarms\nonly</string> + <!-- 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> @@ -816,6 +841,15 @@ <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] --> <string name="guest_wipe_session_dontwipe">Yes, continue</string> + <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] --> + <string name="guest_notification_title">Guest user</string> + + <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] --> + <string name="guest_notification_text">Remove guest to delete apps and data</string> + + <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] --> + <string name="guest_notification_remove_action">REMOVE GUEST</string> + <!-- Title for add user confirmation dialog [CHAR LIMIT=30] --> <string name="user_add_user_title" msgid="2108112641783146007">Add new user?</string> @@ -965,4 +999,10 @@ <!-- VolumeUI restoration notification: text --> <string name="volumeui_notification_text">Touch to restore the original.</string> + + <!-- Volume dialog zen toggle switch title --> + <string name="volume_zen_switch_text" translatable="false">@*android:string/zen_mode_feature_name</string> + + <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground --> + <string name="managed_profile_foreground_toast">You are in the Work profile</string> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 07fcb82..ef2e6f3 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -138,9 +138,8 @@ <item name="android:textColor">@color/system_accent_color</item> </style> - <style name="TextAppearance.QS.VolumeSuppressor"> + <style name="TextAppearance.QS.Introduction"> <item name="android:textSize">14sp</item> - <item name="android:textColor">@color/qs_tile_text</item> </style> <style name="TextAppearance.QS.DetailButton"> @@ -151,6 +150,10 @@ <item name="android:gravity">center</item> </style> + <style name="TextAppearance.QS.DetailButton.White"> + <item name="android:textColor">@color/qs_detail_button_white</item> + </style> + <style name="TextAppearance.QS.DetailEmpty"> <item name="android:textSize">@dimen/qs_detail_empty_text_size</item> <item name="android:textColor">@color/qs_subhead</item> @@ -201,11 +204,6 @@ <style name="Animation.StatusBar"> </style> - <style name="Animation.StatusBar.HeadsUp"> - <item name="android:windowEnterAnimation">@anim/heads_up_enter</item> - <item name="android:windowExitAnimation">@anim/heads_up_exit</item> - </style> - <style name="systemui_theme" parent="@android:style/Theme.DeviceDefault"> <item name="android:colorPrimary">@color/system_primary_color</item> <item name="android:colorControlActivated">@color/system_accent_color</item> @@ -229,12 +227,6 @@ <item name="android:gravity">center</item> </style> - <!-- Window animations used for volume panel. --> - <style name="VolumePanelAnimation"> - <item name="android:windowEnterAnimation">@*android:anim/popup_enter_material</item> - <item name="android:windowExitAnimation">@*android:anim/popup_exit_material</item> - </style> - <style name="TextAppearance.Material.Notification.Parenthetical" parent="@*android:style/TextAppearance.Material.Notification"> <item name="android:textStyle">italic</item> @@ -246,12 +238,6 @@ <item name="android:layout_height">match_parent</item> </style> - <style name="SearchPanelScrim"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">@dimen/search_panel_scrim_height</item> - <item name="android:layout_gravity">bottom</item> - </style> - <style name="UserDetailView"> <item name="numColumns">3</item> </style> @@ -265,4 +251,15 @@ <item name="android:backgroundDimEnabled">false</item> <item name="android:alertDialogTheme">@style/Theme.SystemUI.Dialog.Alert</item> </style> + + <style name="DualToneLightTheme"> + <item name="backgroundColor">@color/light_mode_icon_color_dual_tone_background</item> + <item name="fillColor">@color/light_mode_icon_color_dual_tone_fill</item> + <item name="singleToneColor">@color/light_mode_icon_color_single_tone</item> + </style> + <style name="DualToneDarkTheme"> + <item name="backgroundColor">@color/dark_mode_icon_color_dual_tone_background</item> + <item name="fillColor">@color/dark_mode_icon_color_dual_tone_fill</item> + <item name="singleToneColor">@color/dark_mode_icon_color_single_tone</item> + </style> </resources> diff --git a/packages/SystemUI/res/values/volume.xml b/packages/SystemUI/res/values/volume.xml new file mode 100644 index 0000000..f516104 --- /dev/null +++ b/packages/SystemUI/res/values/volume.xml @@ -0,0 +1,87 @@ +<!-- + Copyright (C) 2015 The Android Open Source 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 xmlns:android="http://schemas.android.com/apk/res/android"> + + <item name="volume_expand_animation_duration" type="integer">300</item> + + <color name="volume_icon_color">#ffffffff</color> + <color name="volume_settings_icon_color">#7fffffff</color> + + <dimen name="volume_slider_interspacing">2dp</dimen> + <dimen name="volume_offset_top">0dp</dimen> + <dimen name="volume_button_size">48dp</dimen> + + <item name="volume_secondary_alpha" format="float" type="dimen">0.3</item> + + <style name="VolumeDialogAnimations"> + <item name="android:windowEnterAnimation">@android:anim/fade_in</item> + <item name="android:windowExitAnimation">@android:anim/fade_out</item> + </style> + + <style name="VolumeButtons" parent="@android:style/Widget.Material.Button.Borderless"> + <item name="android:background">@drawable/btn_borderless_rect</item> + </style> + + <style name="TextAppearance" /> + + <style name="TextAppearance.Volume"> + <item name="android:textStyle">normal</item> + <item name="android:textColor">#ffffffff</item> + <item name="android:fontFamily">sans-serif</item> + </style> + + <style name="TextAppearance.Volume.ZenSwitch"> + <item name="android:textSize">16sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + + <style name="TextAppearance.Volume.ZenSwitchSummary"> + <item name="android:textSize">14sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + + <style name="TextAppearance.Volume.ZenSwitchDetail"> + <item name="android:textSize">14sp</item> + <item name="android:fontFamily">sans-serif</item> + <item name="android:textColor">#ffb0b3c5</item> + </style> + + <string-array name="volume_stream_titles" translatable="false"> + <item>Voice calls</item> <!-- STREAM_VOICE_CALL --> + <item>System</item> <!-- STREAM_SYSTEM --> + <item>Notifications</item> <!-- STREAM_RING --> + <item>Media</item> <!-- STREAM_MUSIC --> + <item>Alarms</item> <!-- STREAM_ALARM --> + <item></item> <!-- STREAM_NOTIFICATION --> + <item>Bluetooth calls</item> <!-- STREAM_BLUETOOTH_SCO --> + <item></item> <!-- STREAM_SYSTEM_ENFORCED --> + <item></item> <!-- STREAM_DTMF --> + <item></item> <!-- STREAM_TTS --> + </string-array> + + <string name="volume_dnd_is_on" translatable="false">Do not disturb is on</string> + <string name="volume_turn_off" translatable="false">Turn off</string> + <string name="volume_stream_muted" translatable="false">%s silent</string> + <string name="volume_stream_vibrate" translatable="false">%s vibrate</string> + <string name="volume_stream_suppressed" translatable="false">%1$s silent — %2$s</string> + <string name="volume_stream_muted_dnd" translatable="false">%s silent — No interruptions</string> + <string name="volume_stream_limited_dnd" translatable="false">%s — Priority only</string> + <string name="volume_stream_vibrate_dnd" translatable="false">%s vibrate — Priority only</string> + <string name="volume_dnd_ends_in" translatable="false">Do not disturb ends in %s</string> + <string name="volume_dnd_ends_at" translatable="false">Do not disturb ends at %s</string> + <string name="volume_end_now" translatable="false">End now</string> + +</resources>
\ No newline at end of file |