diff options
author | Tony Mantler <nicoya@google.com> | 2014-08-15 16:26:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 16:26:43 +0000 |
commit | 911f4835d79a49e1568889bb83ed4ad61df7d6d1 (patch) | |
tree | 2377152e9e146b8302b6a6cf5bdf9f0c550fcba8 /res | |
parent | 05cae04b8c4271a116092d749f4bca2212f2b986 (diff) | |
parent | 0c0c546720bbb820ab5fe2f9dfdf92d408379e56 (diff) | |
download | android_packages_apps_UnifiedEmail-911f4835d79a49e1568889bb83ed4ad61df7d6d1.tar.gz android_packages_apps_UnifiedEmail-911f4835d79a49e1568889bb83ed4ad61df7d6d1.tar.bz2 android_packages_apps_UnifiedEmail-911f4835d79a49e1568889bb83ed4ad61df7d6d1.zip |
am 0c0c5467: Merge "Fix large text multi-line handling" into ub-gmail-ur14-dev
* commit '0c0c546720bbb820ab5fe2f9dfdf92d408379e56':
Fix large text multi-line handling
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/multi_folders_view.xml | 7 | ||||
-rw-r--r-- | res/layout/single_folders_view.xml | 13 | ||||
-rw-r--r-- | res/values-ldrtl/styles-ldrtl.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 4 |
4 files changed, 11 insertions, 17 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> diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml index 48c33db13..630598b35 100644 --- a/res/values-ldrtl/styles-ldrtl.xml +++ b/res/values-ldrtl/styles-ldrtl.xml @@ -205,10 +205,6 @@ <item name="android:layout_marginEnd">@dimen/folder_selection_margin_end</item> </style> - <style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle"> - <item name="android:layout_alignParentStart">true</item> - </style> - <style name="FolderListIconStyle"> <item name="android:layout_marginStart">@dimen/folder_list_item_start_margin</item> <item name="android:layout_alignParentStart">true</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6774306f2..5edaf030a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -378,11 +378,11 @@ </style> <style name="FolderColorBoxStyle" parent="AbstractFolderColorBoxStyle"> - <item name="android:layout_alignParentLeft">true</item> + <item name="android:layout_gravity">top|start</item> </style> <style name="AbstractFolderSelectionItemStyle"> - <item name="android:layout_height">match_parent</item> + <item name="android:layout_height">wrap_content</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_marginTop">4dp</item> <item name="android:layout_marginBottom">4dp</item> |