summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimen.xml7
-rw-r--r--res/values/strings.xml8
-rw-r--r--res/values/styles.xml6
4 files changed, 22 insertions, 2 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6e53af243..3be280cd9 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -45,4 +45,7 @@
<!-- Conversation message header colors -->
<color name="conv_subject_border">#c0c0c0</color>
<color name="conv_header_text_light">#777777</color>
+
+ <!-- Folder colors -->
+ <color name="folder_disabled_drop_target_text_color">#999999</color>
</resources>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index bc6c4970d..9f350a3c8 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -60,4 +60,11 @@
<dimen name="message_header_inner_side_padding">8dip</dimen>
<dimen name="attachment_toast_yoffset">-100dip</dimen>
<dimen name="spinner_frame_width">168dip</dimen>
+ <dimen name="folder_list_heading_padding_side">8dp</dimen>
+ <dimen name="folder_list_item_left_margin">24dp</dimen>
+ <dimen name="folder_list_item_right_margin">16dp</dimen>
+ <dimen name="folder_swatch_height">8dip</dimen>
+ <dimen name="folder_list_popup_width">200dip</dimen>
+ <dimen name="folder_list_folder_color_width">36dip</dimen>
+ <dimen name="folder_list_minimum_height">48dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9ae89ead9..eeb776f9e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -263,8 +263,8 @@
<!-- Strings used to show myself in a To/Cc list. [CHAR LIMIT=15] -->
<string name="me">me</string>
<string name="labels">Labels</string>
- <!-- List item to open label view in account dropdown [CHAR LIMIT=50] -->
- <string name="show_all_labels">Show all labels</string>
+ <!-- List item to open fodlers view in account dropdown [CHAR LIMIT=50] -->
+ <string name="show_all_folders">Show all folders</string>
<!-- Undo bar strings -->
<!-- Displayed in the middle of the screen when the inbox is empty [CHAR LIMIT 100]-->
@@ -469,4 +469,8 @@
<string name="done">Done</string>
<string name="cancel">Cancel</string>
<string name="close">Close</string>
+
+ <!-- Folders -->
+ <!-- Displayed in the middle of the Folders screen when no folders have been defined -->
+ <string name="folders_activity_instructions">No folders have been set for this account.</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8e8c200a9..290dbb7ad 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -307,4 +307,10 @@
<item name="android:contentDescription">@string/collapse_recipient_details</item>
</style>
<!-- End conversation view message header styles -->
+
+ <!-- Folder styles -->
+ <style name="FolderItemIcon">
+ <item name="android:layout_height">@dimen/folder_swatch_height</item>
+ <item name="android:layout_width">@dimen/folder_list_folder_color_width</item>
+ </style>
</resources>