diff options
Diffstat (limited to 'packages/SystemUI/res/values')
| -rw-r--r-- | packages/SystemUI/res/values/colors.xml | 10 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/config.xml | 106 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/dimens.xml | 80 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/ids.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/internal.xml | 1 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/lland_config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 49 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 19 |
8 files changed, 193 insertions, 75 deletions
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml index 82dccd2..a7783fc 100644 --- a/packages/SystemUI/res/values/colors.xml +++ b/packages/SystemUI/res/values/colors.xml @@ -101,8 +101,6 @@ <!-- The color of the circle around the primary user in the user switcher --> <color name="current_user_border_color">@color/system_accent_color</color> - <color name="segmented_button_text_inactive">#99afbdc4</color><!-- 60% --> - <!-- The "inside" of a notification, reached via longpress --> <color name="notification_guts_bg_color">@color/system_secondary_color</color> <color name="notification_guts_title_color">#FFFFFFFF</color> @@ -123,4 +121,12 @@ <!-- Shadow color for the furthest pixels around the fake shadow for recents. --> <color name="fake_shadow_end_color">#03000000</color> + + <color name="screen_pinning_nav_icon_highlight_outer">#4080cbc4</color><!-- 25% deep teal 200 --> + <color name="screen_pinning_request_bg">#ff009688</color><!-- deep teal 500 --> + <color name="screen_pinning_request_window_bg">#80000000</color> + + <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 --> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index cd82c45..a7a1cc5 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -131,6 +131,9 @@ <integer name="quick_settings_brightness_dialog_short_timeout">2000</integer> <integer name="quick_settings_brightness_dialog_long_timeout">4000</integer> + <!-- The maximum number of items to be displayed in quick settings --> + <integer name="quick_settings_detail_max_item_count">7</integer> + <integer name="blinds_pop_duration_ms">10</integer> <!-- Should "4G" be shown instead of "LTE" when the network is NETWORK_TYPE_LTE? --> @@ -139,49 +142,74 @@ <!-- milliseconds before the heads up notification auto-dismisses. --> <integer name="heads_up_notification_decay">10000</integer> + <!-- milliseconds after a heads up notification is pushed back + before the app can interrupt again. --> + <integer name="heads_up_default_snooze_length_ms">60000</integer> + <!-- 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_duration">250</integer> + <!-- The min animation duration for animating views that are newly visible. --> <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">225</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">275</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 animation delay for animating the first task in. This should roughly be the animation - duration of the transition in to recents from home. --> - <integer name="recents_animate_task_enter_from_home_delay">150</integer> - <!-- The min animation duration for animating the task in when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_duration">250</integer> - <!-- The animation stagger to apply to each task animation when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_stagger_delay">12</integer> - <!-- The short duration when animating in/out the lock to app button. --> - <integer name="recents_animate_lock_to_app_button_short_duration">150</integer> - <!-- The long duration when animating in/out the lock to app button. --> - <integer name="recents_animate_lock_to_app_button_long_duration">300</integer> + + <!-- The duration of the window transition when coming to Recents from an app. + In order to defer the in-app animations until after the transition is complete, + we also need to use this value as the starting delay when animating the first + task decorations in. --> + <integer name="recents_enter_from_app_transition_duration">325</integer> + + <!-- The duration for animating the task decorations in after transitioning from an app. --> + <integer name="recents_task_enter_from_app_duration">200</integer> + + <!-- The duration for animating the task decorations out before transitioning to an app. --> + <integer name="recents_task_exit_to_app_duration">125</integer> + + <!-- The duration of the window transition when coming to Recents from the Launcher. + In order to defer the in-app animations until after the transition is complete, + we also need to use this value as the starting delay when animating the task views + in from the bottom of the screen. --> + <integer name="recents_enter_from_home_transition_duration">100</integer> + + <!-- The duration for animating the task from the bottom of the screen when transitioning + from home. --> + <integer name="recents_task_enter_from_home_duration">225</integer> + + <!-- The stagger for each task when animating the task from the bottom of the screen when + transitioning from home. --> + <integer name="recents_task_enter_from_home_stagger_delay">12</integer> + + <!-- The duration of the animation of the tasks to the bottom of the screen when leaving + Recents to go back to the Launcher. --> + <integer name="recents_task_exit_to_home_duration">225</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. --> <integer name="recents_animate_task_view_remove_duration">250</integer> + <!-- The animation duration for scrolling the stack to a particular item. --> <integer name="recents_animate_task_stack_scroll_duration">225</integer> + <!-- The minimum alpha for the dim applied to cards that go deeper into the stack. --> <integer name="recents_max_task_stack_view_dim">96</integer> + <!-- The delay to enforce between each alt-tab key press. --> <integer name="recents_alt_tab_key_delay">200</integer> + <!-- Transposes the search bar layout in landscape. --> <bool name="recents_has_transposed_search_bar">true</bool> + <!-- Transposes the nav bar in landscape (only used for purposes of layout). --> <bool name="recents_has_transposed_nav_bar">true</bool> + <!-- Svelte specific logic, see RecentsConfiguration.SVELTE_* constants. --> + <integer name="recents_svelte_level">0</integer> <!-- Whether to enable KeyguardService or not --> <bool name="config_enableKeyguardService">true</bool> @@ -211,26 +239,41 @@ <!-- Doze: should the pickup sensor be used as a pulse signal? --> <bool name="doze_pulse_on_pick_up">false</bool> + <!-- Doze: check proximity sensor before pulsing? --> + <bool name="doze_proximity_check_before_pulse">true</bool> + <!-- Doze: should notifications be used as a pulse signal? --> <bool name="doze_pulse_on_notifications">true</bool> <!-- Doze: when to pulse after a buzzworthy notification arrives --> - <string name="doze_pulse_schedule" translatable="false">1s,10s,30s,60s,120s</string> + <string name="doze_pulse_schedule" translatable="false">1s,10s,30s,60s</string> <!-- Doze: maximum number of times the notification pulse schedule can be reset --> - <integer name="doze_pulse_schedule_resets">3</integer> + <integer name="doze_pulse_schedule_resets">2</integer> <!-- Doze: duration to avoid false pickup gestures triggered by notification vibrations --> <integer name="doze_pickup_vibration_threshold">2000</integer> + <!-- Doze: can we assume the pickup sensor includes a proximity check? --> + <bool name="doze_pickup_performs_proximity_check">false</bool> + <!-- Doze: pulse parameter - how long does it take to fade in? --> - <integer name="doze_pulse_duration_in">1000</integer> + <integer name="doze_pulse_duration_in">900</integer> + + <!-- Doze: pulse parameter - how long does it take to fade in after a pickup? --> + <integer name="doze_pulse_duration_in_pickup">300</integer> + + <!-- Doze: pulse parameter - delay to wait for the screen to wake up --> + <integer name="doze_pulse_delay_in">200</integer> + + <!-- Doze: pulse parameter - delay to wait for the screen to wake up after a pickup --> + <integer name="doze_pulse_delay_in_pickup">200</integer> <!-- Doze: pulse parameter - once faded in, how long does it stay visible? --> <integer name="doze_pulse_duration_visible">3000</integer> <!-- Doze: pulse parameter - how long does it take to fade out? --> - <integer name="doze_pulse_duration_out">1000</integer> + <integer name="doze_pulse_duration_out">600</integer> <!-- Doze: alpha to apply to small icons when dozing --> <integer name="doze_small_icon_alpha">222</integer><!-- 87% of 0xff --> @@ -238,16 +281,19 @@ <!-- Volume: time to delay dismissing the volume panel after a click is performed --> <integer name="volume_panel_dismiss_delay">200</integer> - <!-- Tiles with feature timeouts: number of days to show after feature is used. --> - <integer name="days_to_show_timeout_tiles">30</integer> + <!-- Hotspot tile: number of days to show after feature is used. --> + <integer name="days_to_show_hotspot_tile">30</integer> + + <!-- Color inversion tile: number of days to show after feature is used. --> + <integer name="days_to_show_color_inversion_tile">7</integer> <!-- Number of times to show the strong alarm warning text in the volume dialog --> <integer name="zen_mode_alarm_warning_threshold">5</integer> - <!-- Zen toast fade in/out duration --> - <integer name="zen_toast_animation_duration">500</integer> + <!-- Maximum number of total conditions to display in the zen mode selection panel --> + <integer name="zen_mode_max_conditions">5</integer> - <!-- Zen toast visibility duration --> - <integer name="zen_toast_visible_duration">500</integer> + <!-- Enable the default volume dialog --> + <bool name="enable_volume_ui">true</bool> </resources> diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 4f41cd5..44330e8 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -63,6 +63,8 @@ <!-- thickness (height) of the navigation bar on phones that require it --> <dimen name="navigation_bar_size">@*android:dimen/navigation_bar_height</dimen> + <!-- Minimum swipe distance to catch the swipe gestures to invoke assist or switch tasks. --> + <dimen name="navigation_bar_min_swipe_distance">48dp</dimen> <!-- thickness (height) of the dead zone at the top of the navigation bar, reducing false presses on navbar buttons; approx 2mm --> @@ -103,11 +105,15 @@ <!-- The padding on the global screenshot background image --> <dimen name="global_screenshot_bg_padding">20dp</dimen> - <!-- The width of the view containing non-menu status bar icons --> - <dimen name="navigation_key_width">80dip</dimen> + <!-- The width of the view containing navigation buttons --> + <dimen name="navigation_key_width">70dp</dimen> <!-- The width of the view containing the menu/ime navigation bar icons --> - <dimen name="navigation_extra_key_width">40dip</dimen> + <dimen name="navigation_extra_key_width">36dp</dimen> + + <!-- The padding on the side of the navigation bar. Must be greater than or equal to + navigation_extra_key_width --> + <dimen name="navigation_side_padding">36dp</dimen> <!-- Default distance beyond which snaps to the matching target --> <dimen name="navbar_search_snap_margin">40dip</dimen> @@ -185,16 +191,23 @@ <dimen name="qs_data_usage_text_size">14sp</dimen> <dimen name="qs_data_usage_usage_text_size">36sp</dimen> - <dimen name="segmented_button_spacing">4dp</dimen> - <dimen name="segmented_button_radius">2dp</dimen> + <dimen name="segmented_button_spacing">8dp</dimen> + <dimen name="borderless_button_radius">2dp</dimen> <!-- How far the expanded QS panel peeks from the header in collapsed state. --> <dimen name="qs_peek_height">8dp</dimen> + <!-- Zen mode panel: condition item button padding --> <dimen name="zen_mode_condition_detail_button_padding">8dp</dimen> - <!-- Explicit width of the zen toast window --> - <dimen name="zen_toast_width">224dp</dimen> + <!-- Zen mode panel: spacing between condition items --> + <dimen name="zen_mode_condition_detail_item_spacing">12dp</dimen> + + <!-- Zen mode panel: spacing between two-line condition upper and lower lines --> + <dimen name="zen_mode_condition_detail_item_interline_spacing">4dp</dimen> + + <!-- Zen mode panel: bottom padding, a bit less than qs_panel_padding --> + <dimen name="zen_mode_condition_detail_bottom_padding">4dp</dimen> <!-- used by DessertCase --> <dimen name="dessert_case_cell_size">192dp</dimen> @@ -223,9 +236,6 @@ <!-- The amount of highlight to make on each task view. --> <dimen name="recents_task_view_highlight">1.5dp</dimen> - <!-- The height of the lock-to-app button. --> - <dimen name="recents_task_view_lock_to_app_button_height">48dp</dimen> - <!-- The amount to offset when animating into an affiliate group. --> <dimen name="recents_task_view_affiliate_group_enter_offset">64dp</dimen> @@ -239,7 +249,7 @@ <dimen name="recents_search_bar_space_height">64dp</dimen> <!-- The side padding for the task stack as a percentage of the width. --> - <item name="recents_stack_width_padding_percentage" format="float" type="dimen">0.04444</item> + <item name="recents_stack_width_padding_percentage" format="float" type="dimen">0.03333</item> <!-- The overscroll percentage allowed on the stack. --> <item name="recents_stack_overscroll_percentage" format="float" type="dimen">0.0875</item> @@ -254,6 +264,12 @@ <!-- The min alpha to apply to a task affiliation group color. --> <item name="recents_task_affiliation_color_min_alpha_percentage" format="float" type="dimen">0.6</item> + <!-- The size of the lock-to-app button. --> + <dimen name="recents_lock_to_app_size">56dp</dimen> + + <!-- The size of the lock-to-app button icon. --> + <dimen name="recents_lock_to_app_icon_size">28dp</dimen> + <!-- Space reserved for the cards behind the top card in the top stack --> <dimen name="top_stack_peek_amount">12dp</dimen> @@ -318,7 +334,7 @@ <dimen name="heads_up_window_height">250dp</dimen> <!-- The minimum amount the user needs to swipe to go to the camera / phone. --> - <dimen name="keyguard_min_swipe_amount">90dp</dimen> + <dimen name="keyguard_min_swipe_amount">110dp</dimen> <!-- The minimum background radius when swiping to a side for the camera / phone affordances. --> <dimen name="keyguard_affordance_min_background_radius">30dp</dimen> @@ -358,6 +374,9 @@ <!-- radius of the corners of the material rounded rect background --> <dimen name="notification_material_rounded_rect_radius">2dp</dimen> + <!-- radius of the corners of the material rounded rect background but negative--> + <dimen name="notification_material_rounded_rect_radius_negative">-2dp</dimen> + <!-- end margin for multi user switch in expanded quick settings --> <dimen name="multi_user_switch_expanded_margin">8dp</dimen> @@ -399,6 +418,9 @@ <!-- The width of user avatar when on Keyguard --> <dimen name="multi_user_avatar_keyguard_size">22dp</dimen> + <!-- The width of user avatar when expanded --> + <dimen name="multi_user_avatar_expanded_size">24dp</dimen> + <!-- The font size of the time when collapsed in QS --> <dimen name="qs_time_collapsed_size">14sp</dimen> @@ -493,6 +515,9 @@ type icon is wide. --> <dimen name="wide_type_icon_start_padding">2dp</dimen> + <!-- Extra padding between multiple phone signal icons. --> + <dimen name="secondary_telephony_padding">2dp</dimen> + <!-- Extra padding between the mobile data type icon and the strength indicator when the data type icon is wide for the tile in quick settings. --> <dimen name="wide_type_icon_start_padding_qs">3dp</dimen> @@ -505,4 +530,35 @@ <dimen name="fake_shadow_inset">1dp</dimen> <dimen name="fake_shadow_size">8dp</dimen> + + <!-- Padding between signal cluster and battery icon --> + <dimen name="signal_cluster_battery_padding">7dp</dimen> + + <!-- Padding for signal cluster and battery icon when there are not icons in signal cluster --> + <dimen name="no_signal_cluster_battery_padding">3dp</dimen> + + <!-- Screen pinning request width --> + <dimen name="screen_pinning_request_width">@dimen/match_parent</dimen> + <!-- Screen pinning request nav button circle heights --> + <dimen name="screen_pinning_request_button_height">66dp</dimen> + <!-- Screen pinning request nav button circle widths --> + <dimen name="screen_pinning_request_button_width">84dp</dimen> + <!-- Screen pinning request padding on top of inner circle --> + <dimen name="screen_pinning_request_inner_padding">14dp</dimen> + <!-- Screen pinning request padding on top of icons --> + <dimen name="screen_pinning_request_nav_icon_padding">18dp</dimen> + <!-- Screen pinning request padding on side of icons + (makes the width match the nav bar)--> + <dimen name="screen_pinning_request_nav_side_padding">7dp</dimen> + <!-- Screen pinning request side views to match nav bar + navigation_side_padding - 3 / 2 * (screen_pinning_request_button_width + - navigation_key_width) --> + <dimen name="screen_pinning_request_side_width">34dp</dimen> + <!-- Screen pinning request controls padding on bigger screens --> + <dimen name="screen_pinning_request_frame_padding">0dp</dimen> + <!-- Screen pinning inner nav bar circle size --> + <dimen name="screen_pinning_nav_highlight_size">56dp</dimen> + <!-- Screen pinning inner nav bar outer circle size --> + <dimen name="screen_pinning_nav_highlight_outer_size">84dp</dimen> + </resources> diff --git a/packages/SystemUI/res/values/ids.xml b/packages/SystemUI/res/values/ids.xml index 4e93cd8..4a9eb55 100644 --- a/packages/SystemUI/res/values/ids.xml +++ b/packages/SystemUI/res/values/ids.xml @@ -35,5 +35,6 @@ <item type="id" name="top_inset_animator_start_value_tag"/> <item type="id" name="height_animator_start_value_tag"/> <item type="id" name="doze_saved_filter_tag"/> + <item type="id" name="qs_icon_tag"/> </resources> diff --git a/packages/SystemUI/res/values/internal.xml b/packages/SystemUI/res/values/internal.xml index 3b593d2..67685ee 100644 --- a/packages/SystemUI/res/values/internal.xml +++ b/packages/SystemUI/res/values/internal.xml @@ -17,5 +17,6 @@ <resources> <dimen name="status_bar_height">@*android:dimen/status_bar_height</dimen> <dimen name="navigation_bar_height">@*android:dimen/navigation_bar_height</dimen> + <color name="screen_pinning_primary_text">@*android:color/primary_text_default_material_light</color> </resources> diff --git a/packages/SystemUI/res/values/lland_config.xml b/packages/SystemUI/res/values/lland_config.xml index 5d74082..a9e732e 100644 --- a/packages/SystemUI/res/values/lland_config.xml +++ b/packages/SystemUI/res/values/lland_config.xml @@ -26,7 +26,7 @@ <dimen name="obstacle_width">90dp</dimen> <dimen name="obstacle_stem_width">12dp</dimen> <dimen name="obstacle_gap">170dp</dimen> - <dimen name="obstacle_height_min">40dp</dimen> + <dimen name="obstacle_height_min">48dp</dimen> <dimen name="building_width_min">20dp</dimen> <dimen name="building_width_max">250dp</dimen> <dimen name="building_height_min">20dp</dimen> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 71b9b61..38c6a44 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -62,12 +62,12 @@ <string name="battery_low_title">Battery is low</string> <!-- A message that appears when the battery level is getting low in a dialog. This is - appened to the subtitle of the low battery alert. "number" is the percentage of battery + appened to the subtitle of the low battery alert. "percentage" is the percentage of battery remaining [CHAR LIMIT=none]--> - <string name="battery_low_percent_format"><xliff:g id="number">%d%%</xliff:g> remaining</string> + <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> remaining</string> <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]--> - <string name="battery_low_percent_format_saver_started"><xliff:g id="number">%d%%</xliff:g> remaining. Battery saver is on.</string> + <string name="battery_low_percent_format_saver_started"><xliff:g id="percentage">%s</xliff:g> remaining. Battery saver is on.</string> <!-- A message that appears when a USB charger is plugged in and the device does not support charging on it. That is, a charger that fits into the USB port and goes into @@ -115,11 +115,6 @@ <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] --> <string name="status_bar_settings_notifications">Notifications</string> - <!-- Text to display next to the graphical battery meter. [CHAR LIMIT=3] --> - <string name="status_bar_settings_battery_meter_format" translatable="false"> - <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g> - </string> - <!-- Separator for PLMN and SPN in network name. --> <string name="status_bar_network_name_separator" translatable="false">|</string> @@ -559,10 +554,6 @@ <!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] --> <string name="quick_settings_airplane_mode_label">Airplane mode</string> - <!-- QuickSettings: Battery Charging [CHAR LIMIT=NONE] --> - <string name="quick_settings_battery_charging_label">Charging, <xliff:g id="number">%d</xliff:g><xliff:g id="percent">%%</xliff:g></string> - <!-- QuickSettings: Battery Charged [CHAR LIMIT=NONE] --> - <string name="quick_settings_battery_charged_label">Charged</string> <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] --> <string name="quick_settings_bluetooth_label">Bluetooth</string> <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] --> @@ -637,6 +628,8 @@ <string name="quick_settings_done">Done</string> <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] --> <string name="quick_settings_connected">Connected</string> + <!-- QuickSettings: Control panel: Label for a connected Wi-Fi access point when the connection is established by a Wi-Fi assistant application. [CHAR LIMIT=NONE] --> + <string name="quick_settings_connected_via_wfa">Connected via Wi\u2011Fi assistant</string> <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] --> <string name="quick_settings_connecting">Connecting...</string> <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] --> @@ -654,7 +647,7 @@ <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] --> <string name="quick_settings_cellular_detail_remaining_data">Remaining data</string> <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] --> - <string name="quick_settings_cellular_detail_over_limit">Limit reached – data usage paused</string> + <string name="quick_settings_cellular_detail_over_limit">Over limit</string> <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] --> <string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> used</string> <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] --> @@ -666,8 +659,8 @@ <string name="recents_empty_message">Your recent screens appear here</string> <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] --> <string name="recents_app_info_button_label">Application Info</string> - <!-- Recents: The lock-to-app button. [CHAR LIMIT=NONE] --> - <string name="recents_lock_to_app_button_label">lock to app</string> + <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] --> + <string name="recents_lock_to_app_button_label">screen pinning</string> <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] --> <string name="recents_search_bar_label">search</string> <!-- Recents: Launch error string. [CHAR LIMIT=NONE] --> @@ -813,9 +806,6 @@ <!-- Battery saver notification action text. [CHAR LIMIT=60] --> <string name="battery_saver_notification_action_text">Turn off battery saver</string> - <!-- Battery level for expanded quick settings [CHAR LIMIT=2] --> - <string name="battery_level_template"><xliff:g id="level" example="45">%d</xliff:g>%%</string> - <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen --> <string name="notification_hidden_text">Contents hidden</string> @@ -906,9 +896,26 @@ <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] --> <string name="hidden_notifications_setup">Set up</string> - <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] --> - <string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string> - <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] --> <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string> + + <!-- Screen pinning dialog title. --> + <string name="screen_pinning_title">Screen is pinned</string> + <!-- Screen pinning dialog description. --> + <string name="screen_pinning_description">This keeps it in view until you unpin. Touch and hold Back and Overview at the same time to unpin.</string> + <!-- Screen pinning dialog description when in accessibility mode. --> + <string name="screen_pinning_description_accessible">This keeps it in view until you unpin. Touch and hold Overview to unpin.</string> + <!-- Screen pinning positive response. --> + <string name="screen_pinning_positive">Got it</string> + <!-- Screen pinning negative response. --> + <string name="screen_pinning_negative">No thanks</string> + + <!-- Hide quick settings tile confirmation title --> + <string name="quick_settings_reset_confirmation_title">Hide <xliff:g id="tile_label" example="Hotspot">%1$s</xliff:g>?</string> + + <!-- Hide quick settings tile confirmation message --> + <string name="quick_settings_reset_confirmation_message">It will reappear the next time you turn it on in settings.</string> + + <!-- Hide quick settings tile confirmation button --> + <string name="quick_settings_reset_confirmation_button">Hide</string> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index 909dc42..09b240b 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -167,14 +167,8 @@ <item name="android:textColor">@color/qs_subhead</item> </style> - <style name="TextAppearance.QS.ZenToast"> - <item name="android:textSize">14sp</item> - </style> - <style name="TextAppearance.QS.SegmentedButton"> <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:fontFamily">sans-serif-medium</item> </style> <style name="TextAppearance.QS.DataUsage"> @@ -234,6 +228,8 @@ <item name="android:colorControlActivated">@color/system_accent_color</item> </style> + <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" /> + <style name="QSBorderlessButton"> <item name="android:padding">12dp</item> <item name="android:background">@drawable/btn_borderless_rect</item> @@ -267,8 +263,13 @@ <item name="numColumns">3</item> </style> - <style name="ZenToastAnimations"> - <item name="android:windowEnterAnimation">@anim/zen_toast_enter</item> - <item name="android:windowExitAnimation">@anim/zen_toast_exit</item> + <style name="Theme.AlertDialogHost" parent="android:Theme.DeviceDefault"> + <item name="android:windowIsTranslucent">true</item> + <item name="android:windowBackground">@android:color/transparent</item> + <item name="android:windowContentOverlay">@null</item> + <item name="android:windowNoTitle">true</item> + <item name="android:windowIsFloating">true</item> + <item name="android:backgroundDimEnabled">false</item> + <item name="android:alertDialogTheme">@style/Theme.SystemUI.Dialog.Alert</item> </style> </resources> |