Center icons in Settings homepage and search result page.

Change-Id: I1846439bfa6c22c36a1574c759b32b00a02f9c8a
Fix: 38137170
Test: visual

diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 1ec1730..e35dbff 100644 (file)
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -30,8 +30,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -53,7 +53,7 @@
             android:textColor="?android:attr/textColorSecondary"
             android:maxLines="1"
             android:ellipsize="end"
-            android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />
+            android:paddingEnd="@dimen/dashboard_tile_image_margin" />
 
     </LinearLayout>
 

diff --git a/res/layout/search_icon_view.xml b/res/layout/search_icon_view.xml
index 7df0649..ef99bee 100644 (file)
--- a/res/layout/search_icon_view.xml
+++ b/res/layout/search_icon_view.xml
@@ -14,20 +14,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<LinearLayout
+
+<ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/icon_container"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:minWidth="56dp"
-    android:gravity="center_horizontal|top"
-    android:orientation="horizontal"
-    android:paddingEnd="12dp"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-    <com.android.internal.widget.PreferenceImageView
-        android:id="@android:id/icon"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:scaleType="fitCenter"/>
-</LinearLayout>
\ No newline at end of file
+    android:id="@android:id/icon"
+    android:layout_width="@dimen/dashboard_tile_image_size"
+    android:layout_height="match_parent"
+    android:scaleType="centerInside"
+    android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+    android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />

diff --git a/res/layout/search_inline_switch_item.xml b/res/layout/search_inline_switch_item.xml
index 526f9fd..8f050a3 100644 (file)
--- a/res/layout/search_inline_switch_item.xml
+++ b/res/layout/search_inline_switch_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">

diff --git a/res/layout/search_intent_item.xml b/res/layout/search_intent_item.xml
index 98e2a9b..6bc00ad 100644 (file)
--- a/res/layout/search_intent_item.xml
+++ b/res/layout/search_intent_item.xml
@@ -21,7 +21,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingTop="16dp"
     android:paddingBottom="16dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:background="?android:attr/selectableItemBackground"
     android:clipToPadding="false">

diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
index f3f39ff..2268636 100644 (file)
--- a/res/layout/suggestion_header.xml
+++ b/res/layout/suggestion_header.xml
@@ -28,8 +28,8 @@
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
         android:src="@drawable/ic_expand_more"/>
     <TextView
         android:id="@android:id/title"

diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 9e17e38..cabbafd 100644 (file)
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -28,8 +28,8 @@
         android:id="@android:id/icon"
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
         android:scaleType="centerInside"/>
 
     <RelativeLayout

diff --git a/res/layout/support_tile.xml b/res/layout/support_tile.xml
index c2081c7..a42faf0 100644 (file)
--- a/res/layout/support_tile.xml
+++ b/res/layout/support_tile.xml
@@ -28,8 +28,8 @@
         android:layout_width="@dimen/dashboard_tile_image_size"
         android:layout_height="@dimen/dashboard_tile_image_size"
         android:scaleType="centerInside"
-        android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
+        android:layout_marginStart="@dimen/dashboard_tile_image_margin"
+        android:layout_marginEnd="@dimen/dashboard_tile_image_margin"/>
     <TextView
         android:id="@+id/tile_title"
         android:layout_width="wrap_content"

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ea8f0d6..5c6796c 100755 (executable)
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -109,8 +109,7 @@
     <dimen name="dashboard_tile_image_size">24dp</dimen>
 
     <!-- Dashboard tile image margin start / end -->
-    <dimen name="dashboard_tile_image_margin_start">16dp</dimen>
-    <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
+    <dimen name="dashboard_tile_image_margin">24dp</dimen>
 
     <!-- SwitchBar margin start / end -->
     <dimen name="switchbar_margin_start">16dp</dimen>