diff options
| author | Justin Ho <justinho@google.com> | 2012-03-19 08:08:56 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-19 08:08:56 -0700 |
| commit | 972d12aa1e6fba69094c0a9270df645b7db74f3a (patch) | |
| tree | b6c5eb287541e7366a59ef7850993eaa66d10df2 | |
| parent | 2a0d685ed62ff7a5e5a40be0748860c092165984 (diff) | |
| parent | e36f86bce169366bd07c88c71e2e6acbe4376473 (diff) | |
| download | frameworks_base-972d12aa1e6fba69094c0a9270df645b7db74f3a.zip frameworks_base-972d12aa1e6fba69094c0a9270df645b7db74f3a.tar.gz frameworks_base-972d12aa1e6fba69094c0a9270df645b7db74f3a.tar.bz2 | |
Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
| -rw-r--r-- | core/res/res/layout/preference_child_holo.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/preference_holo.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/preference_information_holo.xml | 2 |
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 4167862..3c6a12e 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 e574219..48f483d 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 5e03cfb..e29ed03 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> |