From 712b18d461875e13581df50c2715c870c61ab584 Mon Sep 17 00:00:00 2001 From: Edgar Wang Date: Tue, 19 Oct 2021 01:28:26 +0800 Subject: [PATCH] Create TAB layout Material You style Bug: 193249384 Test: manual Change-Id: I84ebd87e89c5c8ed6a1a2c9c057efb9cafbccfe8 --- packages/SettingsLib/Android.bp | 1 + .../res/values-night-v31/colors.xml | 6 ++- .../SettingsTheme/res/values-v31/colors.xml | 7 ++++ .../settingslib_tabs_indicator_color.xml | 19 +++++++++ .../settingslib_tabs_text_color.xml | 21 ++++++++++ .../settingslib_tabs_indicator_color.xml | 19 +++++++++ .../color-v31/settingslib_tabs_text_color.xml | 21 ++++++++++ .../settingslib_tabs_background.xml | 40 +++++++++++++++++++ .../settingslib_tabs_indicator_background.xml | 24 +++++++++++ .../SettingsLib/res/values-v31/styles.xml | 39 ++++++++++++++++++ 10 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 packages/SettingsLib/res/color-night-v31/settingslib_tabs_indicator_color.xml create mode 100644 packages/SettingsLib/res/color-night-v31/settingslib_tabs_text_color.xml create mode 100644 packages/SettingsLib/res/color-v31/settingslib_tabs_indicator_color.xml create mode 100644 packages/SettingsLib/res/color-v31/settingslib_tabs_text_color.xml create mode 100644 packages/SettingsLib/res/drawable-v31/settingslib_tabs_background.xml create mode 100644 packages/SettingsLib/res/drawable-v31/settingslib_tabs_indicator_background.xml create mode 100644 packages/SettingsLib/res/values-v31/styles.xml diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index 7a5ea472b5326..1b7298a332ded 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -19,6 +19,7 @@ android_library { "androidx.appcompat_appcompat", "androidx.lifecycle_lifecycle-runtime", "androidx.mediarouter_mediarouter-nodeps", + "com.google.android.material_material", "iconloader", "WifiTrackerLibRes", diff --git a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml index 77c4533b9f463..5e3907caf8608 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-night-v31/colors.xml @@ -31,7 +31,7 @@ @android:color/system_accent1_100 - @android:color/system_neutral1_800 + @color/settingslib_surface_dark #f28b82 @@ -49,4 +49,8 @@ @android:color/system_accent1_100 @color/settingslib_material_grey_900 + + @android:color/system_neutral1_800 + + @color/settingslib_surface_dark \ No newline at end of file diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml index 6adb7899fcc50..c4dbc5edbe79b 100644 --- a/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml +++ b/packages/SettingsLib/SettingsTheme/res/values-v31/colors.xml @@ -71,5 +71,12 @@ @android:color/system_accent1_600 ?android:attr/colorControlHighlight + #ff212121 + + @color/settingslib_accent_primary_device_default + + @color/settingslib_accent_secondary_device_default + + @color/settingslib_surface_light diff --git a/packages/SettingsLib/res/color-night-v31/settingslib_tabs_indicator_color.xml b/packages/SettingsLib/res/color-night-v31/settingslib_tabs_indicator_color.xml new file mode 100644 index 0000000000000..9a093601a92ca --- /dev/null +++ b/packages/SettingsLib/res/color-night-v31/settingslib_tabs_indicator_color.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/res/color-night-v31/settingslib_tabs_text_color.xml b/packages/SettingsLib/res/color-night-v31/settingslib_tabs_text_color.xml new file mode 100644 index 0000000000000..33f96df8d5b5b --- /dev/null +++ b/packages/SettingsLib/res/color-night-v31/settingslib_tabs_text_color.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/res/color-v31/settingslib_tabs_indicator_color.xml b/packages/SettingsLib/res/color-v31/settingslib_tabs_indicator_color.xml new file mode 100644 index 0000000000000..57fef52f15bd9 --- /dev/null +++ b/packages/SettingsLib/res/color-v31/settingslib_tabs_indicator_color.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/res/color-v31/settingslib_tabs_text_color.xml b/packages/SettingsLib/res/color-v31/settingslib_tabs_text_color.xml new file mode 100644 index 0000000000000..df2346d7175e9 --- /dev/null +++ b/packages/SettingsLib/res/color-v31/settingslib_tabs_text_color.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/res/drawable-v31/settingslib_tabs_background.xml b/packages/SettingsLib/res/drawable-v31/settingslib_tabs_background.xml new file mode 100644 index 0000000000000..f10b56315546a --- /dev/null +++ b/packages/SettingsLib/res/drawable-v31/settingslib_tabs_background.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SettingsLib/res/drawable-v31/settingslib_tabs_indicator_background.xml b/packages/SettingsLib/res/drawable-v31/settingslib_tabs_indicator_background.xml new file mode 100644 index 0000000000000..f5a97825870c7 --- /dev/null +++ b/packages/SettingsLib/res/drawable-v31/settingslib_tabs_indicator_background.xml @@ -0,0 +1,24 @@ + + + + + + + + \ No newline at end of file diff --git a/packages/SettingsLib/res/values-v31/styles.xml b/packages/SettingsLib/res/values-v31/styles.xml new file mode 100644 index 0000000000000..343de2cdf47a7 --- /dev/null +++ b/packages/SettingsLib/res/values-v31/styles.xml @@ -0,0 +1,39 @@ + + + + + + + \ No newline at end of file