diff options
| author | Jin Cao <jinyan@google.com> | 2014-08-17 21:26:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-17 21:26:54 +0000 |
| commit | 647c9362483856903c5e14b45ea8ea8c30acc82d (patch) | |
| tree | c2dce3dbb3ef766c3c94251e657ae139ea1fe92f /res | |
| parent | 0d0f32ba816bc2198bf7b429398d41f22213380a (diff) | |
| parent | ff404bb78dec989c1660434915b1b027a2d86bf3 (diff) | |
| download | android_packages_apps_UnifiedEmail-647c9362483856903c5e14b45ea8ea8c30acc82d.tar.gz android_packages_apps_UnifiedEmail-647c9362483856903c5e14b45ea8ea8c30acc82d.tar.bz2 android_packages_apps_UnifiedEmail-647c9362483856903c5e14b45ea8ea8c30acc82d.zip | |
am ff404bb7: Quantum folder list in TL
* commit 'ff404bb78dec989c1660434915b1b027a2d86bf3':
Quantum folder list in TL
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/conversation_item_view.xml | 4 | ||||
| -rw-r--r-- | res/values/constants.xml | 5 | ||||
| -rw-r--r-- | res/values/dimen.xml | 14 |
3 files changed, 14 insertions, 9 deletions
diff --git a/res/layout/conversation_item_view.xml b/res/layout/conversation_item_view.xml index e3e0bb0bd..2b8065a60 100644 --- a/res/layout/conversation_item_view.xml +++ b/res/layout/conversation_item_view.xml @@ -169,9 +169,9 @@ android:id="@+id/folders" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="2dp" + android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textSize="14sp" + android:textSize="12sp" style="@style/ConversationListSnippetAndFoldersStyle"/> </RelativeLayout> diff --git a/res/values/constants.xml b/res/values/constants.xml index 3a32252e5..a92445a60 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -119,4 +119,9 @@ <integer name="compose_padding_weight">0</integer> <!-- Whether or not we should scroll down so cc aligns with the top --> <bool name="auto_scroll_cc">true</bool> + + <!-- Maximum number of folders to be displayed in the thread list --> + <integer name="conversation_list_max_folder_count">4</integer> + <integer name="folder_max_width_proportion">31</integer> + <integer name="folder_cell_max_width_proportion">22</integer> </resources> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index 8cdbe2e28..b6aefa1ce 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -24,9 +24,7 @@ <dimen name="two_pane_tl_side">24dp</dimen> <dimen name="two_pane_tl_top">16dp</dimen> <dimen name="list_min_width_is_wide">720dp</dimen> - <dimen name="list_normal_mode_min_width_is_spacious">600dp</dimen> <dimen name="senders_font_size">18sp</dimen> - <dimen name="folders_text_bottom_padding">4dip</dimen> <dimen name="attachment_tile_min_size">120dp</dimen> <dimen name="attachment_tile_max_size">164dp</dimen> <dimen name="attachment_tile_padding">8dp</dimen> @@ -37,8 +35,13 @@ <dimen name="star_touch_slop">16dip</dimen> <dimen name="sender_image_touch_slop">8dip</dimen> <dimen name="standard_scaled_dimen">100sp</dimen> - <dimen name="folder_cell_width">32dip</dimen> - <dimen name="folders_start_padding">8dip</dimen> + + <!-- TL folder chips --> + <dimen name="folders_text_bottom_padding">3dp</dimen> + <dimen name="folder_cell_content_padding">6dp</dimen> + <dimen name="folders_start_padding">6dp</dimen> + <dimen name="folders_gradient_padding">8dp</dimen> + <dimen name="conversation_page_gutter">16dp</dimen> <dimen name="conversation_message_content_margin_side">16dp</dimen> <dimen name="conversation_view_margin_side">16dp</dimen> @@ -112,9 +115,6 @@ <dimen name="tile_letter_font_size">24dp</dimen> <dimen name="tile_letter_font_size_small">16dp</dimen> <dimen name="tile_divider_width">1dp</dimen> - - <dimen name="folder_minimum_width">48dip</dimen> - <dimen name="dismiss_button_padding_start">20dip</dimen> <dimen name="dismiss_button_padding_end">28dip</dimen> <dimen name="checked_text_padding">16dip</dimen> |