Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1

Author: Justin Ho

core/res/res/layout/preference_child_holo.xml

@@ -60,7 +60,7 @@
             android:layout_alignLeft="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10" />
+            android:maxLines="4" />
 
     </RelativeLayout>
 

core/res/res/layout/preference_holo.xml

@@ -63,7 +63,7 @@
             android:layout_alignLeft="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10" />
+            android:maxLines="4" />
 
     </RelativeLayout>
 

core/res/res/layout/preference_information_holo.xml

@@ -61,7 +61,7 @@
             android:layout_alignLeft="@android:id/title"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="10" />
+            android:maxLines="2" />
 
     </RelativeLayout>