Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4ee0649 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Update share sheet with NEXT style" into sc-dev am: 3f6e3c1c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959152

Change-Id: Ie5277f8490fd47ccea88b6ea6cc673ce197dd5fb
parents cb3c990c 3f6e3c1c

core/res/res/drawable/bottomsheet_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/drawable/chooser_action_button_bg.xml

+3 −5
Original line number Diff line number Diff line
@@ -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>

core/res/res/layout/chooser_action_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -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"

    />

core/res/res/layout/chooser_grid.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

core/res/res/layout/chooser_grid_preview_file.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"