From fed6c6fa9682404e75fdee353516acacfcc86fc2 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Fri, 15 Sep 2017 18:56:26 -0700
Subject: Fixed padding of autofill service icon on Save affordance.

Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 65739885

Change-Id: Ia2b63750665eefd36143074c4cf0e1310de056b2
---
 core/res/res/layout/autofill_save.xml                             | 7 ++++---
 services/autofill/java/com/android/server/autofill/ui/SaveUi.java | 5 +----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml
index 92419c8c525b..5c5b985b26a2 100644
--- a/core/res/res/layout/autofill_save.xml
+++ b/core/res/res/layout/autofill_save.xml
@@ -46,13 +46,14 @@
 
                 <ImageView
                     android:id="@+id/autofill_save_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="24sp"/>
+                    android:scaleType="fitStart"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"/>
 
                 <TextView
                     android:id="@+id/autofill_save_title"
                     android:paddingLeft="8dp"
-                    android:layout_width="0dp"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/autofill_save_title"
                     android:textSize="16sp"
diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
index d0b2e9240b58..065fdd56dab9 100644
--- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
+++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java
@@ -26,9 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentSender;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.IBinder;
@@ -309,7 +306,7 @@ final class SaveUi {
             Slog.w(TAG, "Not adding service icon of size "
                     + "(" + actualWidth + "x" + actualHeight + ") because maximum is "
                     + "(" + maxWidth + "x" + maxHeight + ").");
-            iconView.setVisibility(View.INVISIBLE);
+            ((ViewGroup)iconView.getParent()).removeView(iconView);
         }
     }
 
-- 
cgit v1.2.3-59-g8ed1b