Merge "Fix homepage icon margin"
This commit is contained in:
committed by
Android (Google) Code Review
commit
54e304b897
@@ -18,7 +18,7 @@
|
|||||||
<ImageView
|
<ImageView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/dashboard_tile_foreground_image_size"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
|
@@ -1,44 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2017 The Android Open Source Project
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:background="?android:attr/selectableItemBackground"
|
|
||||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
|
||||||
android:gravity="center_vertical">
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@android:id/icon"
|
|
||||||
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"
|
|
||||||
android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
|
|
||||||
android:src="@drawable/ic_restore" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@android:id/title"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
@@ -110,7 +110,7 @@
|
|||||||
<dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
|
<dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
|
||||||
|
|
||||||
<!-- Dashboard tile image margin start / end -->
|
<!-- Dashboard tile image margin start / end -->
|
||||||
<dimen name="dashboard_tile_image_margin">24dp</dimen>
|
<dimen name="dashboard_tile_image_margin">18dp</dimen>
|
||||||
|
|
||||||
<!-- SwitchBar sub settings margin start / end -->
|
<!-- SwitchBar sub settings margin start / end -->
|
||||||
<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
|
<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
|
||||||
|
Reference in New Issue
Block a user