Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update share sheet with NEXT style" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-03-23 15:20:46 +00:00
committed by Android (Google) Code Review
parent 5ee5b490d8 0652bd13b6
commit 3f6e3c1c30
14 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/drawable/bottomsheet_background.xml
View File

@@ -18,5 +18,5 @@
<corners <corners
android:topLeftRadius="@dimen/config_bottomDialogCornerRadius" android:topLeftRadius="@dimen/config_bottomDialogCornerRadius"
android:topRightRadius="@dimen/config_bottomDialogCornerRadius"/> android:topRightRadius="@dimen/config_bottomDialogCornerRadius"/>
<solid android:color="?attr/colorBackgroundFloating" /> <solid android:color="?attr/colorBackground" />
</shape> </shape>

8
core/res/res/drawable/chooser_action_button_bg.xml
View File

@@ -15,7 +15,7 @@
~ limitations under the License ~ limitations under the License
--> -->
<ripple xmlns:android="http://schemas.android.com/apk/res/android" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/lighter_gray"> android:color="?android:attr/colorControlHighlight">
<item> <item>
<inset <inset
android:insetLeft="0dp" android:insetLeft="0dp"
@@ -23,10 +23,8 @@
android:insetRight="0dp" android:insetRight="0dp"
android:insetBottom="8dp"> android:insetBottom="8dp">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<corners android:radius="16dp"></corners> <corners android:radius="16dp" />
<stroke android:width="1dp" <solid android:color="@color/system_neutral2_100" />
android:color="?attr/opacityListDivider" />
<solid android:color="?attr/colorBackgroundFloating" />
</shape> </shape>
</inset> </inset>
</item> </item>

3
core/res/res/layout/chooser_action_button.xml
View File

@@ -25,6 +25,7 @@
android:singleLine="true" android:singleLine="true"
android:clickable="true" android:clickable="true"
android:background="@drawable/chooser_action_button_bg" android:background="@drawable/chooser_action_button_bg"
android:drawableTint="@color/chooser_chip_icon" android:drawableTint="?android:textColorPrimary"
android:drawableTintMode="src_in" android:drawableTintMode="src_in"
style="?android:attr/borderlessButtonStyle"
/> />

4
core/res/res/layout/chooser_grid.xml
View File

@@ -67,7 +67,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -84,7 +84,7 @@
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical" /> android:foreground="?attr/dividerVertical" />
<FrameLayout <FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"

2
core/res/res/layout/chooser_grid_preview_file.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/chooser_view_spacing" android:paddingBottom="@dimen/chooser_view_spacing"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<LinearLayout <LinearLayout
android:layout_width="@dimen/chooser_preview_width" android:layout_width="@dimen/chooser_preview_width"

4
core/res/res/layout/chooser_grid_preview_image.xml
View File

@@ -22,14 +22,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<RelativeLayout <RelativeLayout
android:id="@+id/content_preview_image_area" android:id="@+id/content_preview_image_area"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:paddingBottom="@dimen/chooser_view_spacing" android:paddingBottom="@dimen/chooser_view_spacing"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<view class="com.android.internal.app.ChooserActivity$RoundedRectImageView" <view class="com.android.internal.app.ChooserActivity$RoundedRectImageView"
android:id="@+id/content_preview_image_1_large" android:id="@+id/content_preview_image_1_large"

2
core/res/res/layout/chooser_grid_preview_text.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="?android:attr/colorBackgroundFloating"> android:background="?android:attr/colorBackground">
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/chooser_preview_width" android:layout_width="@dimen/chooser_preview_width"

2
core/res/res/layout/chooser_list_per_profile.xml
View File

@@ -23,7 +23,7 @@
android:layoutManager="com.android.internal.app.ChooserGridLayoutManager" android:layoutManager="com.android.internal.app.ChooserGridLayoutManager"
android:id="@+id/resolver_list" android:id="@+id/resolver_list"
android:clipToPadding="false" android:clipToPadding="false"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:scrollbars="none" android:scrollbars="none"
android:elevation="1dp" android:elevation="1dp"
android:nestedScrollingEnabled="true" /> android:nestedScrollingEnabled="true" />

2
core/res/res/layout/resolver_empty_states.xml
View File

@@ -84,7 +84,7 @@
<TextView android:id="@+id/empty" <TextView android:id="@+id/empty"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:text="@string/noApplications" android:text="@string/noApplications"
android:padding="@dimen/chooser_edge_margin_normal" android:padding="@dimen/chooser_edge_margin_normal"
android:layout_marginBottom="56dp" android:layout_marginBottom="56dp"

12
core/res/res/layout/resolver_list.xml
View File

@@ -68,7 +68,7 @@
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical" /> android:foreground="?attr/dividerVertical" />
<FrameLayout <FrameLayout
@@ -76,7 +76,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating"/> android:background="?attr/colorBackground"/>
<TabHost <TabHost
android:id="@+id/profile_tabhost" android:id="@+id/profile_tabhost"
@@ -85,7 +85,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:accessibilityTraversalAfter="@id/title" android:accessibilityTraversalAfter="@id/title"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -101,7 +101,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical"/> android:foreground="?attr/dividerVertical"/>
<FrameLayout <FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"
@@ -120,13 +120,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:orientation="vertical" android:orientation="vertical"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:layout_ignoreOffset="true"> android:layout_ignoreOffset="true">
<View <View
android:id="@+id/resolver_button_bar_divider" android:id="@+id/resolver_button_bar_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical" /> android:foreground="?attr/dividerVertical" />
<LinearLayout <LinearLayout
android:id="@+id/button_bar" android:id="@+id/button_bar"

2
core/res/res/layout/resolver_list_per_profile.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/resolver_list" android:id="@+id/resolver_list"
android:clipToPadding="false" android:clipToPadding="false"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:elevation="@dimen/resolver_elevation" android:elevation="@dimen/resolver_elevation"
android:nestedScrollingEnabled="true" android:nestedScrollingEnabled="true"
android:scrollbarStyle="outsideOverlay" android:scrollbarStyle="outsideOverlay"

10
core/res/res/layout/resolver_list_with_default.xml
View File

@@ -148,7 +148,7 @@
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical" /> android:foreground="?attr/dividerVertical" />
<FrameLayout <FrameLayout
@@ -157,7 +157,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorBackgroundFloating"/> android:background="?attr/colorBackground"/>
<TabHost <TabHost
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
@@ -166,7 +166,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:background="?attr/colorBackgroundFloating"> android:background="?attr/colorBackground">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -182,7 +182,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical"/> android:foreground="?attr/dividerVertical"/>
<FrameLayout <FrameLayout
android:id="@android:id/tabcontent" android:id="@android:id/tabcontent"
@@ -200,6 +200,6 @@
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackground"
android:foreground="?attr/dividerVertical" /> android:foreground="?attr/dividerVertical" />
</com.android.internal.widget.ResolverDrawerLayout> </com.android.internal.widget.ResolverDrawerLayout>

1
core/res/res/values-night/colors.xml
View File

@@ -36,7 +36,6 @@
<color name="resolver_empty_state_text">#FFFFFF</color> <color name="resolver_empty_state_text">#FFFFFF</color>
<color name="resolver_empty_state_icon">#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> <color name="personal_apps_suspension_notification_color">#8AB4F8</color>
</resources> </resources>

1
core/res/res/values/colors.xml
View File

@@ -237,7 +237,6 @@
<color name="resolver_text_color_secondary_dark">#ffC4C6C6</color> <color name="resolver_text_color_secondary_dark">#ffC4C6C6</color>
<color name="resolver_empty_state_text">#FF202124</color> <color name="resolver_empty_state_text">#FF202124</color>
<color name="resolver_empty_state_icon">#FF5F6368</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 for personal app suspension notification button text and icon tint. -->
<color name="personal_apps_suspension_notification_color">#1A73E8</color> <color name="personal_apps_suspension_notification_color">#1A73E8</color>