diff options
| -rw-r--r-- | packages/SettingsLib/ActionButtonsPreference/res/layout-v36/settingslib_expressive_action_buttons.xml (renamed from packages/SettingsLib/ActionButtonsPreference/res/layout-v35/settingslib_expressive_action_buttons.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ActionButtonsPreference/res/values-v36/styles_expressive.xml (renamed from packages/SettingsLib/ActionButtonsPreference/res/values-v35/styles_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_expressive_card_background.xml (renamed from packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_expressive_card_background.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_resolved_banner_avd.xml (renamed from packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_resolved_banner_avd.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/BannerMessagePreference/res/layout-v36/settingslib_expressive_banner_message.xml (renamed from packages/SettingsLib/BannerMessagePreference/res/layout-v35/settingslib_expressive_banner_message.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/BannerMessagePreference/res/values-v36/styles_expressive.xml (renamed from packages/SettingsLib/BannerMessagePreference/res/values-v35/styles_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_extra.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_extra.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_large.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_large.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_extra.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_extra.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_large.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_large.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_extra.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_extra.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_large.xml (renamed from packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_large.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v35/settingslib_expressive_icon_back.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_base_layout.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_base_layout.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_content_layout.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v36/themes.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_expressive.xml (renamed from packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/MainSwitchPreference/res/color-night-v36/settingslib_main_switch_text_color.xml (renamed from packages/SettingsLib/MainSwitchPreference/res/color-night-v35/settingslib_main_switch_text_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/MainSwitchPreference/res/color-v36/settingslib_main_switch_text_color.xml (renamed from packages/SettingsLib/MainSwitchPreference/res/color-v35/settingslib_main_switch_text_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/MainSwitchPreference/res/drawable-v36/settingslib_expressive_switch_bar_bg.xml (renamed from packages/SettingsLib/MainSwitchPreference/res/drawable-v35/settingslib_expressive_switch_bar_bg.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_bar.xml (renamed from packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_bar.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_layout.xml (renamed from packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_layout.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/ProfileSelector/res/color-night-v36/settingslib_tabs_indicator_color.xml (renamed from packages/SettingsLib/ProfileSelector/res/color-night-v35/settingslib_tabs_indicator_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-night-v36/settingslib_switch_track_outline_color.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-night-v35/settingslib_switch_track_outline_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_expressive_color_main_switch_track.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_expressive_color_main_switch_track.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_preference_bg_color.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_preference_bg_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_switch_track_outline_color.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_switch_track_outline_color.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_primary.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_primary.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_secondary.xml (renamed from packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_secondary.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_arrow_drop_down.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_arrow_drop_down.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_list_divider.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_list_divider.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_progress_horizontal.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_progress_horizontal.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_highlighted.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_selected.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_selected.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_highlighted.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_selected.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_selected.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_highlighted.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_selected.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_selected.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_highlighted.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_selected.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_selected.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_background.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_background.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_dropdown_background.xml (renamed from packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_dropdown_background.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference.xml (renamed from packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_icon_frame.xml (renamed from packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_icon_frame.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_switch.xml (renamed from packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_switch.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_two_target_divider.xml (renamed from packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_two_target_divider.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/dimens.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/styles_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/styles_preference_expressive.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/styles_preference_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/themes.xml) | 4 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/themes_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/SettingsTheme/res/values-v36/themes_preference_expressive.xml (renamed from packages/SettingsLib/SettingsTheme/res/values-v35/themes_preference_expressive.xml) | 0 | ||||
| -rw-r--r-- | packages/SettingsLib/TwoTargetPreference/res/layout-v36/settingslib_expressive_preference_two_target.xml (renamed from packages/SettingsLib/TwoTargetPreference/res/layout-v35/settingslib_expressive_preference_two_target.xml) | 0 |
65 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsLib/ActionButtonsPreference/res/layout-v35/settingslib_expressive_action_buttons.xml b/packages/SettingsLib/ActionButtonsPreference/res/layout-v36/settingslib_expressive_action_buttons.xml index 3e73ebd4880e..3e73ebd4880e 100644 --- a/packages/SettingsLib/ActionButtonsPreference/res/layout-v35/settingslib_expressive_action_buttons.xml +++ b/packages/SettingsLib/ActionButtonsPreference/res/layout-v36/settingslib_expressive_action_buttons.xml diff --git a/packages/SettingsLib/ActionButtonsPreference/res/values-v35/styles_expressive.xml b/packages/SettingsLib/ActionButtonsPreference/res/values-v36/styles_expressive.xml index 267c9f65e104..267c9f65e104 100644 --- a/packages/SettingsLib/ActionButtonsPreference/res/values-v35/styles_expressive.xml +++ b/packages/SettingsLib/ActionButtonsPreference/res/values-v36/styles_expressive.xml diff --git a/packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_expressive_card_background.xml b/packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_expressive_card_background.xml index a677a66f86e7..a677a66f86e7 100644 --- a/packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_expressive_card_background.xml +++ b/packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_expressive_card_background.xml diff --git a/packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_resolved_banner_avd.xml b/packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_resolved_banner_avd.xml index c999de7d99ea..c999de7d99ea 100644 --- a/packages/SettingsLib/BannerMessagePreference/res/drawable-v35/settingslib_resolved_banner_avd.xml +++ b/packages/SettingsLib/BannerMessagePreference/res/drawable-v36/settingslib_resolved_banner_avd.xml diff --git a/packages/SettingsLib/BannerMessagePreference/res/layout-v35/settingslib_expressive_banner_message.xml b/packages/SettingsLib/BannerMessagePreference/res/layout-v36/settingslib_expressive_banner_message.xml index c448a2d434f8..c448a2d434f8 100644 --- a/packages/SettingsLib/BannerMessagePreference/res/layout-v35/settingslib_expressive_banner_message.xml +++ b/packages/SettingsLib/BannerMessagePreference/res/layout-v36/settingslib_expressive_banner_message.xml diff --git a/packages/SettingsLib/BannerMessagePreference/res/values-v35/styles_expressive.xml b/packages/SettingsLib/BannerMessagePreference/res/values-v36/styles_expressive.xml index 09e07ccef683..09e07ccef683 100644 --- a/packages/SettingsLib/BannerMessagePreference/res/values-v35/styles_expressive.xml +++ b/packages/SettingsLib/BannerMessagePreference/res/values-v36/styles_expressive.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled.xml index ff22b2e7f86f..ff22b2e7f86f 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_extra.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_extra.xml index d878ba0d310b..d878ba0d310b 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_extra.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_extra.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_large.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_large.xml index 8f0a158c55eb..8f0a158c55eb 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_filled_large.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_filled_large.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline.xml index 0c8996063e9f..0c8996063e9f 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_extra.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_extra.xml index 41d8490feeb3..41d8490feeb3 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_extra.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_extra.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_large.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_large.xml index 958552064c98..958552064c98 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_outline_large.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_outline_large.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal.xml index 03ca1f0a1033..03ca1f0a1033 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_extra.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_extra.xml index 030ee66fef3f..030ee66fef3f 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_extra.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_extra.xml diff --git a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_large.xml b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_large.xml index 5c16723f7a63..5c16723f7a63 100644 --- a/packages/SettingsLib/ButtonPreference/res/layout-v35/settingslib_expressive_button_tonal_large.xml +++ b/packages/SettingsLib/ButtonPreference/res/layout-v36/settingslib_expressive_button_tonal_large.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v35/settingslib_expressive_icon_back.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml index 9986a60250fe..9986a60250fe 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v35/settingslib_expressive_icon_back.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/drawable-v36/settingslib_expressive_icon_back.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_base_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_base_layout.xml index b881c57e2f53..b881c57e2f53 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_base_layout.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_base_layout.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_content_layout.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml index 6221659388d1..6221659388d1 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v35/settingslib_expressive_collapsing_toolbar_content_layout.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/layout-v36/settingslib_expressive_collapsing_toolbar_content_layout.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v36/themes.xml index fadcf7ba8699..fadcf7ba8699 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v35/themes.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-night-v36/themes.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles.xml index 0f71a788e8c6..0f71a788e8c6 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles_expressive.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml index 37a78101cc4e..37a78101cc4e 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/styles_expressive.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/styles_expressive.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes.xml index 7c9d1a47b7ef..7c9d1a47b7ef 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes.xml diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes_expressive.xml b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_expressive.xml index ca1904a15b2f..ca1904a15b2f 100644 --- a/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v35/themes_expressive.xml +++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/res/values-v36/themes_expressive.xml diff --git a/packages/SettingsLib/MainSwitchPreference/res/color-night-v35/settingslib_main_switch_text_color.xml b/packages/SettingsLib/MainSwitchPreference/res/color-night-v36/settingslib_main_switch_text_color.xml index ea15a67e93cd..ea15a67e93cd 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/color-night-v35/settingslib_main_switch_text_color.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/color-night-v36/settingslib_main_switch_text_color.xml diff --git a/packages/SettingsLib/MainSwitchPreference/res/color-v35/settingslib_main_switch_text_color.xml b/packages/SettingsLib/MainSwitchPreference/res/color-v36/settingslib_main_switch_text_color.xml index ea15a67e93cd..ea15a67e93cd 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/color-v35/settingslib_main_switch_text_color.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/color-v36/settingslib_main_switch_text_color.xml diff --git a/packages/SettingsLib/MainSwitchPreference/res/drawable-v35/settingslib_expressive_switch_bar_bg.xml b/packages/SettingsLib/MainSwitchPreference/res/drawable-v36/settingslib_expressive_switch_bar_bg.xml index 3999e762ea9e..3999e762ea9e 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/drawable-v35/settingslib_expressive_switch_bar_bg.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/drawable-v36/settingslib_expressive_switch_bar_bg.xml diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_bar.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_bar.xml index f75d9b23c49b..f75d9b23c49b 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_bar.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_bar.xml diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_layout.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_layout.xml index 94c6924a02f2..94c6924a02f2 100644 --- a/packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_layout.xml +++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v36/settingslib_expressive_main_switch_layout.xml diff --git a/packages/SettingsLib/ProfileSelector/res/color-night-v35/settingslib_tabs_indicator_color.xml b/packages/SettingsLib/ProfileSelector/res/color-night-v36/settingslib_tabs_indicator_color.xml index 5192a9a53572..5192a9a53572 100644 --- a/packages/SettingsLib/ProfileSelector/res/color-night-v35/settingslib_tabs_indicator_color.xml +++ b/packages/SettingsLib/ProfileSelector/res/color-night-v36/settingslib_tabs_indicator_color.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-night-v35/settingslib_switch_track_outline_color.xml b/packages/SettingsLib/SettingsTheme/res/color-night-v36/settingslib_switch_track_outline_color.xml index eedc364ff54b..eedc364ff54b 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-night-v35/settingslib_switch_track_outline_color.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-night-v36/settingslib_switch_track_outline_color.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_expressive_color_main_switch_track.xml b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_expressive_color_main_switch_track.xml index a6885a4ac358..a6885a4ac358 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_expressive_color_main_switch_track.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_expressive_color_main_switch_track.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_preference_bg_color.xml b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_preference_bg_color.xml index cece9665b729..cece9665b729 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_preference_bg_color.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_preference_bg_color.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_switch_track_outline_color.xml b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_switch_track_outline_color.xml index eedc364ff54b..eedc364ff54b 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_switch_track_outline_color.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_switch_track_outline_color.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_primary.xml b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_primary.xml index 230eb7d30aea..230eb7d30aea 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_primary.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_primary.xml diff --git a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_secondary.xml b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_secondary.xml index 5bd2a29ccf9a..5bd2a29ccf9a 100644 --- a/packages/SettingsLib/SettingsTheme/res/color-v35/settingslib_text_color_secondary.xml +++ b/packages/SettingsLib/SettingsTheme/res/color-v36/settingslib_text_color_secondary.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_arrow_drop_down.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_arrow_drop_down.xml index 875524775a3c..875524775a3c 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_arrow_drop_down.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_arrow_drop_down.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_list_divider.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_list_divider.xml index c17f7ee8c61e..c17f7ee8c61e 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_list_divider.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_list_divider.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_progress_horizontal.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_progress_horizontal.xml index 3cb34354de17..3cb34354de17 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_progress_horizontal.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_progress_horizontal.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml index 9aa0bc39c5d8..9aa0bc39c5d8 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml index 554cba565383..554cba565383 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_highlighted.xml index c0c08699cc2a..c0c08699cc2a 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_highlighted.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_highlighted.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_selected.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_selected.xml index 543b237373fb..543b237373fb 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_bottom_selected.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_bottom_selected.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml index b89a0ddcdec5..b89a0ddcdec5 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_highlighted.xml index 8099d9b3d7f7..8099d9b3d7f7 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_highlighted.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_highlighted.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_selected.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_selected.xml index 6d2cd1a51620..6d2cd1a51620 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_center_selected.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_center_selected.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_highlighted.xml index a119a4ae083f..a119a4ae083f 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_highlighted.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_highlighted.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_selected.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_selected.xml index bcdbf1d19545..bcdbf1d19545 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_selected.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_selected.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top.xml index 7955e4418ae9..7955e4418ae9 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_highlighted.xml index 052eb01cab8d..052eb01cab8d 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_highlighted.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_highlighted.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_selected.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_selected.xml index d4b658c384e6..d4b658c384e6 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_round_background_top_selected.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_round_background_top_selected.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_background.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_background.xml index 20ee38190b01..20ee38190b01 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_background.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_background.xml diff --git a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_dropdown_background.xml b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_dropdown_background.xml index b287c3bb546f..b287c3bb546f 100644 --- a/packages/SettingsLib/SettingsTheme/res/drawable-v35/settingslib_spinner_dropdown_background.xml +++ b/packages/SettingsLib/SettingsTheme/res/drawable-v36/settingslib_spinner_dropdown_background.xml diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference.xml b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference.xml index 4ef747a99b49..4ef747a99b49 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference.xml diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_icon_frame.xml b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_icon_frame.xml index 19818e0b06da..19818e0b06da 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_icon_frame.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_icon_frame.xml diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_switch.xml b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_switch.xml index 4abcd22d67cc..4abcd22d67cc 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_preference_switch.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_switch.xml diff --git a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_two_target_divider.xml b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_two_target_divider.xml index 9be9ec331984..9be9ec331984 100644 --- a/packages/SettingsLib/SettingsTheme/res/layout-v35/settingslib_expressive_two_target_divider.xml +++ b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_two_target_divider.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml index e31e80176625..e31e80176625 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-night-v35/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-night-v36/colors.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml index b1b37b12c572..b1b37b12c572 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/colors.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/dimens.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml index 193ae618e803..193ae618e803 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/dimens.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/dimens.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/styles_expressive.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml index 3af88c48e8ca..3af88c48e8ca 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/styles_expressive.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/styles_expressive.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/styles_preference_expressive.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/styles_preference_expressive.xml index cec8e45e2bfb..cec8e45e2bfb 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/styles_preference_expressive.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/styles_preference_expressive.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/themes.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml index b6e80c784f10..1c45ff6ca6cf 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/themes.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/themes.xml @@ -16,7 +16,7 @@ --> <resources> - <style name="Theme.SettingsBase_v35" parent="Theme.SettingsBase_v33" > + <style name="Theme.SettingsBase_v36" parent="Theme.SettingsBase_v33" > <item name="android:colorAccent">@color/settingslib_materialColorPrimary</item> <item name="android:colorBackground">@color/settingslib_materialColorSurfaceContainer</item> <item name="android:textColorPrimary">@color/settingslib_materialColorOnSurface</item> @@ -27,5 +27,5 @@ <item name="android:clipChildren">false</item> </style> - <style name="Theme.SettingsBase" parent="Theme.SettingsBase_v35" /> + <style name="Theme.SettingsBase" parent="Theme.SettingsBase_v36" /> </resources>
\ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/themes_expressive.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml index 14f214a96435..14f214a96435 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/themes_expressive.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_expressive.xml diff --git a/packages/SettingsLib/SettingsTheme/res/values-v35/themes_preference_expressive.xml b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_preference_expressive.xml index 41fe2250f0ad..41fe2250f0ad 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v35/themes_preference_expressive.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v36/themes_preference_expressive.xml diff --git a/packages/SettingsLib/TwoTargetPreference/res/layout-v35/settingslib_expressive_preference_two_target.xml b/packages/SettingsLib/TwoTargetPreference/res/layout-v36/settingslib_expressive_preference_two_target.xml index 4347ef29037d..4347ef29037d 100644 --- a/packages/SettingsLib/TwoTargetPreference/res/layout-v35/settingslib_expressive_preference_two_target.xml +++ b/packages/SettingsLib/TwoTargetPreference/res/layout-v36/settingslib_expressive_preference_two_target.xml |