am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev

* commit '1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
  Settings > Apps list style updates
This commit is contained in:
Jason Monk
2015-06-05 13:48:13 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 7 deletions

View File

@@ -20,19 +20,19 @@
<GridLayout xmlns:android="http://schemas.android.com/apk/res/android" <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="72dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip" android:paddingTop="16dip"
android:paddingBottom="8dip" android:paddingBottom="16dip"
android:columnCount="4"> android:columnCount="4">
<ImageView <ImageView
android:id="@+id/app_icon" android:id="@+id/app_icon"
android:layout_width="@android:dimen/app_icon_size" android:layout_width="@dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size" android:layout_height="@dimen/app_icon_size"
android:layout_rowSpan="2" android:layout_rowSpan="2"
android:layout_marginEnd="8dip" android:layout_marginEnd="16dip"
android:scaleType="centerInside" android:scaleType="centerInside"
android:contentDescription="@null" android:contentDescription="@null"
android:duplicateParentState="true" /> android:duplicateParentState="true" />

View File

@@ -19,7 +19,7 @@
<dimen name="device_memory_usage_button_height">32dip</dimen> <dimen name="device_memory_usage_button_height">32dip</dimen>
<dimen name="action_bar_switch_padding">16dip</dimen> <dimen name="action_bar_switch_padding">16dip</dimen>
<dimen name="app_icon_size">56dip</dimen> <dimen name="app_icon_size">40dip</dimen>
<dimen name="screen_margin_sides">64dip</dimen> <dimen name="screen_margin_sides">64dip</dimen>
<dimen name="screen_margin_top">72dip</dimen> <dimen name="screen_margin_top">72dip</dimen>
<dimen name="screen_margin_bottom">48dip</dimen> <dimen name="screen_margin_bottom">48dip</dimen>