commit 71b3721540e9f3c23ac2e660dfbfa8435e37c31b
author Dake Gu <dake@google.com> Tue Sep 27 16:46:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 27 16:46:27 2016 +0000
tree 21ad4c9d75d1f89d6824eb43746a210eeb9ae362
parent 0a52f2fe2a93a30476853b1726ea06bb862b9470
parent 13c7d89d1f64bdb782bddd2a6e8cdb81b7e77886

Merge "Rename attribute dotRadius to avoid conflicts with wear" into nyc-mr1-dev

v7/preference/res/layout/preference_dropdown.xml

diff --git a/v7/preference/res/layout/preference_dropdown.xml b/v7/preference/res/layout/preference_dropdown.xml
index e7f0a7d..1c51e09 100644
--- a/v7/preference/res/layout/preference_dropdown.xml
+++ b/v7/preference/res/layout/preference_dropdown.xml
@@ -16,15 +16,12 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground"
-    android:clipToPadding="false"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:background="@android:drawable/list_selector_background"
     android:focusable="true" >
 
     <Spinner
@@ -33,47 +30,44 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/icon_frame"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="-4dp"
-        android:minWidth="60dp"
-        android:gravity="start|center_vertical"
-        android:orientation="horizontal"
-        android:paddingEnd="12dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <android.support.v7.internal.widget.PreferenceImageView
+        android:layout_height="wrap_content">
+        <ImageView
             android:id="@android:id/icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:maxWidth="48dp"
-            app:maxHeight="48dp" />
-    </LinearLayout>
+            android:layout_gravity="center"
+        />
+    </FrameLayout>
 
     <RelativeLayout
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
+        android:layout_marginStart="15dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
 
         <TextView android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:ellipsize="marquee" />
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textColor="?android:attr/textColorPrimary"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
 
         <TextView android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@android:id/title"
             android:layout_alignStart="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10" />
+            android:maxLines="4" />
 
     </RelativeLayout>
 
@@ -81,8 +75,7 @@
     <LinearLayout android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="end|center_vertical"
-        android:paddingStart="16dp"
+        android:gravity="center_vertical"
         android:orientation="vertical" />
 
 </LinearLayout>