PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 24Q4 (ab/12406339) into aosp-main-future

Browse Source 
Bug: 370570306
Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14
Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
This commit is contained in:
Xin Li
2024-11-11 21:38:40 -08:00
parent c4d90bf739 658459de9b
commit cfa19e11a6
1597 changed files with 77072 additions and 46403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/aliases.xml
View File

@@ -23,5 +23,6 @@
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="sfps_enroll_finish" type="layout">@layout/sfps_enroll_finish_base</item>
<item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
<item name="mode_interstitial_layout" type="layout">@layout/mode_interstitial_layout_base</item>
</resources>

106
res/values/arrays.xml
View File

@@ -1525,32 +1525,104 @@
<item>2</item>
</string-array>
<!-- TODO: b/333901673 - Get full icon list. -->
<array name="zen_mode_icon_options" translatable="false">
<item>@*android:drawable/ic_zen_mode_type_bedtime</item>
<item>@*android:drawable/ic_zen_mode_type_driving</item>
<item>@*android:drawable/ic_zen_mode_type_immersive</item>
<item>@*android:drawable/ic_zen_mode_type_managed</item>
<item>@*android:drawable/ic_zen_mode_type_other</item>
<!-- Work/Study/Meetings -->
<item>@*android:drawable/ic_zen_mode_icon_work</item> <!-- Briefcase -->
<item>@*android:drawable/ic_zen_mode_icon_classical_building</item>
<item>@*android:drawable/ic_zen_mode_icon_apartment_building</item>
<item>@*android:drawable/ic_zen_mode_icon_speech_bubble</item>
<item>@*android:drawable/ic_zen_mode_icon_group_of_people</item>
<item>@*android:drawable/ic_zen_mode_icon_lightbulb</item>
<item>@*android:drawable/ic_zen_mode_type_schedule_calendar</item>
<item>@*android:drawable/ic_zen_mode_type_special_dnd</item>
<!-- Sports -->
<item>@*android:drawable/ic_zen_mode_icon_running</item>
<item>@*android:drawable/ic_zen_mode_icon_golf</item>
<item>@*android:drawable/ic_zen_mode_icon_gym</item>
<item>@*android:drawable/ic_zen_mode_icon_swimming</item>
<item>@*android:drawable/ic_zen_mode_icon_hiking</item>
<item>@*android:drawable/ic_zen_mode_icon_ball_sports</item>
<item>@*android:drawable/ic_zen_mode_icon_martial_arts</item>
<!-- Leisure -->
<item>@*android:drawable/ic_zen_mode_icon_gaming</item>
<item>@*android:drawable/ic_zen_mode_icon_palette</item>
<item>@*android:drawable/ic_zen_mode_icon_snowflake</item>
<item>@*android:drawable/ic_zen_mode_icon_beach</item>
<item>@*android:drawable/ic_zen_mode_icon_workshop</item>
<item>@*android:drawable/ic_zen_mode_icon_camping</item>
<item>@*android:drawable/ic_zen_mode_type_theater</item> <!-- Film reel -->
<item>@*android:drawable/ic_zen_mode_icon_book</item>
<!-- Wellbeing -->
<item>@*android:drawable/ic_zen_mode_icon_lotus_flower</item>
<item>@*android:drawable/ic_zen_mode_type_immersive</item>
<item>@*android:drawable/ic_zen_mode_icon_headphones</item>
<item>@*android:drawable/ic_zen_mode_icon_tv</item>
<!-- Other activities -->
<item>@*android:drawable/ic_zen_mode_icon_train</item>
<item>@*android:drawable/ic_zen_mode_type_driving</item> <!-- Car -->
<item>@*android:drawable/ic_zen_mode_icon_fork_and_knife</item>
<item>@*android:drawable/ic_zen_mode_icon_shopping_cart</item>
<item>@*android:drawable/ic_zen_mode_icon_child</item>
<item>@*android:drawable/ic_zen_mode_icon_animal_paw</item>
<!-- Generic / abstract -->
<item>@*android:drawable/ic_zen_mode_type_unknown</item> <!-- Star badge -->
<item>@*android:drawable/ic_zen_mode_type_managed</item> <!-- Two people / Supervisor -->
<item>@*android:drawable/ic_zen_mode_type_other</item> <!-- Star -->
<item>@*android:drawable/ic_zen_mode_icon_heart</item>
<item>@*android:drawable/ic_zen_mode_icon_house</item>
<item>@*android:drawable/ic_zen_mode_type_bedtime</item> <!-- Moon -->
<item>@*android:drawable/ic_zen_mode_type_schedule_time</item>
<item>@*android:drawable/ic_zen_mode_type_theater</item>
<item>@*android:drawable/ic_zen_mode_type_unknown</item>
</array>
<!-- TODO: b/333901673 - Complete list -->
<!-- Descriptions of the icons in zen_mode_icon_options. Should describe the associated image
[CHAR LIMIT=NONE] -->
<string-array name="zen_mode_icon_options_descriptions">
<item>Bedtime</item>
<item>Driving</item>
<item>Immersive</item>
<item>Managed</item>
<item>Star</item>
<!-- Work/Study/Meetings -->
<item>Briefcase</item>
<item>Classical building</item>
<item>Apartment building</item>
<item>Speech bubble</item>
<item>Group of people</item>
<item>Lightbulb</item>
<item>Calendar</item>
<item>Time</item>
<item>Theater</item>
<item>Flower</item>
<item>Do Not Disturb</item>
<!-- Sports -->
<item>Person running</item>
<item>Golf</item>
<item>Gym dumbbell</item>
<item>Swimming</item>
<item>Person hiking</item>
<item>Person throwing ball</item>
<item>Person kicking</item>
<!-- Leisure -->
<item>Game controller</item>
<item>Artist color palette</item>
<item>Snowflake</item>
<item>Beach umbrella</item>
<item>Workshop tools</item>
<item>Tent</item>
<item>Film reel</item>
<item>Book</item>
<!-- Wellbeing -->
<item>Lotus flower</item>
<item>Person\'s mind</item>
<item>Headphones</item>
<item>TV</item>
<!-- Other activities -->
<item>Train</item>
<item>Car</item>
<item>Fork and knife</item>
<item>Shopping cart</item>
<item>Child</item>
<item>Animal paw</item>
<!-- Generic / abstract -->
<item>Star badge</item>
<item>Two people</item>
<item>Star</item>
<item>Heart</item>
<item>House</item>
<item>Half-moon</item>
<item>Clock</item>
</string-array>
<!-- Packages that will not show Display over other apps permission -->

3
res/values/colors.xml
View File

@@ -218,4 +218,7 @@
<!-- Switch bar disabled state color-->
<color name="switch_bar_state_disabled_color">#1F1F1F1F</color>
<!-- Pointer fill color setting outline color-->
<color name="pointer_fill_outline_color">#000000</color>
</resources>

3
res/values/config.xml
View File

@@ -235,9 +235,6 @@
Can be overridden for specific product builds if the target device does not support it -->
<bool name="config_media_vibration_supported">true</bool>
<!-- Whether to show Keyboard vibration settings in the vibration and haptics screen. -->
<bool name="config_keyboard_vibration_supported">false</bool>
<!--
Whether or not the homepage should be powered by legacy suggestion (versus contextual cards)
Default to true as not all devices support contextual cards.

44
res/values/dimens.xml
View File

@@ -175,10 +175,26 @@
<dimen name="keyboard_picker_text_size">16sp</dimen>
<!-- Pointer -->
<dimen name="pointer_fill_style_circle_diameter">52dp</dimen>
<dimen name="pointer_fill_style_circle_padding">8dp</dimen>
<dimen name="pointer_fill_style_shape_default_stroke">1dp</dimen>
<dimen name="pointer_fill_style_shape_hovered_stroke">3dp</dimen>
<dimen name="pointer_fill_container_height">88dp</dimen>
<dimen name="pointer_fill_container_max_width">448dp</dimen>
<dimen name="pointer_fill_style_container_padding">32dp</dimen>
<dimen name="pointer_fill_style_circle_diameter">56dp</dimen>
<dimen name="pointer_fill_style_circle_hover_selected_diameter">52dp</dimen>
<dimen name="pointer_fill_style_circle_hover_diameter">56dp</dimen>
<dimen name="pointer_fill_style_circle_selected_diameter">50dp</dimen>
<dimen name="pointer_fill_style_circle_inner_diameter">40dp</dimen>
<dimen name="pointer_fill_style_circle_offset">8dp</dimen>
<dimen name="pointer_fill_style_circle_padding">16dp</dimen>
<dimen name="pointer_fill_style_circle_selected_offset">3dp</dimen>
<dimen name="pointer_fill_style_checkmark_selected_padding">14dp</dimen>
<dimen name="pointer_fill_style_checkmark_hovered_padding">17dp</dimen>
<dimen name="pointer_fill_style_shape_selected_stroke">2dp</dimen>
<dimen name="pointer_fill_style_shape_hovered_stroke">4dp</dimen>
<dimen name="pointer_stroke_style_padding">8dp</dimen>
<dimen name="pointer_stroke_style_text_padding">21dp</dimen>
<dimen name="pointer_scale_padding">8dp</dimen>
<item name="pointer_scale_size_start" format="float" type="dimen">1.0</item>
<item name="pointer_scale_size_end" format="float" type="dimen">2.5</item>
<!-- RemoteAuth-->
<dimen name="remoteauth_fragment_padding_horizontal">40dp</dimen>
@@ -293,6 +309,7 @@
<dimen name="contextual_card_side_margin">4dp</dimen>
<dimen name="contextual_card_icon_padding_start">14dp</dimen>
<dimen name="contextual_card_text_padding_start">16dp</dimen>
<dimen name="suggestion_card_text_padding_vertical">18dp</dimen>
<dimen name="contextual_card_padding_end">16dp</dimen>
<dimen name="contextual_card_corner_radius">@*android:dimen/config_dialogCornerRadius</dimen>
<dimen name="contextual_full_card_padding_end">12dp</dimen>
@@ -496,10 +513,23 @@
<dimen name="contrast_button_horizontal_spacing">16dp</dimen>
<dimen name="audio_streams_qrcode_size">264dp</dimen>
<dimen name="audio_streams_qrcode_preview_size">300dp</dimen>
<dimen name="audio_streams_qrcode_preview_radius">30dp</dimen>
<dimen name="audio_streams_qrcode_scanner_fragment_padding">16dp</dimen>
<!-- Zen Modes -->
<dimen name="zen_mode_icon_list_item_size">96dp</dimen>
<dimen name="zen_mode_icon_list_circle_diameter">56dp</dimen>
<dimen name="zen_mode_icon_list_icon_size">32dp</dimen>
<dimen name="zen_mode_header_size">136dp</dimen>
<dimen name="zen_mode_header_inner_icon_size">64dp</dimen>
<dimen name="zen_mode_blurb_text_size">16sp</dimen>
<dimen name="zen_mode_icon_list_header_circle_diameter">90dp</dimen>
<dimen name="zen_mode_icon_list_header_icon_size">48dp</dimen>
<dimen name="zen_mode_icon_list_item_size">76dp</dimen>
<dimen name="zen_mode_icon_list_item_circle_diameter">52dp</dimen>
<dimen name="zen_mode_icon_list_item_icon_size">28dp</dimen>
<!-- For the items in the CircularIconsPreference (contacts, apps, sound channels). -->
<dimen name="zen_mode_circular_icon_diameter">32dp</dimen>
<dimen name="zen_mode_circular_icon_inner_icon_size">20dp</dimen>
<dimen name="zen_mode_circular_icon_margin_between">4dp</dimen>
<dimen name="zen_mode_circular_icon_margin_vertical">8dp</dimen>
<dimen name="zen_mode_circular_icon_text_size">18dp</dimen>
</resources>

6
res/values/integers.xml
View File

@@ -36,4 +36,10 @@
<integer name="enrollment_progress_minimum_time_display">0</integer>
<!-- The time (in millis) to wait to collect messages in fingerprint enrollment before displaying it. -->
<integer name="enrollment_collect_time">0</integer>
<!-- PointerIcon Settings -->
<integer name="pointer_scale_seek_bar_start">0</integer>
<integer name="pointer_scale_seek_bar_end">3</integer>
<integer name="max_integer">2147483647</integer>
</resources>

1
res/values/menu_keys.xml
View File

@@ -24,6 +24,7 @@
<string name="menu_key_battery" translatable="false">top_level_battery</string>
<string name="menu_key_storage" translatable="false">top_level_storage</string>
<string name="menu_key_sound" translatable="false">top_level_sound</string>
<string name="menu_key_priority_modes" translatable="false">top_level_priority_modes</string>
<string name="menu_key_display" translatable="false">top_level_display</string>
<string name="menu_key_wallpaper" translatable="false">top_level_wallpaper</string>
<string name="menu_key_accessibility" translatable="false">top_level_accessibility</string>

874
res/values/strings.xml
View File

File diff suppressed because it is too large Load Diff

30
res/values/styles.xml
View File

@@ -957,11 +957,16 @@
<item name="biometricsEnrollProgressHelpWithTalkback">@color/udfps_enroll_progress_help_with_talkback</item>
</style>
<style name="ScreenLockPasswordHintTextFontStyle">
<style name="ScreenLockPasswordHintTextFontStyleError">
<item name="android:textColor">?android:attr/colorError</item>
<item name="android:fontFamily">google-sans-text</item>
</style>
<style name="ScreenLockPasswordHintTextFontStyle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-text</item>
</style>
<style name="PrivateSpaceSetupTextFontStyle" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">google-sans-text</item>
@@ -984,14 +989,15 @@
</style>
<style name="PrivateSpaceBulletPointTextFontStyle" parent="@style/PrivateSpaceSetupTextFontStyle">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textAlignment">viewStart</item>
</style>
<style name="PrivateSpaceBulletPointIconStyle">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_alignParentLeft">true</item>
<item name="android:layout_alignParentStart">true</item>
<item name="android:layout_alignParentTop">true</item>
</style>
@@ -1013,4 +1019,22 @@
<item name="android:background">@null</item>
</style>
<style name="SuggestionCardStyle">
<item name="cardBackgroundColor">@color/settingslib_materialColorPrimary</item>
<item name="cardCornerRadius">40dp</item>
<item name="cardElevation">0dp</item>
</style>
<style name="TextAppearance.SuggestionCardTitle">
<item name="android:textColor">@color/settingslib_materialColorOnPrimary</item>
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
<style name="TextAppearance.SuggestionCardSummary">
<item name="android:textColor">@color/settingslib_materialColorOnSecondary</item>
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
</resources>