diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 7 | ||||
| -rw-r--r-- | res/values/dimens.xml | 10 | ||||
| -rw-r--r-- | res/values/overlayable.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 14 | ||||
| -rw-r--r-- | res/values/styles.xml | 3 | ||||
| -rw-r--r-- | res/values/styles_text.xml | 32 | ||||
| -rw-r--r-- | res/values/themes.xml | 3 |
7 files changed, 53 insertions, 18 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index e00984ada..98287627e 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -42,14 +42,15 @@ <color name="shortcut_foreground">#ff3367d6</color> <color name="shortcut_background">#fff5f5f5</color> - <color name="briefcase_icon_color">#1A73E8</color> - <color name="cross_profile_button_text_color">#1A73E8</color> <color name="empty_state_text">#202124</color> <color name="error_image_color">#757575</color> - <color name="tab_indicator_color">#1A73E8</color> <!-- Blue 600 --> <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> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 07ee69526..3b326e136 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -89,8 +89,9 @@ <dimen name="root_info_header_height">60dp</dimen> <dimen name="root_info_header_horizontal_padding">24dp</dimen> - <dimen name="search_chip_group_margin">8dp</dimen> + <dimen name="search_chip_group_margin">20dp</dimen> <dimen name="search_chip_spacing">8dp</dimen> + <dimen name="search_chip_half_spacing">4dp</dimen> <dimen name="search_chip_icon_padding">4dp</dimen> <dimen name="search_chip_radius">16dp</dimen> @@ -110,15 +111,16 @@ <dimen name="apps_row_exit_icon_margin_bottom">6dp</dimen> <dimen name="apps_row_item_text_margin_horizontal">8dp</dimen> + <dimen name="search_bar_elevation">3dp</dimen> <dimen name="search_bar_radius">8dp</dimen> <dimen name="search_bar_background_margin_start">0dp</dimen> <dimen name="search_bar_background_margin_end">0dp</dimen> <dimen name="search_bar_margin">8dp</dimen> <dimen name="search_bar_text_size">16dp</dimen> + + <dimen name="action_bar_elevation">3dp</dimen> + <dimen name="action_bar_margin">1dp</dimen> <dimen name="action_bar_size">48dp</dimen> - <!--This value should equal actionBarSize + (2 x search_bar_margin)--> - <dimen name="action_bar_space_height">64dp</dimen> - <dimen name="action_bar_space_margin">@dimen/action_bar_space_height</dimen> <dimen name="action_mode_text_size">18sp</dimen> <dimen name="refresh_icon_range">64dp</dimen> diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml index 621de83d4..31b374757 100644 --- a/res/values/overlayable.xml +++ b/res/values/overlayable.xml @@ -40,6 +40,8 @@ <!-- START COLOR --> <item type="color" name="primary"/> + <item type="color" name="list_item_selected_background_color"/> + <item type="color" name="color_surface_header"/> <!-- END COLOR --> <!-- START DIMEN --> diff --git a/res/values/strings.xml b/res/values/strings.xml index 088e67266..85950899c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -15,6 +15,13 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + + <!-- Error when rename does not have any string--> + <string name="missing_rename_error">You need to rename this</string> + + <!-- Error to create new folder when name is not added --> + <string name="add_folder_name_error">You need to add a folder name</string> + <!-- Title of the Files application [CHAR LIMIT=32] --> <string name="files_label">Files</string> @@ -540,4 +547,11 @@ <!-- Snackbar shown when users drag and drop files from another app to DocumentsUI. [CHAR_LIMIT=100] --> <string name="drag_from_another_app">You can\u2019t move files from another app.</string> + + <!-- Accessibility announcement when switching to grid mode of files and directories shown. [CHAR_LIMIT=100] --> + <string name="grid_mode_showing">Showing in grid mode.</string> + + <!-- Accessibility announcement when switching to list mode of files and directories shown. [CHAR_LIMIT=100] --> + <string name="list_mode_showing">Showing in list mode.</string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 7b90d06dc..264f2b4e6 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -21,7 +21,7 @@ <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode"> <!-- attr "height" was used by support lib should not in overlay scope --> - <item name="height">@dimen/action_bar_space_height</item> + <item name="height">@dimen/action_bar_size</item> <item name="titleTextStyle">@style/ActionModeTitle</item> <item name="android:layout_margin">@dimen/search_bar_margin</item> </style> @@ -85,6 +85,7 @@ <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> </style> <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.TextButton"> diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml index 8b3273183..6c3805921 100644 --- a/res/values/styles_text.xml +++ b/res/values/styles_text.xml @@ -19,6 +19,13 @@ <item name="android:textSize">11sp</item> </style> + <style name="SectionHeader" parent="@*android:style/TextAppearance.DeviceDefault.Medium"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textAllCaps">true</item> + <item name="fontFamily">@string/config_fontFamilyMedium</item> + <item name="android:textSize">12sp</item> + </style> + <style name="SortList" parent="@style/TextAppearance.AppCompat.Subhead"> <item name="android:textColor">@color/sort_list_text</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> @@ -53,35 +60,36 @@ <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead"> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">14sp</item> + <item name="fontFamily">@string/config_fontFamily</item> </style> <style name="ActionModeTitle" parent="@style/ToolbarTitle"> <item name="android:textSize">@dimen/action_mode_text_size</item> </style> - <style name="ToolbarTitle" parent="@android:style/TextAppearance.Material.Title"> + <style name="ToolbarTitle" parent="@*android:style/TextAppearance.DeviceDefault.Title"> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="DrawerMenuTitle" parent="@android:style/TextAppearance.Material.Title"> + <style name="DrawerMenuTitle" parent="@*android:style/TextAppearance.DeviceDefault.Title"> <item name="android:textSize">24sp</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead"> + <style name="DrawerMenuHeader" parent="@*android:style/TextAppearance.DeviceDefault.Subhead"> <item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textAllCaps">true</item> <item name="android:textSize">11sp</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2"> + <style name="DrawerMenuPrimary" parent="*android:style/TextAppearance.DeviceDefault.Body2"> <item name="android:textSize">14sp</item> <item name="android:textColor">@color/item_root_primary_text</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2"> + <style name="DrawerMenuSecondary" parent="*android:style/TextAppearance.DeviceDefault.Body2"> <item name="android:textSize">12sp</item> <item name="android:textColor">@color/item_root_secondary_text</item> </style> @@ -96,7 +104,7 @@ </style> <style name="BreadcrumbText" parent="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"> - <item name="android:textColor">?android:attr/colorControlNormal</item> + <item name="android:textColor">@color/horizontal_breadcrumb_color</item> <item name="android:textSize">14sp</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> @@ -113,18 +121,24 @@ </style> <style name="EmptyStateButtonTextAppearance"> - <item name="android:textColor">@color/cross_profile_button_text_color</item> + <item name="android:textColor">?android:attr/colorAccent</item> <item name="android:textSize">14sp</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="TabTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Medium"> + <style name="TabTextAppearance" parent="@*android:style/TextAppearance.DeviceDefault.Medium"> <item name="android:textSize">14sp</item> <item name="fontFamily">@string/config_fontFamilyMedium</item> </style> - <style name="ItemDocListCaptionText" parent="@android:style/TextAppearance.Material.Caption"> + <style name="ItemCaptionText" parent="@*android:style/TextAppearance.DeviceDefault.Caption"> <item name="android:textColor">@color/doc_list_item_subtitle_color</item> + <item name="fontFamily">@string/config_fontFamily</item> + </style> + + <style name="MenuItemTextAppearance" parent="*android:style/TextAppearance.DeviceDefault.Body2"> + <item name="android:textSize">14sp</item> + <item name="fontFamily">@string/config_fontFamily</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 59ddec056..443374282 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -74,9 +74,10 @@ <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item> <item name="queryBackground">@color/menu_search_background</item> <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item> + <item name="android:itemTextAppearance">@style/MenuItemTextAppearance</item> </style> - <style name="TabTheme" parent="@style/Theme.MaterialComponents.DayNight"> + <style name="TabTheme" parent="@android:style/Theme.DeviceDefault.DayNight"> <item name="colorPrimary">@color/edge_effect</item> </style> </resources> |
