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

Commit 7187460e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[DocsUI M3] Update selection region circle with a fake shadow" into main

parents 96e3a37a 3d9b7f64

res/flag(com.android.documentsui.flags.use_material3)/drawable/selection_circle.xml

+15 −17
Original line number Diff line number Diff line
@@ -13,33 +13,31 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<!-- Draw a 20% black circle with essentially 2 strokes, the inner stroke is white and 2dp wide, the

     outer stroke is 20% black and 1dp wide. To achieve this draw a bigger circle to be the outer

     stroke, then draw the inner circle on top that contains both the circle and the inner stroke.

     -->

<!-- Draw a 5% black circle with a white stroke. Simulate a shadow by drawing 20% black ring at a

     1dp offset from the circle. -->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- The outer 1dp 20% black stroke. -->

    <item android:bottom="@dimen/selection_outer_circle_padding"

        android:left="@dimen/selection_outer_circle_padding"

        android:right="@dimen/selection_outer_circle_padding"

        android:top="@dimen/selection_outer_circle_padding">

    <!-- The 20% black ring acting as a shadow. -->

    <item android:bottom="@dimen/selection_circle_shadow_bottom_offset"

        android:left="@dimen/selection_circle_shadow_left_offset"

        android:right="@dimen/selection_circle_shadow_right_offset"

        android:top="@dimen/selection_circle_shadow_top_offset">

        <shape android:shape="oval">

            <solid android:color="@android:color/transparent" />

            <stroke

                android:width="@dimen/selection_outer_stroke_size"

                android:color="@color/selection_circle_black" />

                android:width="@dimen/selection_stroke_size"

                android:color="@color/selection_shadow_black" />

        </shape>

    </item>

    <!-- The inner 2 dp white stroke on a 20% black circle. -->

    <!-- The 5% black circle with a 2 dp white stroke. -->

    <item

        android:bottom="@dimen/selection_inner_circle_padding"

        android:left="@dimen/selection_inner_circle_padding"

        android:right="@dimen/selection_inner_circle_padding"

        android:top="@dimen/selection_inner_circle_padding">

        android:bottom="@dimen/selection_circle_offset"

        android:left="@dimen/selection_circle_offset"

        android:right="@dimen/selection_circle_offset"

        android:top="@dimen/selection_circle_offset">

        <shape android:shape="oval">

            <solid android:color="@color/selection_circle_black"/>

            <stroke

                android:width="@dimen/selection_inner_stroke_size"

                android:width="@dimen/selection_stroke_size"

                android:color="@android:color/white" />

        </shape>

    </item>

res/flag(com.android.documentsui.flags.use_material3)/values/colors.xml

+4 −1
Original line number Diff line number Diff line
@@ -109,7 +109,10 @@ 
  <color name="overlay_hover_color_percentage">#14000000</color> <!-- 8% -->



  <!-- 20% black -->

  <color name="selection_circle_black">#33000000</color>

  <color name="selection_shadow_black">#33000000</color>



  <!-- 5% black -->

  <color name="selection_circle_black">#0D000000</color>



  <!-- Peek -->

  <!-- Scrim for the overlay. Static color, 80% opacity in black, defined specifically for Peek. -->

res/flag(com.android.documentsui.flags.use_material3)/values/dimens.xml

+6 −4
Original line number Diff line number Diff line
@@ -44,10 +44,12 @@ 
    <!-- TODO(b/379776735): remove this after use_material3 flag is launched. -->

    <dimen name="zoom_icon_size">24dp</dimen>

    <dimen name="selection_circle_margin">1dp</dimen>

    <dimen name="selection_outer_circle_padding">5dp</dimen>

    <dimen name="selection_outer_stroke_size">1dp</dimen>

    <dimen name="selection_inner_circle_padding">6dp</dimen>

    <dimen name="selection_inner_stroke_size">2dp</dimen>

    <dimen name="selection_circle_shadow_bottom_offset">6dp</dimen>

    <dimen name="selection_circle_shadow_right_offset">6dp</dimen>

    <dimen name="selection_circle_shadow_top_offset">8dp</dimen>

    <dimen name="selection_circle_shadow_left_offset">8dp</dimen>

    <dimen name="selection_circle_offset">7dp</dimen>

    <dimen name="selection_stroke_size">2dp</dimen>

    <dimen name="list_item_thumbnail_size">40dp</dimen>

    <dimen name="list_item_thumbnail_corner_radius">8dp</dimen>

    <dimen name="grid_item_icon_size">30dp</dimen>