diff options
author | Tony Mantler <nicoya@google.com> | 2014-08-15 16:22:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-15 04:50:08 +0000 |
commit | 0c0c546720bbb820ab5fe2f9dfdf92d408379e56 (patch) | |
tree | 0167979fdc85394cea3cb4884485a4db15b33b13 /res/layout | |
parent | d47a7043d685c69d30317245ac295f4cde5240d8 (diff) | |
parent | 908816d25e7caf3c6fd7bc8f7e371fd51117981e (diff) | |
download | android_packages_apps_UnifiedEmail-0c0c546720bbb820ab5fe2f9dfdf92d408379e56.tar.gz android_packages_apps_UnifiedEmail-0c0c546720bbb820ab5fe2f9dfdf92d408379e56.tar.bz2 android_packages_apps_UnifiedEmail-0c0c546720bbb820ab5fe2f9dfdf92d408379e56.zip |
Merge "Fix large text multi-line handling" into ub-gmail-ur14-dev
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/multi_folders_view.xml | 7 | ||||
-rw-r--r-- | res/layout/single_folders_view.xml | 13 |
2 files changed, 9 insertions, 11 deletions
diff --git a/res/layout/multi_folders_view.xml b/res/layout/multi_folders_view.xml index 88a9c1078..ea49d2da2 100644 --- a/res/layout/multi_folders_view.xml +++ b/res/layout/multi_folders_view.xml @@ -19,10 +19,11 @@ <!-- Describes an individual toggleable folder entry to be displayed in a list of folders in a folder selection UI. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/folders" android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight"> + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight"> <!-- Note: the checkbox is not focusable because the parent list item itself handles the toggling --> @@ -33,4 +34,4 @@ android:id="@+id/color_block" style="@style/FolderColorBoxStyle"/> -</RelativeLayout> +</FrameLayout> diff --git a/res/layout/single_folders_view.xml b/res/layout/single_folders_view.xml index 9959e6a37..3f048da01 100644 --- a/res/layout/single_folders_view.xml +++ b/res/layout/single_folders_view.xml @@ -19,22 +19,19 @@ <!-- Describes an individual toggleable folder entry to be displayed in a list of folders in a folder selection UI. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/folders" android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight"> + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight"> <!-- Note: the checkbox is not focusable because the parent list item itself handles the toggling --> <TextView android:id="@+id/folder_name" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center_vertical" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginLeft="16dp" /> + style="@style/FolderSelectionItemStyle" /> <View android:id="@+id/color_block" style="@style/FolderColorBoxStyle" /> -</RelativeLayout> +</FrameLayout> |