From 9b53150b5fe61a1b7cb0e542f069f2c2ecf2c7d5 Mon Sep 17 00:00:00 2001
From: Flavio Fiszman <flaviocf@google.com>
Date: Thu, 17 Dec 2020 15:00:48 +0000
Subject: [PATCH] Center crop and clip notification image.

Test: manual
Change-Id: If57b62761622a46496a9491d577694c32c956ae9
---
 core/java/android/view/View.java                              | 1 +
 .../SystemUI/res/layout/people_space_small_avatar_tile.xml    | 4 +++-
 .../src/com/android/systemui/people/PeopleSpaceUtils.java     | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 1d1c87d069394..0811a9dba1b6a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -17925,6 +17925,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
      * @see #setOutlineProvider(ViewOutlineProvider)
      * @see #getClipToOutline()
      */
+    @RemotableViewMethod
     public void setClipToOutline(boolean clipToOutline) {
         damageInParent();
         if (getClipToOutline() != clipToOutline) {
diff --git a/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml b/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml
index 5aa05334539b2..03589d34efd26 100644
--- a/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml
+++ b/packages/SystemUI/res/layout/people_space_small_avatar_tile.xml
@@ -168,6 +168,7 @@
                 </LinearLayout>
             </LinearLayout>
             <LinearLayout
+                android:id="@+id/content_background"
                 android:background="@drawable/people_space_content_background"
                 android:layout_gravity="center"
                 android:layout_width="match_parent"
@@ -187,7 +188,8 @@
                     android:id="@+id/image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:visibility="gone"/>
+                    android:visibility="gone"
+                    android:scaleType="centerCrop"/>
             </LinearLayout>
         </LinearLayout>
     </RelativeLayout>
diff --git a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
index f1a57bf4e2e77..a4654a934e112 100644
--- a/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
+++ b/packages/SystemUI/src/com/android/systemui/people/PeopleSpaceUtils.java
@@ -282,6 +282,7 @@ public class PeopleSpaceUtils {
                     )
             );
             views.setImageViewIcon(R.id.person_icon, tile.getUserIcon());
+            views.setBoolean(R.id.content_background, "setClipToOutline", true);
 
             Intent activityIntent = new Intent(context, LaunchConversationActivity.class);
             activityIntent.addFlags(