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

Commit b126ce89 authored by Stevie Kideckel's avatar Stevie Kideckel Committed by Automerger Merge Worker
Browse files

Merge "Add clipToOutline to the background views in people tile layouts" into... 

Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev am: 52698a91 am: 3cc200d6

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

Change-Id: Ia10f371c239a3dfe491036973b4fa5d7896e6b26
parents d34f3250 3cc200d6

packages/SystemUI/res/layout/people_space_initial_layout.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:id="@+id/item"

        android:clipToOutline="true"

        android:id="@android:id/background"

        android:orientation="horizontal"

        android:gravity="center"

        android:layout_gravity="top"

packages/SystemUI/res/layout/people_space_placeholder_layout.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:id="@+id/item"

        android:clipToOutline="true"

        android:id="@android:id/background"

        android:orientation="horizontal"

        android:gravity="center"

        android:layout_gravity="center"

packages/SystemUI/res/layout/people_space_widget_item.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
    android:orientation="vertical">

    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:id="@+id/item"

        android:clipToOutline="true"

        android:id="@android:id/background"

        android:orientation="vertical"

        android:padding="4dp"

        android:layout_marginBottom="2dp"

packages/SystemUI/res/layout/people_tile_empty_layout.xml

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

  -->

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

    android:id="@+id/item"

    android:id="@android:id/background"

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:background="@drawable/people_tile_empty_background"

    android:clipToOutline="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

packages/SystemUI/res/layout/people_tile_large_empty.xml

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

  -->

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

    android:id="@+id/item"

    android:id="@android:id/background"

    android:background="@drawable/people_space_tile_view_card"

    android:clipToOutline="true"

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:layout_width="match_parent"

    android:layout_height="match_parent"