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

Commit 6cabb8c9 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Update background colors for convo tiles" into sc-dev am: a4402f4d 

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

Change-Id: I87ee79a6426b0e6a1f8463e8e53905966b58fef2
parents 6ffdd295 a4402f4d

packages/SystemUI/res/drawable/people_space_activity_card.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ 
  ~ limitations under the License.

  -->

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

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/people_space_content_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  ~ limitations under the License.

  -->

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

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

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

    <corners android:radius="@dimen/people_space_image_radius" />

</shape>

packages/SystemUI/res/drawable/people_space_new_story_outline.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
  -->

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

       android:shape="oval">

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

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

    <stroke android:width="2dp" android:color="?android:attr/colorAccent" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/people_space_rounded_border.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
  -->

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

    android:shape="oval">

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

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

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/people_space_tile_view_card.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 
  ~ limitations under the License.

  -->

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

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

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

    <corners android:radius="@dimen/people_space_widget_radius" />

</shape>
 
 No newline at end of file