diff options
| author | 2021-03-22 20:25:24 -0700 | |
|---|---|---|
| committer | 2021-03-22 20:25:24 -0700 | |
| commit | 0652bd13b6b408364f602209a29c20d91590aa13 (patch) | |
| tree | 10b4d57cce41154a12998742b2a837863bdcbe57 | |
| parent | 358a76f7e489c8af53a1b59e6d86ccafe887083a (diff) | |
Update share sheet with NEXT style
- made backgrounds lighter (colorBackground)
- removed shadows from buttons
- updated tint colors on buttons
- updated button background colors
Bug: 181994925
Test: visual
Change-Id: I74938594e4192553f616897218affefaa0575651
| -rw-r--r-- | core/res/res/drawable/bottomsheet_background.xml | 2 | ||||
| -rw-r--r-- | core/res/res/drawable/chooser_action_button_bg.xml | 8 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_action_button.xml | 3 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid.xml | 4 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid_preview_file.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid_preview_image.xml | 4 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_grid_preview_text.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/chooser_list_per_profile.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_empty_states.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list.xml | 12 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list_per_profile.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/resolver_list_with_default.xml | 10 | ||||
| -rw-r--r-- | core/res/res/values-night/colors.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 1 |
14 files changed, 26 insertions, 29 deletions
diff --git a/core/res/res/drawable/bottomsheet_background.xml b/core/res/res/drawable/bottomsheet_background.xml index 3a8ad71187a0..00d53004c9dc 100644 --- a/core/res/res/drawable/bottomsheet_background.xml +++ b/core/res/res/drawable/bottomsheet_background.xml @@ -18,5 +18,5 @@ <corners android:topLeftRadius="@dimen/config_bottomDialogCornerRadius" android:topRightRadius="@dimen/config_bottomDialogCornerRadius"/> - <solid android:color="?attr/colorBackgroundFloating" /> + <solid android:color="?attr/colorBackground" /> </shape> diff --git a/core/res/res/drawable/chooser_action_button_bg.xml b/core/res/res/drawable/chooser_action_button_bg.xml index 0dd9e9c7cd98..18bbd93d1535 100644 --- a/core/res/res/drawable/chooser_action_button_bg.xml +++ b/core/res/res/drawable/chooser_action_button_bg.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> <ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/lighter_gray"> + android:color="?android:attr/colorControlHighlight"> <item> <inset android:insetLeft="0dp" @@ -23,10 +23,8 @@ android:insetRight="0dp" android:insetBottom="8dp"> <shape android:shape="rectangle"> - <corners android:radius="16dp"></corners> - <stroke android:width="1dp" - android:color="?attr/opacityListDivider" /> - <solid android:color="?attr/colorBackgroundFloating" /> + <corners android:radius="16dp" /> + <solid android:color="@color/system_neutral2_100" /> </shape> </inset> </item> diff --git a/core/res/res/layout/chooser_action_button.xml b/core/res/res/layout/chooser_action_button.xml index 6af7937960f0..16ffaa4b90ca 100644 --- a/core/res/res/layout/chooser_action_button.xml +++ b/core/res/res/layout/chooser_action_button.xml @@ -25,6 +25,7 @@ android:singleLine="true" android:clickable="true" android:background="@drawable/chooser_action_button_bg" - android:drawableTint="@color/chooser_chip_icon" + android:drawableTint="?android:textColorPrimary" android:drawableTintMode="src_in" + style="?android:attr/borderlessButtonStyle" /> diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml index c0de6936dd12..10683b189fc5 100644 --- a/core/res/res/layout/chooser_grid.xml +++ b/core/res/res/layout/chooser_grid.xml @@ -67,7 +67,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" @@ -84,7 +84,7 @@ android:layout_alwaysShow="true" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical" /> <FrameLayout android:id="@android:id/tabcontent" diff --git a/core/res/res/layout/chooser_grid_preview_file.xml b/core/res/res/layout/chooser_grid_preview_file.xml index 2a39215a4bd8..d8c1d1782834 100644 --- a/core/res/res/layout/chooser_grid_preview_file.xml +++ b/core/res/res/layout/chooser_grid_preview_file.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingBottom="@dimen/chooser_view_spacing" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <LinearLayout android:layout_width="@dimen/chooser_preview_width" diff --git a/core/res/res/layout/chooser_grid_preview_image.xml b/core/res/res/layout/chooser_grid_preview_image.xml index 62df1650612a..0d04d7f319b8 100644 --- a/core/res/res/layout/chooser_grid_preview_image.xml +++ b/core/res/res/layout/chooser_grid_preview_image.xml @@ -22,14 +22,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <RelativeLayout android:id="@+id/content_preview_image_area" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:paddingBottom="@dimen/chooser_view_spacing" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" android:id="@+id/content_preview_image_1_large" diff --git a/core/res/res/layout/chooser_grid_preview_text.xml b/core/res/res/layout/chooser_grid_preview_text.xml index 1d18648b9ef7..bc4f327d7a15 100644 --- a/core/res/res/layout/chooser_grid_preview_text.xml +++ b/core/res/res/layout/chooser_grid_preview_text.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:background="?android:attr/colorBackgroundFloating"> + android:background="?android:attr/colorBackground"> <RelativeLayout android:layout_width="@dimen/chooser_preview_width" diff --git a/core/res/res/layout/chooser_list_per_profile.xml b/core/res/res/layout/chooser_list_per_profile.xml index 86dc71cbbfb8..912173cc725b 100644 --- a/core/res/res/layout/chooser_list_per_profile.xml +++ b/core/res/res/layout/chooser_list_per_profile.xml @@ -23,7 +23,7 @@ android:layoutManager="com.android.internal.app.ChooserGridLayoutManager" android:id="@+id/resolver_list" android:clipToPadding="false" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:scrollbars="none" android:elevation="1dp" android:nestedScrollingEnabled="true" /> diff --git a/core/res/res/layout/resolver_empty_states.xml b/core/res/res/layout/resolver_empty_states.xml index bdcfeb21598a..8594c33c3082 100644 --- a/core/res/res/layout/resolver_empty_states.xml +++ b/core/res/res/layout/resolver_empty_states.xml @@ -84,7 +84,7 @@ <TextView android:id="@+id/empty" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:text="@string/noApplications" android:padding="@dimen/chooser_edge_margin_normal" android:layout_marginBottom="56dp" diff --git a/core/res/res/layout/resolver_list.xml b/core/res/res/layout/resolver_list.xml index 6fde1dfe248e..d791598a3552 100644 --- a/core/res/res/layout/resolver_list.xml +++ b/core/res/res/layout/resolver_list.xml @@ -68,7 +68,7 @@ android:layout_alwaysShow="true" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical" /> <FrameLayout @@ -76,7 +76,7 @@ android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorBackgroundFloating"/> + android:background="?attr/colorBackground"/> <TabHost android:id="@+id/profile_tabhost" @@ -85,7 +85,7 @@ android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:accessibilityTraversalAfter="@id/title" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" @@ -101,7 +101,7 @@ android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical"/> <FrameLayout android:id="@android:id/tabcontent" @@ -120,13 +120,13 @@ android:layout_height="wrap_content" android:layout_alwaysShow="true" android:orientation="vertical" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:layout_ignoreOffset="true"> <View android:id="@+id/resolver_button_bar_divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical" /> <LinearLayout android:id="@+id/button_bar" diff --git a/core/res/res/layout/resolver_list_per_profile.xml b/core/res/res/layout/resolver_list_per_profile.xml index 9410301e40fc..d6ca7abdca71 100644 --- a/core/res/res/layout/resolver_list_per_profile.xml +++ b/core/res/res/layout/resolver_list_per_profile.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:id="@+id/resolver_list" android:clipToPadding="false" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:elevation="@dimen/resolver_elevation" android:nestedScrollingEnabled="true" android:scrollbarStyle="outsideOverlay" diff --git a/core/res/res/layout/resolver_list_with_default.xml b/core/res/res/layout/resolver_list_with_default.xml index 4a5aa020fb9f..7610e732ed06 100644 --- a/core/res/res/layout/resolver_list_with_default.xml +++ b/core/res/res/layout/resolver_list_with_default.xml @@ -148,7 +148,7 @@ android:layout_alwaysShow="true" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical" /> <FrameLayout @@ -157,7 +157,7 @@ android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/colorBackgroundFloating"/> + android:background="?attr/colorBackground"/> <TabHost android:layout_alwaysShow="true" @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:background="?attr/colorBackgroundFloating"> + android:background="?attr/colorBackground"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" @@ -182,7 +182,7 @@ android:visibility="gone" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical"/> <FrameLayout android:id="@android:id/tabcontent" @@ -200,6 +200,6 @@ android:layout_alwaysShow="true" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?attr/colorBackgroundFloating" + android:background="?attr/colorBackground" android:foreground="?attr/dividerVertical" /> </com.android.internal.widget.ResolverDrawerLayout> diff --git a/core/res/res/values-night/colors.xml b/core/res/res/values-night/colors.xml index 4410e944db39..baffa5a82cdb 100644 --- a/core/res/res/values-night/colors.xml +++ b/core/res/res/values-night/colors.xml @@ -36,7 +36,6 @@ <color name="resolver_empty_state_text">#FFFFFF</color> <color name="resolver_empty_state_icon">#FFFFFF</color> - <color name="chooser_chip_icon">#8AB4F8</color> <!-- Blue 300 --> <color name="personal_apps_suspension_notification_color">#8AB4F8</color> </resources> diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 91896febc571..7dce38630618 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -237,7 +237,6 @@ <color name="resolver_text_color_secondary_dark">#ffC4C6C6</color> <color name="resolver_empty_state_text">#FF202124</color> <color name="resolver_empty_state_icon">#FF5F6368</color> - <color name="chooser_chip_icon">#FF1A73E8</color> <!-- Blue 600 --> <!-- Color for personal app suspension notification button text and icon tint. --> <color name="personal_apps_suspension_notification_color">#1A73E8</color> |