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

Commit 99d4010c authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Use widget picker color surface for WidgetsBottomSheet" into sc-dev

parents e1a2ea76 1777a1be

res/drawable/top_round_rect_primary.xml→res/drawable/widgets_bottom_sheet_background.xml

+4 −4
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!--

<!--

     Copyright (C) 2018 The Android Open Source Project

     Copyright (C) 2021 The Android Open Source Project





     Licensed under the Apache License, Version 2.0 (the "License");

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@ 
-->

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    android:shape="rectangle">

    <solid android:color="?android:attr/colorPrimary" />

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

    <corners

    <corners

        android:topLeftRadius="@dimen/bg_round_rect_radius"

        android:topLeftRadius="@dimen/bg_round_rect_radius"

        android:topRightRadius="@dimen/bg_round_rect_radius"

        android:topRightRadius="@dimen/bg_round_rect_radius"

res/layout/widgets_bottom_sheet.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:paddingTop="16dp"

    android:paddingTop="16dp"

    android:background="@drawable/top_round_rect_primary"

    android:background="@drawable/widgets_bottom_sheet_background"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:layout_gravity="bottom"

    android:layout_gravity="bottom"

    android:theme="?attr/widgetsTheme">

    android:theme="?attr/widgetsTheme">