Merge "Center icons in Settings homepage and search result page."
This commit is contained in:
committed by
Android (Google) Code Review
commit
5a1af58fa0
@@ -30,8 +30,8 @@
|
|||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/dashboard_tile_image_size"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
|
android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
android:textColor="?android:attr/textColorSecondary"
|
android:textColor="?android:attr/textColorSecondary"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:paddingEnd="@dimen/dashboard_tile_image_margin_start" />
|
android:paddingEnd="@dimen/dashboard_tile_image_margin" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@@ -14,20 +14,12 @@
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<LinearLayout
|
|
||||||
|
<ImageView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/icon_container"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="match_parent"
|
||||||
android:minWidth="56dp"
|
android:scaleType="centerInside"
|
||||||
android:gravity="center_horizontal|top"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
android:orientation="horizontal"
|
android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
|
||||||
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>
|
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:paddingTop="16dp"
|
android:paddingTop="16dp"
|
||||||
android:paddingBottom="16dp"
|
android:paddingBottom="16dp"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clipToPadding="false">
|
android:clipToPadding="false">
|
||||||
|
@@ -21,7 +21,6 @@
|
|||||||
android:minHeight="?android:attr/listPreferredItemHeight"
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:paddingTop="16dp"
|
android:paddingTop="16dp"
|
||||||
android:paddingBottom="16dp"
|
android:paddingBottom="16dp"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:clipToPadding="false">
|
android:clipToPadding="false">
|
||||||
|
@@ -28,8 +28,8 @@
|
|||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
|
android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
|
||||||
android:src="@drawable/ic_expand_more"/>
|
android:src="@drawable/ic_expand_more"/>
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@android:id/title"
|
android:id="@android:id/title"
|
||||||
|
@@ -28,8 +28,8 @@
|
|||||||
android:id="@android:id/icon"
|
android:id="@android:id/icon"
|
||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
|
android:layout_marginEnd="@dimen/dashboard_tile_image_margin"
|
||||||
android:scaleType="centerInside"/>
|
android:scaleType="centerInside"/>
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
|
@@ -28,8 +28,8 @@
|
|||||||
android:layout_width="@dimen/dashboard_tile_image_size"
|
android:layout_width="@dimen/dashboard_tile_image_size"
|
||||||
android:layout_height="@dimen/dashboard_tile_image_size"
|
android:layout_height="@dimen/dashboard_tile_image_size"
|
||||||
android:scaleType="centerInside"
|
android:scaleType="centerInside"
|
||||||
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
|
android:layout_marginStart="@dimen/dashboard_tile_image_margin"
|
||||||
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"/>
|
android:layout_marginEnd="@dimen/dashboard_tile_image_margin"/>
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tile_title"
|
android:id="@+id/tile_title"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@@ -109,8 +109,7 @@
|
|||||||
<dimen name="dashboard_tile_image_size">24dp</dimen>
|
<dimen name="dashboard_tile_image_size">24dp</dimen>
|
||||||
|
|
||||||
<!-- Dashboard tile image margin start / end -->
|
<!-- Dashboard tile image margin start / end -->
|
||||||
<dimen name="dashboard_tile_image_margin_start">16dp</dimen>
|
<dimen name="dashboard_tile_image_margin">24dp</dimen>
|
||||||
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
|
|
||||||
|
|
||||||
<!-- SwitchBar margin start / end -->
|
<!-- SwitchBar margin start / end -->
|
||||||
<dimen name="switchbar_margin_start">16dp</dimen>
|
<dimen name="switchbar_margin_start">16dp</dimen>
|
||||||
|
Reference in New Issue
Block a user