summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJin Cao <jinyan@google.com>2014-07-25 10:26:36 -0700
committerJin Cao <jinyan@google.com>2014-08-17 14:14:50 -0700
commitff404bb78dec989c1660434915b1b027a2d86bf3 (patch)
tree072d6a275f0e21eb509acd6751e428ca8a3f0291 /res
parentc9e850dbf7b05591ed9b9e3769162f0b03311da7 (diff)
downloadandroid_packages_apps_UnifiedEmail-ff404bb78dec989c1660434915b1b027a2d86bf3.tar.gz
android_packages_apps_UnifiedEmail-ff404bb78dec989c1660434915b1b027a2d86bf3.tar.bz2
android_packages_apps_UnifiedEmail-ff404bb78dec989c1660434915b1b027a2d86bf3.zip
Quantum folder list in TL
Re-did logic for drawing the folder list for TL. The maximum width of folder and chips are calculated based on a proportion of the entire conversation item. b/15552002 Change-Id: I8fea84112f86f9278dae4c724b2a0bd7a9c59af8
Diffstat (limited to 'res')
-rw-r--r--res/layout/conversation_item_view.xml4
-rw-r--r--res/values/constants.xml5
-rw-r--r--res/values/dimen.xml14
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>