From 90aec184b4229afca5cd7ae549b49ae8f93fd1e7 Mon Sep 17 00:00:00 2001
From: Winston Man <hkman@google.com>
Date: Wed, 6 Apr 2016 21:33:47 +0100
Subject: [PATCH] Amend icon size for delete work profile dialog

Changes are referenced from
https://cs.corp.google.com/android/packages/apps/ManagedProvisioning/res/layout/device_manager_icon_label.xml

Fixed screenshot:
https://screenshot.googleplex.com/01qOjUp0rp8

Bug:27636781

Change-Id: Ib6cf303caa388a8b0d2b7664fd9828a8d2f67098
---
 res/layout/delete_managed_profile_dialog.xml | 8 ++++----
 res/values/dimens.xml                        | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/res/layout/delete_managed_profile_dialog.xml b/res/layout/delete_managed_profile_dialog.xml
index da763c9c1b1..0458f1d4673 100644
--- a/res/layout/delete_managed_profile_dialog.xml
+++ b/res/layout/delete_managed_profile_dialog.xml
@@ -41,15 +41,15 @@
             android:layout_height="@dimen/mdm_app_info_height"
             android:layout_alignParentLeft="true"
             android:layout_centerInParent="true"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="center_vertical|start"
             android:orientation="horizontal"
             android:paddingBottom="@dimen/mdm_app_info_padding_top_bottom"
             android:paddingTop="@dimen/mdm_app_info_padding_top_bottom" >
 
             <ImageView
                 android:id="@+id/delete_managed_profile_mdm_icon_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/mdm_app_icon_width_height"
+                android:layout_height="@dimen/mdm_app_icon_width_height"
                 android:scaleType="centerInside"
                 android:gravity="center_vertical" />
 
@@ -58,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
-                android:paddingLeft="@dimen/mdm_app_name_padding_left"
+                android:paddingStart="@dimen/mdm_app_name_padding_left"
                 style="@style/TextAppearance.RemoveDialogContent" />
         </LinearLayout>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a4e3401f028..9d739c0171f 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -247,6 +247,7 @@
     <dimen name="mdm_app_info_height">72dp</dimen>
     <dimen name="mdm_app_info_padding_top_bottom">8dp</dimen>
     <dimen name="mdm_app_name_padding_left">16dp</dimen>
+    <dimen name="mdm_app_icon_width_height">56dp</dimen>
 
     <dimen name="shortcut_size">40dp</dimen>
     <dimen name="badge_size">10dp</dimen>