summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Ho <justinho@google.com> 2012-03-19 08:11:33 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-03-19 08:11:33 -0700
commitf31099f5d69e554b85a723f81667dd29da797555 (patch)
tree56c089dc3e7977d9f493c31314612e1ef02515ec
parentc182e36c8c70a7d25965aa2d0c7ed458900f3159 (diff)
parent972d12aa1e6fba69094c0a9270df645b7db74f3a (diff)
am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '972d12aa1e6fba69094c0a9270df645b7db74f3a': DO NOT MERGE Revert "Increase line limit for summary text"
-rw-r--r--core/res/res/layout/preference_child_holo.xml2
-rw-r--r--core/res/res/layout/preference_holo.xml2
-rw-r--r--core/res/res/layout/preference_information_holo.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/layout/preference_child_holo.xml b/core/res/res/layout/preference_child_holo.xml
index 41678628be16..3c6a12edc391 100644
--- a/core/res/res/layout/preference_child_holo.xml
+++ b/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>
diff --git a/core/res/res/layout/preference_holo.xml b/core/res/res/layout/preference_holo.xml
index e57421995bd8..48f483df9e72 100644
--- a/core/res/res/layout/preference_holo.xml
+++ b/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>
diff --git a/core/res/res/layout/preference_information_holo.xml b/core/res/res/layout/preference_information_holo.xml
index 5e03cfb7c214..e29ed03913c4 100644
--- a/core/res/res/layout/preference_information_holo.xml
+++ b/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>