Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master

This commit is contained in:
Xin Li
2020-09-01 20:04:34 +00:00
committed by Android (Google) Code Review
2628 changed files with 514897 additions and 439664 deletions

View File

@@ -23,19 +23,19 @@
strings. --> <skip />
<!-- The time zone picker screen has two levels. The first level allows the user to choose a region. -->
<string-array name="timezone_filters">
<!-- The next level of the time zoner picker should show time zones from the Americas. -->
<!-- The next level of the time zoner picker should show time zones from the Americas. -->
<item>America</item>
<!-- The next level of the time zoner picker should show time zones from Europe. -->
<!-- The next level of the time zoner picker should show time zones from Europe. -->
<item>Europe</item>
<!-- The next level of the time zoner picker should show time zones from Africa. -->
<!-- The next level of the time zoner picker should show time zones from Africa. -->
<item>Africa</item>
<!-- The next level of the time zoner picker should show time zones from Asia. -->
<!-- The next level of the time zoner picker should show time zones from Asia. -->
<item>Asia</item>
<!-- The next level of the time zoner picker should show time zones from Australia. -->
<!-- The next level of the time zoner picker should show time zones from Australia. -->
<item>Australia</item>
<!-- The next level of the time zoner picker should show time zones from Pacific. -->
<!-- The next level of the time zoner picker should show time zones from Pacific. -->
<item>Pacific</item>
<!-- The next level of the time zoner picker should show time zones from ALL regions. -->
<!-- The next level of the time zoner picker should show time zones from ALL regions. -->
<item>All</item>
</string-array>
@@ -102,8 +102,10 @@
<!-- Dark theme scheduling preferences [CHAR LIMIT=NONE] -->
<string-array name="dark_ui_scheduler_preference_titles">
<!-- 1: None -->
<!-- 0: None -->
<item>@string/dark_ui_auto_mode_never</item>
<!-- 1: Custom -->
<item>@string/dark_ui_auto_mode_custom</item>
<!-- 2: Auto -->
<item>@string/dark_ui_auto_mode_auto</item>
</string-array>
@@ -229,7 +231,7 @@
<!-- Values for security type for wireless tether -->
<string-array name="wifi_tether_security_values" translatable="false">
<!-- Do not translate. -->
<item>4</item>
<item>1</item>
<!-- Do not translate. -->
<item>0</item>
</string-array>
@@ -246,6 +248,18 @@
<item>AKA\'</item>
</string-array>
<!-- Target EAP methods that will have different TTS strings -->
<!-- Note that this array length should be same as the wifi_eap_method_tts_strings-->
<string-array name="wifi_eap_method_target_strings" translatable="false">
<item>AKA\'</item>
</string-array>
<!-- TTS strings for the target EAP methods -->
<!-- Note that this array length should be same as the wifi_eap_method_target_strings-->
<string-array name="wifi_eap_method_tts_strings" translatable="false">
<item>AKA prime</item>
</string-array>
<!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
<string-array name="eap_method_without_sim_auth" translatable="false">
<item>PEAP</item>
@@ -254,24 +268,22 @@
<item>PWD</item>
</string-array>
<!-- Wi-Fi AP band settings. Either Auto, 2.4GHz or 5GHz. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array translatable="false" name="wifi_ap_band_config_full">
<item>0</item>
<!-- Type of OCSP -->
<string-array name="eap_ocsp_type" translatable="true">
<item>Do not validate</item>
<item>Request certificate status</item>
<item>Require certificate status</item>
<item>Require all non-trusted certificate statuses</item>
</string-array>
<!-- Wi-Fi AP band settings. Either 2.4GHz or 5GHz prefer. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array translatable="false" name="wifi_ap_band">
<item>1</item>
<item>3</item>
</string-array>
<string-array translatable="false" name="wifi_ap_band_summary_full">
<item>@string/wifi_ap_choose_2G</item>
<item>@string/wifi_ap_choose_5G</item>
</string-array>
<string-array translatable="false" name="wifi_ap_band_dual_mode">
<item>0</item>
<item>-1</item>
</string-array>
<string-array translatable="false" name="wifi_ap_band_dual_mode_summary">
<string-array translatable="false" name="wifi_ap_band_summary">
<item>@string/wifi_ap_choose_2G</item>
<item>@string/wifi_ap_prefer_5G</item>
</string-array>
@@ -281,8 +293,8 @@
<item>@string/wifi_ap_choose_2G</item>
</string-array>
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<!-- Wi-Fi WPS setup for p2p connections. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_p2p_wps_setup">
<!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
<item>Push button</item>
@@ -300,7 +312,7 @@
<item>Unsuccessful</item>
<item>Available</item>
<item>Out-of-range</item>
</string-array>
</string-array>
<!-- Bluetooth Settings -->
@@ -390,7 +402,7 @@
</string-array>
<!-- Wi-Fi IP settings. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
<string-array name="wifi_ip_settings">
<!-- Use DHCP (Dynamic Host Configuration Protocol) for obtaining IP settings [CHAR LIMIT=25] -->
<item>DHCP</item>
@@ -682,6 +694,24 @@
<item>Accessibility volume</item>
</string-array>
<!-- Keys for the list of accessibility auto click xml. -->
<string-array name="accessibility_autoclick_control_selector_keys" translatable="false">
<item>accessibility_control_autoclick_default</item>
<item>accessibility_control_autoclick_200ms</item>
<item>accessibility_control_autoclick_600ms</item>
<item>accessibility_control_autoclick_1sec</item>
<item>accessibility_control_autoclick_custom</item>
</string-array>
<!-- Values for the list of accessibility auto click, pairs to Keys . -->
<integer-array name="accessibility_autoclick_selector_values" translatable="false">
<item>0</item>
<item>200</item>
<item>600</item>
<item>1000</item>
<item>2000</item>
</integer-array>
<!-- Keys for the list of accessibility timeouts xml. -->
<string-array name="accessibility_timeout_control_selector_keys" translatable="false">
<item>accessibility_control_timeout_default</item>
@@ -756,11 +786,20 @@
<string-array name="captioning_font_size_selector_titles">
<item>Very small</item>
<item>Small</item>
<item>Normal</item>
<item>Default</item>
<item>Large</item>
<item>Very large</item>
</string-array>
<!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
<string-array name="captioning_font_size_selector_summaries">
<item>Very small text size</item>
<item>Small text size</item>
<item>Default text size</item>
<item>Large text size</item>
<item>Very large text size</item>
</string-array>
<!-- Values for captioning font size preference. -->
<string-array name="captioning_font_size_selector_values" translatable="false" >
<item>0.25</item>
@@ -890,7 +929,7 @@
<!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
<string-array name="captioning_preset_selector_titles" >
<item>Use app defaults</item>
<item>Set by app</item>
<item>White on black</item>
<item>Black on white</item>
<item>Yellow on black</item>
@@ -1003,19 +1042,43 @@
<item>\?</item>
</string-array>
<!-- Display color space adjustment modes for accessibility -->
<string-array name="daltonizer_type_entries" translatable="false">
<!-- Summary for magnification adjustment modes for accessibility -->
<string-array name="magnification_mode_summaries" translatable="false">
<item>@string/accessibility_magnification_area_settings_full_screen_summary</item>
<item>@string/accessibility_magnification_area_settings_window_screen_summary</item>
<item>@string/accessibility_magnification_area_settings_all_summary</item>
</string-array>
<!-- Values for magnification adjustment modes for accessibility -->
<integer-array name="magnification_mode_values" translatable="false">
<!-- Full screen -->
<item>1</item>
<!-- Window screen -->
<item>2</item>
<!-- Full screen and window screen. -->
<item>3</item>
</integer-array>
<!-- Summary for color space adjustment modes for accessibility -->
<string-array name="daltonizer_mode_summaries" translatable="false">
<item>@string/daltonizer_mode_deuteranomaly</item>
<item>@string/daltonizer_mode_protanomaly</item>
<item>@string/daltonizer_mode_tritanomaly</item>
</string-array>
<!-- Keys for color space adjustment modes for accessibility -->
<string-array name="daltonizer_mode_keys" translatable="false">
<item>daltonizer_mode_deuteranomaly</item>
<item>daltonizer_mode_protanomaly</item>
<item>daltonizer_mode_tritanomaly</item>
</string-array>
<!-- Values for display color space adjustment modes for accessibility -->
<string-array name="daltonizer_type_values" translatable="false">
<integer-array name="daltonizer_type_values" translatable="false">
<item>12</item>
<item>11</item>
<item>13</item>
</string-array>
</integer-array>
<!-- Battery saver mode: allowable trigger threshold levels. -->
<integer-array name="battery_saver_trigger_values" translatable="false" >
@@ -1094,14 +1157,14 @@
<item>@string/zen_mode_from_anyone</item>
<item>@string/zen_mode_from_contacts</item>
<item>@string/zen_mode_from_starred</item>
<item>@string/zen_mode_from_none_messages</item>
<item>@string/zen_mode_none_messages</item>
</string-array>
<string-array name="zen_mode_contacts_calls_entries" translatable="false">
<item>@string/zen_mode_from_anyone</item>
<item>@string/zen_mode_from_contacts</item>
<item>@string/zen_mode_from_starred</item>
<item>@string/zen_mode_from_none_calls</item>
<item>@string/zen_mode_none_calls</item>
</string-array>
<string-array name="zen_mode_contacts_values" translatable="false">
@@ -1111,6 +1174,19 @@
<item>zen_mode_from_none</item>
</string-array>
<string-array name="zen_mode_conversations_entries" translatable="false">
<item>@string/zen_mode_from_all_conversations</item>
<item>@string/zen_mode_from_important_conversations</item>
<item>@string/zen_mode_from_no_conversations</item>
</string-array>
<!-- these values correspond with ZenPolicy.ConversationSenders -->
<string-array name="zen_mode_conversations_values" translatable="false">
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<!--String arrays for notification swipe direction -->
<string-array name="swipe_direction_titles">
<item>@string/swipe_direction_rtl</item>
@@ -1204,6 +1280,49 @@
<item>"1"</item>
</string-array>
<string-array name="enabled_networks_except_gsm_values" translatable="false">
<item>"9"</item>
<item>"0"</item>
</string-array>
<string-array name="enabled_networks_except_lte_values" translatable="false">
<item>"0"</item>
<item>"1"</item>
</string-array>
<string-array name="enabled_networks_except_gsm_lte_values" translatable="false">
<item>"0"</item>
</string-array>
<string-array name="enabled_networks_cdma_values" translatable="false">
<item>"8"</item>
<item>"4"</item>
<item>"5"</item>
<item>"10"</item>
</string-array>
<string-array name="enabled_networks_cdma_no_lte_values" translatable="false">
<item>"4"</item>
<item>"5"</item>
</string-array>
<string-array name="enabled_networks_cdma_only_lte_values" translatable="false">
<item>"8"</item>
<item>"10"</item>
</string-array>
<string-array name="enabled_networks_tdscdma_values" translatable="false">
<item>"22"</item>
<item>"18"</item>
<item>"1"</item>
</string-array>
<string-array name="preferred_network_mode_values_world_mode" translatable="false">
<item>"10"</item>
<item>"8"</item>
<item>"9"</item>
</string-array>
<string-array name="cdma_system_select_choices">
<!-- System select dialog screen, setting option name -->
<item>Home only</item>
@@ -1309,101 +1428,18 @@
<item>"1"</item>
</string-array>
<string-array name="enabled_networks_except_gsm_choices" translatable="false">
<item>@string/network_lte</item>
<item>@string/network_3G</item>
</string-array>
<string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">
<item>@string/network_4G</item>
<item>@string/network_3G</item>
</string-array>
<string-array name="enabled_networks_except_gsm_values" translatable="false">
<item>"9"</item>
<item>"0"</item>
</string-array>
<string-array name="enabled_networks_except_lte_choices" translatable="false">
<item>@string/network_3G</item>
<item>@string/network_2G</item>
</string-array>
<string-array name="enabled_networks_except_lte_values" translatable="false">
<item>"0"</item>
<item>"1"</item>
</string-array>
<string-array name="enabled_networks_except_gsm_lte_choices" translatable="false">
<item>@string/network_3G</item>
</string-array>
<string-array name="enabled_networks_except_gsm_lte_values" translatable="false">
<item>"0"</item>
</string-array>
<string-array name="enabled_networks_cdma_choices" translatable="false">
<item>@string/network_lte</item>
<item>@string/network_3G</item>
<item>@string/network_1x</item>
<item>@string/network_global</item>
</string-array>
<string-array name="enabled_networks_cdma_values" translatable="false">
<item>"8"</item>
<item>"4"</item>
<item>"5"</item>
<item>"10"</item>
</string-array>
<string-array name="enabled_networks_cdma_no_lte_choices" translatable="false">
<item>@string/network_3G</item>
<item>@string/network_1x</item>
</string-array>
<string-array name="enabled_networks_cdma_no_lte_values" translatable="false">
<item>"4"</item>
<item>"5"</item>
</string-array>
<string-array name="enabled_networks_cdma_only_lte_choices" translatable="false">
<item>@string/network_lte</item>
<item>@string/network_global</item>
</string-array>
<string-array name="enabled_networks_cdma_only_lte_values" translatable="false">
<item>"8"</item>
<item>"10"</item>
</string-array>
<string-array name="enabled_networks_tdscdma_choices" translatable="false">
<item>@string/network_lte</item>
<item>@string/network_3G</item>
<item>@string/network_2G</item>
</string-array>
<string-array name="enabled_networks_tdscdma_values" translatable="false">
<item>"22"</item>
<item>"18"</item>
<item>"1"</item>
</string-array>
<!--String arrays for World preferred netwrok modes -->
<string-array name="preferred_network_mode_choices_world_mode">
<item>Global</item>
<item>LTE / CDMA</item>
<item>LTE / GSM / UMTS</item>
</string-array>
<string-array name="preferred_network_mode_values_world_mode" translatable="false">
<item>"10"</item>
<item>"8"</item>
<item>"9"</item>
</string-array>
<!-- WiFi calling mode array -->
<string-array name="wifi_calling_mode_summaries" translatable="false">
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_only_summary</item>
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_only_summary</item>
</string-array>
<!-- WiFi calling mode array without wifi only mode -->
<string-array name="wifi_calling_mode_summaries_without_wifi_only" translatable="false">
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
<item>@string/wifi_calling_mode_wifi_preferred_summary</item>
<item>@string/wifi_calling_mode_cellular_preferred_summary</item>
</string-array>
<!-- Carrier variant of Enhaced 4G LTE Mode title. [CHAR LIMIT=NONE] -->
@@ -1426,6 +1462,34 @@
<item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>
</string-array>
<!-- A whitelist which packages won't show summary in battery usage screen. [CHAR LIMIT=NONE] -->
<string-array name="whitelist_hide_summary_in_battery_usage" translatable="false">
<!-- Google -->
<item>"com.google.android.googlequicksearchbox"</item>
</string-array>
<!-- Array of titles palette list for accessibility. -->
<string-array name="setting_palette_colors" translatable="false" >
<item>@string/color_red</item>
<item>@string/color_orange</item>
<item>@string/color_yellow</item>
<item>@string/color_green</item>
<item>@string/color_cyan</item>
<item>@string/color_blue</item>
<item>@string/color_purple</item>
</string-array>
<!-- Values for palette list view preference. -->
<array name="setting_palette_data" translatable="false" >
<item>@color/palette_list_color_red</item>
<item>@color/palette_list_color_orange</item>
<item>@color/palette_list_color_yellow</item>
<item>@color/palette_list_color_green</item>
<item>@color/palette_list_color_cyan</item>
<item>@color/palette_list_color_blue</item>
<item>@color/palette_list_color_purple</item>
</array>
<!--String arrays for showing the rtt settings options -->
<string-array name="rtt_setting_mode">
<!-- 0: Invalid value -->

View File

@@ -56,8 +56,6 @@
<attr name="cardPreferenceStyle" format="reference" />
<attr name="footerPreferenceStyle" format="reference" />
<declare-styleable name="FixedLineSummaryPreference">
<attr name="summaryLineCount" format="integer" />
</declare-styleable>
@@ -70,10 +68,10 @@
<attr name="searchable" format="boolean" />
<!-- Classname of a PreferenceController corresponding to the preference -->
<attr name="controller" format="string" />
<!-- {@code true} when the controller declared represents a slice from {@link android.app.SettingsSliceContract} -->
<attr name="platform_slice" format="boolean" />
<!-- customized subtitle if it's an unavailable slice -->
<!-- Customized subtitle if it's an unavailable slice -->
<attr name="unavailableSliceSubtitle" format="string" />
<!-- Whether or not the preference is for work profile, by default it's false. -->
<attr name="forWork" format="boolean" />
</declare-styleable>
<declare-styleable name="PreferenceScreen">
@@ -116,13 +114,10 @@
<attr name="confirmDeviceCredentialsSideMargin" format="dimension" />
<attr name="confirmDeviceCredentialsTopMargin" format="dimension" />
<declare-styleable name="WorkPreference">
<attr name="forWork" format="boolean" />
</declare-styleable>
<declare-styleable name="VideoPreference">
<attr name="animation" format="reference" />
<attr name="preview" format="reference" />
<attr name="vectorAnimation" format="reference" />
</declare-styleable>
<!-- For AspectRatioFrameLayout -->
@@ -164,6 +159,12 @@
<attr name="textOff" format="reference" />
</declare-styleable>
<!-- For LabeledSeekBarPreference -->
<declare-styleable name="LabeledSeekBarPreference">
<attr name="textStart" format="reference" />
<attr name="textEnd" format="reference" />
</declare-styleable>
<declare-styleable name="TintDrawable">
<attr name="android:tint" />
<attr name="android:drawable" />

View File

@@ -108,8 +108,6 @@
<color name="switchbar_switch_track_tint">#BFFFFFFF</color>
<color name="switchbar_switch_thumb_tint">@android:color/white</color>
<color name="glif_error_color">@*android:color/material_red_A700</color>
<color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->
<color name="battery_maybe_color_light">#ef6c00</color> <!-- Material Orange 800 -->
<color name="battery_bad_color_light">#f44336</color> <!-- Material Red 500 -->
@@ -148,4 +146,26 @@
<color name="dialog_background">@*android:color/background_device_default_light</color>
<color name="face_intro_outline">#ffdadce0</color>
<color name="back_gesture_indicator">#4182ef</color>
<!-- Palette list preference colors. -->
<color name="palette_list_gradient_background">@android:color/white</color>
<color name="palette_list_color_red">#d93025</color> <!-- Material Red 600 -->
<color name="palette_list_color_orange">#e8710a</color> <!-- Material Orange 600 -->
<color name="palette_list_color_yellow">#f9ab00</color> <!-- Material Yellow 600 -->
<color name="palette_list_color_green">#1e8e3e</color> <!-- Material Green 600 -->
<color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->
<color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->
<color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->
<!-- Palette list preference dark mode colors. -->
<color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->
<color name="palette_list_dark_mode_color_orange">#fcad70</color> <!-- Material Orange 300 -->
<color name="palette_list_dark_mode_color_yellow">#fdd663</color> <!-- Material Yellow 300 -->
<color name="palette_list_dark_mode_color_green">#81c995</color> <!-- Material Green 300 -->
<color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->
<color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->
<color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->
</resources>

View File

@@ -201,11 +201,17 @@
<!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->
<bool name="config_force_rounded_icon_TopLevelSettings">true</bool>
<!-- Whether dismissal timestamp should be kept before deletion -->
<bool name="config_keep_contextual_card_dismissal_timestamp">false</bool>
<!-- Settings intelligence package name -->
<string name="config_settingsintelligence_package_name" translatable="false">
com.android.settings.intelligence
</string>
<!-- Whether the confirmation for sim deletion is defaulted to be on or off-->
<bool name="config_sim_deletion_confirmation_default_on">false</bool>
<!-- Package Installer package name -->
<string name="config_package_installer_package_name" translatable="false">
com.android.packageinstaller
@@ -214,10 +220,21 @@
<!-- Settings intelligence interaction log intent action -->
<string name="config_settingsintelligence_log_action" translatable="false"></string>
<!-- AOSP Emergency app package name -->
<string name="config_aosp_emergency_package_name" translatable="false">
com.android.emergency
</string>
<!-- AOSP Emergency app intent action -->
<string name="config_aosp_emergency_intent_action" translatable="false">
android.settings.EDIT_EMERGENCY_INFO
</string>
<!-- Emergency app package name -->
<string name="config_emergency_package_name" translatable="false">
com.android.emergency
</string>
<!-- Emergency app intent action -->
<string name="config_emergency_intent_action" translatable="false">
android.settings.EDIT_EMERGENCY_INFO
@@ -415,15 +432,6 @@
<!-- List containing the injected tile keys which are suppressed. -->
<string-array name="config_suppress_injected_tile_keys" translatable="false"/>
<!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->
<string name="config_work_policy_info_intent_action" translatable="false"/>
<!-- RTT setting intent action -->
<string name="config_rtt_setting_intent_action" translatable="false"></string>
<!-- Package name of dialer supports RTT setting-->
<string name="config_rtt_setting_package_name" translatable="false"></string>
<!-- Reset application package name -->
<string-array name="config_skip_reset_apps_package_name" translatable="false">
<item>android</item>
@@ -431,4 +439,27 @@
<item>com.android.systemui</item>
<item>com.android.vending</item>
</string-array>
<!-- Settings panel keeps observe this uri -->
<string-array name="config_panel_keep_observe_uri" translatable="false">
<item>content://com.android.settings.slices/intent/media_output_indicator</item>
</string-array>
<!-- Uri to query non-public Slice Uris. -->
<string name="config_non_public_slice_query_uri" translatable="false"></string>
<!-- RTT setting intent action -->
<string name="config_rtt_setting_intent_action" translatable="false"></string>
<!-- Package name of dialer supports RTT setting-->
<string name="config_rtt_setting_package_name" translatable="false"></string>
<!-- Whether nfc detection point preview image is available or not. -->
<bool name="config_nfc_detection_point">false</bool>
<!-- Whether to show Enhanced Connectivity switch in Developer Options -->
<bool name="config_show_enhanced_connectivity">false</bool>
<!-- Whether to show Smooth Display feature in Settings Options -->
<bool name="config_show_smooth_display">false</bool>
</resources>

View File

@@ -56,6 +56,8 @@
<dimen name="captioning_preview_height">200dp</dimen>
<dimen name="autoclick_preview_height">200dp</dimen>
<dimen name="color_mode_preview_height">320dp</dimen>
<dimen name="ring_progress_bar_thickness">4dp</dimen>
@@ -65,6 +67,8 @@
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
<integer name="preferences_right_pane_weight">6</integer>
<dimen name="nfc_detection_point_height">300dp</dimen>
<dimen name="notification_app_icon_size">64dp</dimen>
<dimen name="notification_app_icon_badge_size">20dp</dimen>
<dimen name="notification_app_icon_badge_margin">4dp</dimen>
@@ -81,6 +85,16 @@
<dimen name="notification_importance_button_text">16sp</dimen>
<dimen name="notification_importance_button_padding">14dp</dimen>
<dimen name="notification_history_header_drawable_start">26dp</dimen>
<dimen name="conversation_icon_size">48dp</dimen>
<dimen name="zen_mode_icon_size">36dp</dimen>
<dimen name="zen_mode_icon_margin">16dp</dimen>
<dimen name="zen_mode_settings_button_margin_vertical">24dp</dimen>
<dimen name="zen_senders_image_margin_vertical">16dp</dimen>
<dimen name="zen_conversations_image_margin_vertical">24dp</dimen>
<dimen name="zen_conversations_icon_offset">32dp</dimen>
<dimen name="zen_conversations_icon_size">50dp</dimen>
<dimen name="zen_schedule_rule_checkbox_padding">7dp</dimen>
<dimen name="zen_schedule_day_margin">17dp</dimen>
@@ -157,9 +171,6 @@
<!-- CryptKeeper pattern size for tablet -->
<dimen name="crypt_keeper_pattern_size">354dip</dimen>
<!-- Screen pinning textview paddings -->
<dimen name="screen_pinning_textview_padding">40dp</dimen>
<!-- SIM Dialog Margin top -->
<dimen name="sim_dialog_margin_top">8dip</dimen>
<!-- SIM Dialog Margin bottom -->
@@ -252,9 +263,6 @@
<dimen name="admin_details_dialog_learn_more_button_padding">8dp</dimen>
<dimen name="admin_details_dialog_learn_more_button_minWidth">88dp</dimen>
<!-- Button bar padding for unmount button. -->
<dimen name="unmount_button_padding">8dp</dimen>
<!-- Display, Screen zoom -->
<dimen name="conversation_message_list_padding">10dp</dimen>
<dimen name="conversation_message_contact_icon_text_size">32sp</dimen>
@@ -269,16 +277,9 @@
<dimen name="message_metadata_top_padding">4dp</dimen>
<!-- Accessibility Settings -->
<dimen name="accessibility_layout_margin_start_end">24dp</dimen>
<dimen name="accessibility_layout_margin_start_end">16dp</dimen>
<dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen>
<!-- Accessibility, Screen magnification. These values are meant to be relative values and the actual layout value will be set programmatically. -->
<dimen name="screen_magnification_video_background_width">750dp</dimen>
<dimen name="screen_magnification_video_background_height">383dp</dimen>
<dimen name="screen_magnification_video_width">170dp</dimen>
<dimen name="screen_magnification_video_height">311dp</dimen>
<dimen name="screen_magnification_video_margin_top">40dp</dimen>
<!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen>
<!-- Restricted icon size in switch bar -->
@@ -328,10 +329,6 @@
<dimen name="reset_master_clear_margin_start">32dp</dimen>
<dimen name="reset_master_clear_margin_end">12dp</dimen>
<!-- Padding for screen pinning -->
<dimen name="screen_pinning_padding_start">64dp</dimen>
<dimen name="screen_pinning_padding_end">64dp</dimen>
<!-- Padding for the reset screens -->
<dimen name="reset_checkbox_padding_end">8dp</dimen>
<dimen name="reset_checkbox_title_padding_top">12dp</dimen>
@@ -351,15 +348,6 @@
<dimen name="contextual_half_card_padding_top">12dp</dimen>
<dimen name="contextual_half_card_padding_bottom">16dp</dimen>
<dimen name="contextual_half_card_title_margin_top">12dp</dimen>
<dimen name="contextual_deferred_setup_card_padding_top">16dp</dimen>
<dimen name="contextual_deferred_setup_card_padding_bottom">12dp</dimen>
<dimen name="contextual_deferred_setup_card_title_margin_top">12dp</dimen>
<dimen name="contextual_deferred_setup_card_summary_margin_top">2dp</dimen>
<dimen name="contextual_deferred_setup_card_button_margin_top">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_top">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_bottom">8dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_start">24dp</dimen>
<dimen name="contextual_deferred_setup_card_button_padding_end">24dp</dimen>
<!-- Homepage dismissal cards size and padding -->
<dimen name="contextual_card_dismissal_margin_top">12dp</dimen>
@@ -401,24 +389,44 @@
<dimen name="qrcode_size">264dp</dimen>
<dimen name="qrcode_preview_size">360dp</dimen>
<!-- Wi-Fi DPP fragment icon size -->
<dimen name="wifi_dpp_fragment_icon_width_height">48dp</dimen>
<!-- Elevation of bluetooth icon -->
<dimen name="bt_icon_elevation">4dp</dimen>
<dimen name="two_target_min_width">80dp</dimen>
<!-- Maximum height for SliceView, override on slices/view/src/main/res/values/dimens.xml -->
<dimen name="abc_slice_large_height">480dp</dimen>
<dimen name="abc_slice_large_height">1800dp</dimen>
<!-- System navigation settings illustration height -->
<dimen name="system_navigation_illustration_height">320dp</dimen>
<dimen name="back_gesture_indicator_width">60dp</dimen>
<!-- Header title size of advanced bluetooth device -->
<dimen name="advanced_bluetooth_header_title_text_size">16sp</dimen>
<!-- Battery meter icon size of advanced bluetooth device -->
<dimen name="advanced_bluetooth_battery_meter_width">7.8dp</dimen>
<dimen name="advanced_bluetooth_battery_meter_height">13dp</dimen>
<dimen name="advanced_bluetooth_battery_width">15.5dp</dimen>
<dimen name="advanced_bluetooth_battery_height">27.5dp</dimen>
<dimen name="advanced_bluetooth_battery_right_margin">-4dp</dimen>
<!-- Developer option bluetooth settings dialog -->
<dimen name="developer_option_dialog_margin_start">8dp</dimen>
<dimen name="developer_option_dialog_margin_top">8dp</dimen>
<dimen name="developer_option_dialog_min_height">48dp</dimen>
<dimen name="developer_option_dialog_padding_start">16dp</dimen>
<!-- Developer options shared data screens related dimensions -->
<dimen name="list_preferred_item_padding">16dp</dimen>
<!-- Output switcher panel related dimensions -->
<dimen name="output_switcher_slice_padding_top">11dp</dimen>
<dimen name="output_switcher_slice_max_height">458dp</dimen>
<dimen name="output_switcher_panel_icon_size">52dp</dimen>
<dimen name="output_switcher_panel_icon_corner_radius">16dp</dimen>
<!-- Text padding for EmptyTextSettings -->
<dimen name="empty_text_padding">24dp</dimen>
</resources>

View File

@@ -32,6 +32,9 @@
<item type="id" name="action_drag_move_bottom" />
<item type="id" name="action_drag_remove" />
<!-- Go to location settings button id -->
<item type="id" name="go_to_location_setting" />
<!-- For a menu item allowing users to edit a SIM display name -->
<item type="id" name="edit_sim_name" />
</resources>

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -144,8 +143,9 @@
<style name="wifi_item_edit_content">
<item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
<item name="android:textColorHint">?android:attr/textColorSecondary</item>
<item name="android:minHeight">@dimen/min_tap_target_size</item>
</style>
@@ -282,8 +282,6 @@
<item name="android:letterSpacing">0.072727273</item>
</style>
<style name="TextAppearance.TileTitle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
<style name="TextAppearance.SuggestionTitle"
parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:textSize">16sp</item>
@@ -314,7 +312,7 @@
<item name="android:textSize">@dimen/search_bar_text_size</item>
</style>
<style name="TextAppearance.ConditionCardTitle"
<style name="TextAppearance.HomepageCardTitle"
parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textSize">16sp</item>
@@ -335,6 +333,24 @@
<item name="android:padding">8dp</item>
</style>
<style name="TextAppearance.NotificationHistory">
<item name="android:textSize">14sp</item>
</style>
<style name="TextAppearance.NotificationHistory.AppName">
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textSize">12sp</item>
</style>
<style name="TextAppearance.NotificationHistory.Title">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="TextAppearance.NotificationHistory.Text">
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="TextAppearance.ContextualCardDismissalText"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
@@ -499,72 +515,82 @@
<style name="Widget.SliceView.Settings">
<item name="titleSize">@*android:dimen/text_size_subhead_material</item>
<item name="rowStyle">@style/SliceRowStyle.Settings</item>
<item name="rowStyle">@style/SliceRow.Settings</item>
</style>
<style name="TextAppearance.DeferredSetupCardTitle">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.DeferredSetupCardSummary"
parent="@*android:style/TextAppearance.DeviceDefault.Body1">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="DeferredSetupCardButton" parent="android:Widget.DeviceDefault.Button.Colored">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:paddingBottom">@dimen/contextual_deferred_setup_card_button_padding_bottom</item>
<item name="android:paddingEnd">@dimen/contextual_deferred_setup_card_button_padding_end</item>
<item name="android:paddingStart">@dimen/contextual_deferred_setup_card_button_padding_start</item>
<item name="android:paddingTop">@dimen/contextual_deferred_setup_card_button_padding_top</item>
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
</style>
<style name="SliceViewStyle">
<!-- 2dp start padding for the start icon -->
<item name="android:paddingStart">2dp</item>
<!-- End margin of content without end items is 24dp.
android:paddingEnd = 24 - 16(contentEndPadding) -->
<item name="android:paddingEnd">8dp</item>
<item name="rowStyle">@style/SliceRowStyle</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
<style name="ContextualCardSliceViewStyle" parent="SliceViewStyle">
<style name="Widget.SliceView.ContextualCard">
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">@color/contextual_card_background</item>
</style>
<style name="SliceRowStyle">
<style name="Widget.SliceView.Panel">
<item name="titleSize">16sp</item>
<item name="rowStyle">@style/SliceRow</item>
<item name="android:background">?android:attr/colorBackgroundFloating</item>
</style>
<style name="Widget.SliceView.Panel.Slider">
<item name="rowStyle">@style/SliceRow.Slider</item>
</style>
<style name="Widget.SliceView.Panel.Slider.LargeIcon">
<item name="rowStyle">@style/SliceRow.Slider.LargeIcon</item>
</style>
<style name="SliceRow">
<!-- 2dp start padding for the start icon -->
<item name="titleItemStartPadding">2dp</item>
<item name="titleItemEndPadding">0dp</item>
<!-- Padding between content and the start icon is 14dp. -->
<!-- Padding between content and the start icon is 14dp -->
<item name="contentStartPadding">14dp</item>
<!-- Padding between content and end items is 16dp. -->
<!-- Padding between content and end items is 16dp -->
<item name="contentEndPadding">16dp</item>
<!-- Both side margins of end item are 16dp.
endItemEndPadding = 16 - 8(android:paddingEnd) -->
<!-- Both side margins of end item are 16dp -->
<item name="endItemStartPadding">16dp</item>
<item name="endItemEndPadding">8dp</item>
<item name="endItemEndPadding">16dp</item>
<!-- Both side margins of bottom divider are 12dp.
bottomDividerStartPadding = 12 - 2(android:paddingStart)
bottomDividerEndPadding = 12 - 8(android:paddingEnd) -->
<item name="bottomDividerStartPadding">10dp</item>
<item name="bottomDividerEndPadding">4dp</item>
<!-- Both side margins of bottom divider are 12dp -->
<item name="bottomDividerStartPadding">12dp</item>
<item name="bottomDividerEndPadding">12dp</item>
<item name="actionDividerHeight">32dp</item>
</style>
<style name="SliceRowStyle.Settings">
<!-- Padding between content and the start icon is 8dp. -->
<style name="SliceRow.Settings">
<!-- Padding between content and the start icon is 8dp -->
<item name="contentStartPadding">8dp</item>
</style>
<style name="SliceRow.Slider">
<!-- Padding between content and the start icon is 0dp -->
<item name="contentStartPadding">0dp</item>
<item name="contentEndPadding">36dp</item>
<!-- 0dp start padding for the end item -->
<item name="endItemStartPadding">0dp</item>
<!-- 8dp end padding for the end item -->
<item name="endItemEndPadding">8dp</item>
<!-- Align text with slider -->
<item name="titleStartPadding">11dp</item>
<item name="subContentStartPadding">11dp</item>
<!-- Padding for indeterminate progress bar -->
<item name="progressBarStartPadding">12dp</item>
<item name="progressBarEndPadding">16dp</item>
</style>
<style name="SliceRow.Slider.LargeIcon">
<!-- 10dp start padding for the start icon -->
<item name="titleItemStartPadding">10dp</item>
<!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
<item name="iconSize">12dp</item>
<!-- RecycleView item animator -->
<item name="disableRecyclerViewItemAnimator">true</item>
</style>
<style name="DisclaimerPositiveButton" parent="@style/SudGlifButton.Primary">
<item name="android:layout_margin">16dp</item>
<item name="android:paddingStart">8dp</item>
@@ -612,6 +638,12 @@
<item name="android:showDividers">middle</item>
</style>
<style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault.Medium">
<item name="android:textAllCaps">false</item>
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="AccessibilityDialogServiceIcon">
<item name="android:layout_width">36dp</item>
<item name="android:layout_height">36dp</item>
@@ -689,9 +721,70 @@
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="AccessibilityDialogButtonAllow"
parent="@style/AccessibilityDialogButton"></style>
<style name="AccessibilityDialogButtonDeny"
parent="@style/AccessibilityDialogButton"></style>
<style name="Widget.PopupWindow.Settings"
parent="@android:style/Widget.DeviceDefault.PopupWindow">
<item name="android:clipToPadding">true</item>
<item name="android:clipChildren">true</item>
</style>
<style name="PickerDialogTheme.Settings" parent="@*android:style/ThemeOverlay.Material.Dialog.DatePicker">
<item name="android:clipToPadding">true</item>
<item name="android:clipChildren">true</item>
</style>
<style name="CrossProfileConsentDialogTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:textSize">20sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-medium</item>
<item name="android:paddingTop">36dp</item>
<item name="android:paddingBottom">16dp</item>
</style>
<style name="CrossProfileConsentDialogDescription">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">36dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">start</item>
</style>
<style name="CrossProfileConsentDialogIcon">
<item name="android:layout_width">24dp</item>
<item name="android:layout_height">24dp</item>
<item name="android:antialias">true</item>
<item name="android:gravity">start</item>
</style>
<style name="CrossProfileConsentDialogSubTitle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">start</item>
</style>
<style name="CrossProfileConsentDialogSubDescription">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">start</item>
</style>
<style name="TextAppearance.HeadLineFontFamily"
parent="@*android:style/TextAppearance.DeviceDefault.Title">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
<style name="TextAppearance.HeadLineFontFamily.Subhead"
parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
</resources>

View File

@@ -27,9 +27,14 @@
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
<item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle
</item>
<item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
<!-- For preference category color -->
<item name="preferenceCategoryTitleTextColor">?android:attr/textColorSecondary</item>
<item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style>
<style name="SettingsCategoryPreference" parent="Preference.Category.Material" />
<style name="PreferenceTheme.SetupWizard">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item>

View File

@@ -32,6 +32,7 @@
<item name="android:listPreferredItemHeight">72dip</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:datePickerDialogTheme">@style/PickerDialogTheme.Settings</item>
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
@@ -209,6 +210,10 @@
<item name="android:windowBackground">@android:color/white</item>
</style>
<style name="Theme.Settings.ContextualCard" parent="Theme.Settings.Home">
<item name="android:textAppearanceListItem">@style/TextAppearance.HomepageCardTitle</item>
</style>
<!-- Note that Dialog themes do not set list dividers -->
<style name="Theme.Panel" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
<item name="android:windowBackground">@null</item>
@@ -252,4 +257,8 @@
<item name="android:colorPrimaryDark">@android:color/white</item>
<item name="android:colorAccent">@color/material_blue_700</item>
</style>
<!-- Material theme for the pages containing TabLayout and ViewPager -->
<style name="Theme.TabTheme" parent="@style/Theme.MaterialComponents.DayNight">
<item name="colorPrimary">@*android:color/edge_effect_device_default_light</item>
</style>
</resources>

View File

@@ -52,7 +52,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme" parent="SudThemeGlifV2.DayNight">
@@ -90,7 +89,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV3Theme" parent="SudThemeGlifV3.DayNight">
@@ -133,7 +131,6 @@
<item name="preferenceTheme">@style/PreferenceTheme.SetupWizard</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
<item name="*android:colorError">@color/glif_error_color</item>
</style>
<style name="GlifV2Theme.Transparent">