Merge "Remove more unused resources" into jb-ub-mail-ur10
diff --git a/res/drawable-hdpi/ic_divider_dashed_holo_dark.png b/res/drawable-hdpi/ic_divider_dashed_holo_dark.png
deleted file mode 100644
index 663a2f8..0000000
--- a/res/drawable-hdpi/ic_divider_dashed_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folders_more.png b/res/drawable-hdpi/ic_folders_more.png
deleted file mode 100644
index d321265..0000000
--- a/res/drawable-hdpi/ic_folders_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_div_top_btm_widget_holo.9.png b/res/drawable-hdpi/list_div_top_btm_widget_holo.9.png
deleted file mode 100644
index 8c54379..0000000
--- a/res/drawable-hdpi/list_div_top_btm_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_section_divider_holo_light.9.png b/res/drawable-hdpi/list_section_divider_holo_light.9.png
deleted file mode 100644
index b7b292e..0000000
--- a/res/drawable-hdpi/list_section_divider_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/list_selected_holo.9.png b/res/drawable-hdpi/list_selected_holo.9.png
deleted file mode 100644
index 907fc94..0000000
--- a/res/drawable-hdpi/list_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/spinner_holo.png b/res/drawable-hdpi/spinner_holo.png
deleted file mode 100644
index 396ce71..0000000
--- a/res/drawable-hdpi/spinner_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/stacked_message_gradient.9.png b/res/drawable-hdpi/stacked_message_gradient.9.png
deleted file mode 100644
index 7f59fd1..0000000
--- a/res/drawable-hdpi/stacked_message_gradient.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_divider_dashed_holo_dark.png b/res/drawable-mdpi/ic_divider_dashed_holo_dark.png
deleted file mode 100644
index 6652541..0000000
--- a/res/drawable-mdpi/ic_divider_dashed_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folders_more.png b/res/drawable-mdpi/ic_folders_more.png
deleted file mode 100644
index 4ecc7b7..0000000
--- a/res/drawable-mdpi/ic_folders_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_div_top_btm_widget_holo.9.png b/res/drawable-mdpi/list_div_top_btm_widget_holo.9.png
deleted file mode 100644
index 97dfe34..0000000
--- a/res/drawable-mdpi/list_div_top_btm_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_section_divider_holo_light.9.png b/res/drawable-mdpi/list_section_divider_holo_light.9.png
deleted file mode 100644
index c2f2dd8..0000000
--- a/res/drawable-mdpi/list_section_divider_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/list_selected_holo.9.png b/res/drawable-mdpi/list_selected_holo.9.png
deleted file mode 100644
index c350a61..0000000
--- a/res/drawable-mdpi/list_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/stacked_message_gradient.9.png b/res/drawable-mdpi/stacked_message_gradient.9.png
deleted file mode 100644
index 083a660..0000000
--- a/res/drawable-mdpi/stacked_message_gradient.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_divider_dashed_holo_dark.png b/res/drawable-xhdpi/ic_divider_dashed_holo_dark.png
deleted file mode 100644
index 34e8fd2..0000000
--- a/res/drawable-xhdpi/ic_divider_dashed_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folders_more.png b/res/drawable-xhdpi/ic_folders_more.png
deleted file mode 100644
index 7c8f1ea..0000000
--- a/res/drawable-xhdpi/ic_folders_more.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_div_top_btm_widget_holo.9.png b/res/drawable-xhdpi/list_div_top_btm_widget_holo.9.png
deleted file mode 100644
index 6934c5f..0000000
--- a/res/drawable-xhdpi/list_div_top_btm_widget_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_section_divider_holo_light.9.png b/res/drawable-xhdpi/list_section_divider_holo_light.9.png
deleted file mode 100644
index 4ad088f..0000000
--- a/res/drawable-xhdpi/list_section_divider_holo_light.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/list_selected_holo.9.png b/res/drawable-xhdpi/list_selected_holo.9.png
deleted file mode 100644
index 04c4176..0000000
--- a/res/drawable-xhdpi/list_selected_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/stacked_message_gradient.9.png b/res/drawable-xhdpi/stacked_message_gradient.9.png
deleted file mode 100644
index dd56f38..0000000
--- a/res/drawable-xhdpi/stacked_message_gradient.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/radio_button.xml b/res/drawable/radio_button.xml
deleted file mode 100644
index e9cb939..0000000
--- a/res/drawable/radio_button.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2013 Google Inc.
- Licensed to The Android Open Source Project.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_checked="true" android:drawable="@drawable/ic_radiobutton_selected" />
- <item android:drawable="@drawable/ic_radiobutton" />
-</selector>
diff --git a/res/drawable/spinner_ab_holo_light.xml b/res/drawable/spinner_ab_holo_light.xml
deleted file mode 100644
index e785cf4..0000000
--- a/res/drawable/spinner_ab_holo_light.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false"
- android:drawable="@drawable/spinner_ab_disabled_holo_light" />
- <item android:state_pressed="true"
- android:drawable="@drawable/spinner_ab_pressed_holo_light" />
- <item android:state_pressed="false" android:state_focused="true"
- android:drawable="@drawable/spinner_ab_focused_holo_light" />
- <item android:drawable="@drawable/spinner_ab_default_holo_light" />
-</selector>
diff --git a/res/values-sw600dp-land/styles.xml b/res/values-sw600dp-land/styles.xml
index 8fb3298..14958c0 100644
--- a/res/values-sw600dp-land/styles.xml
+++ b/res/values-sw600dp-land/styles.xml
@@ -16,13 +16,6 @@
limitations under the License.
-->
<resources>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">26dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
- <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
- <item name="android:layout_width">312dp</item>
- </style>
<style name="ComposeArea">
<item name="android:layout_width">@dimen/compose_scrollview_width</item>
</style>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index aaebc9c..21c4410 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -16,10 +16,6 @@
limitations under the License.
-->
<resources>
- <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
- <item name="android:layout_width">match_parent</item>
- </style>
-
<style name="UnreadCountActionBar" parent="UnreadCountActionBarBase">
<item name="android:gravity">center_vertical|left</item>
</style>
@@ -31,11 +27,6 @@
<item name="android:layout_width">@dimen/spinner_frame_width</item>
</style>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">12dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
-
<style name="ComposeArea">
<item name="android:layout_width">match_parent</item>
</style>
diff --git a/res/values-sw720dp-land/styles.xml b/res/values-sw720dp-land/styles.xml
deleted file mode 100644
index f4b5dca..0000000
--- a/res/values-sw720dp-land/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 Google Inc.
- Licensed to The Android Open Source Project.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">16dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
- <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
- <item name="android:layout_width">368dp</item>
- </style>
-</resources>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
deleted file mode 100644
index ad49432..0000000
--- a/res/values-sw720dp/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 Google Inc.
- Licensed to The Android Open Source Project.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
- <item name="android:layout_width">276dp</item>
- </style>
- <style name="unreadCountActionBarTablet" parent="@style/UnreadCountActionBar">
- <item name="android:layout_marginLeft">12dp</item>
- <item name="android:layout_width">wrap_content</item>
- </style>
-</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 60fbc86..a011f2f 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -25,7 +25,6 @@
<add-resource name="RecipientComposeHeading" type="style" />
<add-resource name="ComposeFieldLayout" type="style" />
<add-resource name="RecipientComposeFieldLayout" type="style" />
- <add-resource name="ComposeBodyStyle" type="style" />
<add-resource name="ComposeSubjectStyle" type="style" />
<declare-styleable name="FolderItemViewDrawableState">
<attr name="state_drag_mode" format="boolean" />
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 297849b..28fe4f4 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -20,7 +20,6 @@
<dimen name="drawer_width">300dp</dimen>
<dimen name="list_min_width_is_wide">720dp</dimen>
<dimen name="list_normal_mode_min_width_is_spacious">600dp</dimen>
- <dimen name="account_dropdown_item_height">48dip</dimen>
<dimen name="senders_font_size">18sp</dimen>
<dimen name="folders_text_bottom_padding">4dip</dimen>
<dimen name="attachment_tile_min_size">120dp</dimen>
@@ -96,7 +95,6 @@
<dimen name="tile_letter_font_size">33dp</dimen>
<dimen name="tile_letter_font_size_small">16dp</dimen>
<dimen name="tile_divider_width">1dp</dimen>
- <dimen name="sync_status_bar_height">40dip</dimen>
<dimen name="attachment_preview_height_tall">124dip</dimen>
<dimen name="attachment_preview_height_tall_wide">168dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49d8fb0..0128e4f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -41,8 +41,6 @@
<string name="subject_hint">Subject</string>
<!-- Shown in Compose; the subject of the message [CHAR LIMIT=100] -->
<string name="body_hint">Compose email</string>
- <!-- Compose screen, button: add bcc fields [CHAR LIMIT=1]-->
- <string name="plus_bcc_folder">+</string>
<!-- Compose screen button. Add an attachment to this message [CHAR LIMIT=20] -->
<string name="add_file_attachment">Attach file</string>
<!-- Compose screen button. Add a photo attachment to this message [CHAR LIMIT=20] -->
@@ -131,10 +129,6 @@
<string name="delete">Delete</string>
<!-- Menu item: discard the drafts in this conversation [CHAR LIMIT = 30] -->
<string name="discard_drafts">Discard drafts</string>
- <!-- Menu item: next conversation -->
- <string name="next">Older</string>
- <!-- Menu item: previous conversation -->
- <string name="previous">Newer</string>
<!-- Menu item: refresh the inbox -->
<string name="refresh">Refresh</string>
<!-- Menu item: reply to this message -->
@@ -169,33 +163,12 @@
</string>
<!-- Menu item text to show the original version of an email conversation, before message manipulation [CHAR LIMIT=25] -->
<string name="menu_show_original">Revert auto-sizing</string>
- <!-- After message manipulation, this small disclaimer text appears above a re-formatted message [CHAR LIMIT=200] -->
- <string name="message_modified">(This message has been modified from its original version to fit this screen.)</string>
- <!-- Title for the Folder list screen. [CHAR LIMIT = 30] -->
- <string name="folder_list_title">Folders</string>
- <!-- Folder list item: show more folders. [CHAR LIMIT = 30] -->
- <string name="folder_list_more">More</string>
- <!-- Folder list item: show all accounts. [CHAR LIMIT = 30] -->
- <string name="folder_list_show_all_accounts">More accounts</string>
- <!-- action bar sub title for manage folder mode. [CHAR LIMIT = 30] -->
- <string name="manage_folders_subtitle">Sync & notify</string>
<!-- Menu item: options for this folder. When source text cannot be translated within the char limit, please translate the shorter "Folder options" instead. [CHAR LIMIT = 30] -->
<string name="menu_folder_options">Folder settings</string>
- <!-- Menu item: launch the Global Account Settings activity -->
- <string name="menu_account_settings">Account settings</string>
<!-- Menu item: launch the Settings activity -->
<string name="menu_settings">Settings</string>
<!-- Menu item: search through the Gmail inbox -->
<string name="menu_search">Search</string>
- <!-- Menu item: show more menu options in a popup. Portrait mode string. [CHAR LIMIT=15] -->
- <string name="more">More</string>
- <!-- Menu item: show message number out of total in conversation view [CHAR LIMIT=50]-->
- <string name="message_count"><xliff:g id="count">%1$s</xliff:g> of <xliff:g id="total">%2$s</xliff:g></string>
- <!-- Menu item: shown in conversation menu. Tap this to move to a newer message. [CHAR LIMIT=20] -->
- <string name="newer">Newer</string>
- <!-- Menu item: shown in conversation menu. Tap this to move to an older message. [CHAR LIMIT=20] -->
- <string name="older">Older</string>
- <!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] -->
<!-- Menu item: shown in conversation menu. Tap this to move to mark conversation as important [CHAR LIMIT=30] -->
<string name="mark_important">Mark important</string>
@@ -279,10 +252,6 @@
<string name="menu_photo_share_all">Share all</string>
<!-- Displayed in the action bar as a subtitle. Save in progress. [CHAR LIMIT=15] -->
<string name="saving">Saving…</string>
- <!-- Attachment Type Selector Adapter. This string is an option in the "Attach" dialog [CHAR LIMIT=20] -->
- <string name="attach_image">Picture</string>
- <!-- Attachment Type Selector Adapter. This string is an option in the "Attach" dialog [CHAR LIMIT=20] -->
- <string name="attach_video">Video</string>
<!-- Webview Context Menu Strings -->
<!-- Title of dialog for choosing which activity to share a link with. [CHAR LIMIT=50]-->
@@ -321,13 +290,6 @@
<!-- Move several conversations -->
<item quantity="other">Move <xliff:g>%1$d</xliff:g> conversations</item>
</plurals>
- <!-- Formatting string for the content description field of the unread mail count [CHAR LIMIT=100] -->
- <plurals name="unread_mail_count">
- <!-- 1 unread mail -->
- <item quantity="one">1 unread mail</item>
- <!-- Several unread mails -->
- <item quantity="other"><xliff:g>%1$d</xliff:g> unread mails</item>
- </plurals>
<!-- Formatting string for the content description field of a conversation list item when device is in accessibility mode. [CHAR LIMIT=250] -->
<string name="content_description"><xliff:g id="sender">%1$s</xliff:g> about <xliff:g id="subject">%2$s</xliff:g>, <xliff:g id="snippet">%3$s</xliff:g> on <xliff:g id="date">%4$s</xliff:g>, <xliff:g id="readstate">%5$s</xliff:g></string>
<!-- Formatting string for the content description field of a conversation list item when device is in accessibility mode and the message was received today. [CHAR LIMI=250] -->
@@ -572,12 +534,6 @@
<string name="cancel">Cancel</string>
<!-- Button name, displayed in dialogs [CHAR LIMIT=10] -->
<string name="clear">Clear</string>
- <!-- Button name, displayed in dialogs [CHAR LIMIT=10]-->
- <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>
<!-- Sync status errors. Please do not change the order [CHAR LIMIT=100] -->
<string-array name="sync_status">
@@ -652,13 +608,8 @@
<!-- Search Results: Text for status of the search when the results are completely loaded [CHAR LIMIT=10] -->
<string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
- <!-- Show in the actionbar -->
- <string name="folders">Folders</string>
-
<!-- Shown in conversation list footer when application cannot make a connection [CHAR LIMIT=20]-->
<string name="network_error">No connection</string>
- <!-- Message at the bottom of the conversation list screen if all conversations haven't been loaded yet [CHAR LIMIT=30]-->
- <string name="loading">Loading conversations\u2026</string>
<!-- Button at bottom of conversation list screen if last attempt to load conversations failed [CHAR LIMIT=20]-->
<string name="retry">Retry</string>
<!-- Button at bottom of conversation list screen if the folder for which contents are being shown supports loading more on demand [CHAR LIMIT=20]-->
@@ -681,8 +632,6 @@
<string name="manual_sync">Sync now</string>
<!-- Displayed at the bottom of the screen during the initial sync. If pressed will open sync setting screen for accounts. [CHAR LIMIT=30] -->
<string name="change_sync_settings">Change sync settings</string>
- <!-- Displayed above the conversation list view if the result of manual sync did not find any new messages. [CHAR LIMIT=60] -->
- <string name="no_new_messages">No new messages</string>
<!-- Displayed when we could not load a photo in the photo viewer. [CHAR LIMIT=30] -->
<string name="photo_load_failed">Couldn\'t load image</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 61adc6a..c354d3a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -80,22 +80,6 @@
<item name="android:paddingTop">0dip</item>
</style>
- <style name="ComposeBodyStyle">
- <item name="android:layout_height">wrap_content</item>
- <item name="android:layout_width">match_parent</item>
- <item name="android:gravity">center_vertical</item>
- <item name="android:layout_gravity">center_vertical</item>
- <item name="android:inputType">textLongMessage|textMultiLine|textAutoCorrect|textCapSentences</item>
- <item name="android:imeOptions">flagNoFullscreen|actionDone|flagNoEnterAction</item>
- <item name="android:textColorHint">@color/compose_label_text</item>
- <item name="android:background">@null</item>
- <item name="android:minHeight">42dip</item>
- </style>
-
- <style name="ComposeButtonColumn">
- <item name="android:minWidth">100dip</item>
- </style>
-
<style name="ComposeButton">
<item name="android:padding">0dip</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
@@ -201,10 +185,6 @@
<style name="AccountSpinnerAnchorTextSecondary" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle">
</style>
- <style name="AccountSwitchSpinnerItem" parent="@style/PlainSpinnerDropdown">
- <item name="android:layout_width">match_parent</item>
- </style>
-
<!-- Browse list item styles -->
<style name="ConversationListFade" parent="@android:style/Widget.Holo.Light.ListView">
<item name="android:divider">@android:color/transparent</item>
@@ -388,9 +368,6 @@
<item name="android:displayOptions"></item>
</style>
- <style name="ListViewWhiteCustom" parent="@android:style/Widget.Holo.Light.ListView">
- </style>
-
<style name="UnifiedEmailTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:actionDropDownStyle">@style/PlainSpinnerDropdown</item>
<item name="android:listViewWhiteStyle">@android:style/Widget.Holo.Light.ListView</item>
