summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/color/fragment_pick_button_background_color.xml20
-rw-r--r--res/color/fragment_pick_button_text_color.xml20
-rw-r--r--res/layout/fragment_pick.xml2
-rw-r--r--res/values-night-v31/colors.xml19
-rw-r--r--res/values-night/colors.xml2
-rw-r--r--res/values-v31/colors.xml21
-rw-r--r--res/values-v31/styles.xml64
-rw-r--r--res/values/colors.xml100
8 files changed, 171 insertions, 77 deletions
diff --git a/res/color/fragment_pick_button_background_color.xml b/res/color/fragment_pick_button_background_color.xml
new file mode 100644
index 000000000..cf6d480ea
--- /dev/null
+++ b/res/color/fragment_pick_button_background_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/fragment_pick_active_button_color" android:state_enabled="true" />
+ <item android:color="@color/fragment_pick_inactive_button_color" android:state_enabled="false" />
+</selector> \ No newline at end of file
diff --git a/res/color/fragment_pick_button_text_color.xml b/res/color/fragment_pick_button_text_color.xml
new file mode 100644
index 000000000..e4e1edc48
--- /dev/null
+++ b/res/color/fragment_pick_button_text_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Copyright 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/fragment_pick_active_text_color" android:state_enabled="true" />
+ <item android:color="@color/fragment_pick_inactive_text_color" android:state_enabled="false" />
+</selector> \ No newline at end of file
diff --git a/res/layout/fragment_pick.xml b/res/layout/fragment_pick.xml
index c3446f494..cba4ecb9a 100644
--- a/res/layout/fragment_pick.xml
+++ b/res/layout/fragment_pick.xml
@@ -44,6 +44,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
+ android:backgroundTint="@color/fragment_pick_button_background_color"
+ android:textColor="@color/fragment_pick_button_text_color"
android:layout_marginEnd="4dp" />
<!-- Handles touch events when button1 is disabled. -->
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
index 684f36010..c5e4f6d90 100644
--- a/res/values-night-v31/colors.xml
+++ b/res/values-night-v31/colors.xml
@@ -18,9 +18,11 @@
<color name="work_profile_button_stroke_color">
@*android:color/system_accent1_200
</color> <!-- accent 200 -->
- <color name="empty_state_text_color">@*android:color/system_neutral1_100</color>
+ <color name="empty_state_text_color">@*android:color/system_neutral1_100
+ </color>
<!-- neutral 100 -->
- <color name="empty_state_message_text_color">@*android:color/system_neutral2_200
+ <color name="empty_state_message_text_color">
+ @*android:color/system_neutral2_200
</color>
<!-- neutral variant 200 -->
<color name="tab_unselected_text_color">@*android:color/system_neutral2_200
@@ -32,4 +34,17 @@
<color name="profile_tab_selected_color">@*android:color/system_neutral2_100
</color>
<!-- neutral variant 100 -->
+ <color name="fragment_pick_inactive_button_color">
+ @*android:color/system_neutral1_800
+ </color>
+ <!-- neutral 100 -->
+ <color name="fragment_pick_inactive_text_color">
+ @*android:color/system_neutral1_600
+ </color>
+ <!-- neutral 600 -->
+ <color name="fragment_pick_active_button_color">
+ @*android:color/system_neutral2_100
+ </color>
+ <!-- neutral variant 100 -->
+ <color name="fragment_pick_active_text_color">@android:color/black</color>
</resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index ad5920e56..143b3e693 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -33,4 +33,6 @@
<color name="list_divider_color">#9aa0a6</color>
<color name="list_item_selected_background_color">?android:colorSecondary</color>
+
+ <color name="fragment_pick_active_text_color">#202124</color> <!-- Grey 900 -->
</resources>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 13a5e06e3..a6820181d 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -23,9 +23,11 @@
<color name="work_profile_button_stroke_color">
@*android:color/system_accent1_600
</color> <!-- primary 600 -->
- <color name="empty_state_text_color">@*android:color/system_neutral1_900</color>
- <!-- neutral 900 -->
- <color name="empty_state_message_text_color">@*android:color/system_neutral2_700
+ <color name="empty_state_text_color">@*android:color/system_neutral1_900
+ </color>
+ <!-- neutral 900 -->
+ <color name="empty_state_message_text_color">
+ @*android:color/system_neutral2_700
</color>
<!-- neutral variant 700 -->
<color name="profile_tab_selected_color">@*android:color/system_accent1_100
@@ -34,4 +36,17 @@
<color name="profile_tab_default_color">@*android:color/system_neutral1_100
</color>
<!-- neutral 100 -->
+
+ <color name="fragment_pick_inactive_button_color">
+ @*android:color/system_neutral1_100
+ </color>
+ <!-- neutral 100 -->
+ <color name="fragment_pick_inactive_text_color">
+ @*android:color/system_neutral1_400
+ </color>
+ <!-- neutral 400 -->
+ <color name="fragment_pick_active_button_color">@*android:color/system_accent1_600
+ </color>
+ <!-- accent 600 -->
+ <color name="fragment_pick_active_text_color">@android:color/white</color>
</resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index eaaa2b998..ad2d98cdb 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -15,34 +15,46 @@
-->
<resources>
- <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
- <item name="android:textColor">?android:attr/textColorPrimary</item>
- <item name="fontFamily">@string/config_fontFamilyMedium</item>
- <item name="android:textSize">12sp</item>
- </style>
- <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
- <item name="colorControlNormal">?android:textColorSecondary</item>
- <item name="android:actionMenuTextColor">@*android:color/accent_device_default_light</item>
- <item name="android:textAllCaps">false</item>
- </style>
+ <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ <item name="fontFamily">@string/config_fontFamilyMedium</item>
+ <item name="android:textSize">12sp</item>
+ </style>
- <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
- <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
- <item name="android:backgroundTint">?android:colorAccent</item>
- </style>
+ <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+ <item name="colorControlNormal">?android:textColorSecondary</item>
+ <item name="android:actionMenuTextColor">
+ @*android:color/accent_device_default_light
+ </item>
+ <item name="android:textAllCaps">false</item>
+ </style>
- <style name="MaterialOutlinedButton"
- parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
- <item name="android:textAppearance">@style/MaterialButtonTextAppearance</item>
- <item name="android:backgroundTint">@android:color/white</item>
- <item name="android:textColor">?android:colorAccent</item>
- </style>
+ <style name="MaterialButton" parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
+ <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+ </item>
+ <item name="android:backgroundTint">?android:colorAccent</item>
+ </style>
- <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
- <item name="android:backgroundTint">@android:color/transparent</item>
- <item name="android:textColor">@*android:color/system_neutral1_900</item>
- <item name="android:textAllCaps">false</item>
- <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
- </style>
+ <style name="MaterialOutlinedButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+ <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+ </item>
+ <item name="android:backgroundTint">@android:color/white</item>
+ <item name="android:textColor">?android:colorAccent</item>
+ </style>
+
+ <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+ <item name="android:backgroundTint">@android:color/transparent</item>
+ <item name="android:textColor">@*android:color/system_neutral1_900</item>
+ <item name="android:textAllCaps">false</item>
+ <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance
+ </item>
+ </style>
+
+ <style name="DialogTextButton" parent="@style/Widget.MaterialComponents.Button.TextButton.Dialog">
+ <item name="android:textAppearance">@style/MaterialButtonTextAppearance
+ </item>
+ <item name="android:textColor">?android:attr/colorAccent</item>
+ <item name="android:backgroundTint">@android:color/transparent</item>
+ </style>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index aa4e01f14..12b8762aa 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,48 +14,57 @@
-->
<resources>
- <!-- This is the window background, but also the background for anything
- else that needs to manually declare a background matching the "default"
- app background (e.g. the drawer overlay). -->
-
- <color name="app_background_color">@android:color/white</color>
- <color name="background_floating">@android:color/white</color>
- <color name="nav_bar_translucent">#99FFFFFF</color>
-
- <color name="primary">#1E88E5</color> <!-- Blue 600 -->
- <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
- <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
-
- <color name="chip_background_disable_color">#fff1f3f4</color>
- <color name="menu_search_background">@android:color/transparent</color>
- <color name="item_breadcrumb_background_hovered">#1affffff</color>
- <color name="item_drag_shadow_background">@android:color/white</color>
- <color name="item_drag_shadow_container_background">@android:color/transparent</color>
- <color name="tool_bar_gradient_max">#7f000000</color>
-
- <color name="band_select_background">#88ffffff</color>
- <color name="band_select_border">#44000000</color>
-
- <color name="downloads_icon_background">#ff4688f2</color>
- <color name="app_icon_background">#ff4688f2</color>
- <color name="shortcut_foreground">#ff3367d6</color>
- <color name="shortcut_background">#fff5f5f5</color>
-
- <color name="empty_state_text_color">#202124</color>
- <color name="error_image_color">#757575</color>
-
- <color name="edge_effect">@android:color/black</color>
-
- <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
- <color name="doc_list_item_subtitle_disabled">#613c4043</color> <!-- 38% Grey800 -->
-
- <color name="list_divider_color">#1f000000</color>
- <color name="list_item_selected_background_color">?android:colorSecondary</color>
- <color name="color_surface_header">@color/app_background_color</color>
-
- <color name="tab_selected_text_color">@color/primary</color>
- <color name="work_profile_button_stroke_color">@color/primary</color>
- <color name="profile_tab_selected_color">?android:attr/colorAccent</color>
- <color name="profile_tab_default_color">#E0E0E0</color>
- <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->
+ <!-- This is the window background, but also the background for anything
+ else that needs to manually declare a background matching the "default"
+ app background (e.g. the drawer overlay). -->
+
+ <color name="app_background_color">@android:color/white</color>
+ <color name="background_floating">@android:color/white</color>
+ <color name="nav_bar_translucent">#99FFFFFF</color>
+
+ <color name="primary">#1E88E5</color> <!-- Blue 600 -->
+ <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
+ <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+
+ <color name="chip_background_disable_color">#fff1f3f4</color>
+ <color name="menu_search_background">@android:color/transparent</color>
+ <color name="item_breadcrumb_background_hovered">#1affffff</color>
+ <color name="item_drag_shadow_background">@android:color/white</color>
+ <color name="item_drag_shadow_container_background">
+ @android:color/transparent
+ </color>
+ <color name="tool_bar_gradient_max">#7f000000</color>
+
+ <color name="band_select_background">#88ffffff</color>
+ <color name="band_select_border">#44000000</color>
+
+ <color name="downloads_icon_background">#ff4688f2</color>
+ <color name="app_icon_background">#ff4688f2</color>
+ <color name="shortcut_foreground">#ff3367d6</color>
+ <color name="shortcut_background">#fff5f5f5</color>
+
+ <color name="empty_state_text_color">#202124</color>
+ <color name="error_image_color">#757575</color>
+
+ <color name="edge_effect">@android:color/black</color>
+
+ <color name="doc_list_item_subtitle_enabled">#5F6368</color> <!-- Gray 700 -->
+ <color name="doc_list_item_subtitle_disabled">#613c4043
+ </color> <!-- 38% Grey800 -->
+
+ <color name="list_divider_color">#1f000000</color>
+ <color name="list_item_selected_background_color">?android:colorSecondary
+ </color>
+ <color name="color_surface_header">@color/app_background_color</color>
+
+ <color name="tab_selected_text_color">@color/primary</color>
+ <color name="work_profile_button_stroke_color">@color/primary</color>
+ <color name="profile_tab_selected_color">?android:attr/colorAccent</color>
+ <color name="profile_tab_default_color">#E0E0E0</color>
+ <color name="tab_unselected_text_color">#5F6368</color> <!-- Gray 700 -->
+
+ <color name="fragment_pick_inactive_button_color">#E0E0E0</color>
+ <color name="fragment_pick_inactive_text_color">#5F6368</color>
+ <color name="fragment_pick_active_button_color">@color/primary</color>
+ <color name="fragment_pick_active_text_color">@android:color/white</color>
</resources>
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-10-19 20:43:00 +0000