From 1c4dcdc30b33f7f638c9044e831d25eedea3582e Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 23 May 2017 14:23:07 -0700 Subject: [PATCH] Center icons in Settings homepage and search result page. Change-Id: I1846439bfa6c22c36a1574c759b32b00a02f9c8a Fix: 38137170 Test: visual --- res/layout/dashboard_tile.xml | 6 +++--- res/layout/search_icon_view.xml | 24 ++++++++---------------- res/layout/search_inline_switch_item.xml | 1 - res/layout/search_intent_item.xml | 1 - res/layout/suggestion_header.xml | 4 ++-- res/layout/suggestion_tile.xml | 4 ++-- res/layout/support_tile.xml | 4 ++-- res/values/dimens.xml | 3 +-- 8 files changed, 18 insertions(+), 29 deletions(-) diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml index 1ec17300598..e35dbff8d52 100644 --- 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" /> + android:paddingEnd="@dimen/dashboard_tile_image_margin" /> diff --git a/res/layout/search_icon_view.xml b/res/layout/search_icon_view.xml index 7df064971d1..ef99bee0fdf 100644 --- 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. --> - - - \ 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 526f9fdc0c6..8f050a35d84 100644 --- 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 98e2a9b12df..6bc00ad06b9 100644 --- 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 f3f39ff1dc8..22686360c5e 100644 --- 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"/> + android:layout_marginStart="@dimen/dashboard_tile_image_margin" + android:layout_marginEnd="@dimen/dashboard_tile_image_margin"/> 24dp - 16dp - 32dp + 24dp 16dp