Merge "Change FolderType to a bitmask" into jb-ub-mail-ur9
diff --git a/res/drawable-sw600dp/folder_item.xml b/res/drawable-sw600dp/folder_item.xml
deleted file mode 100644
index 7632b33..0000000
--- a/res/drawable-sw600dp/folder_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 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_pressed="true" android:drawable="@drawable/list_pressed_holo" />
- <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
- <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/folder_item.xml b/res/drawable/folder_item.xml
index f047291..7632b33 100644
--- a/res/drawable/folder_item.xml
+++ b/res/drawable/folder_item.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
-<!-- On phone we don't want to have an activated state. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
+ <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
<item android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cd7f37c..c48e5eb 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"نقل إلى"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"إعدادات المجلدات"</string>
<string name="folder_list_title" msgid="4276644062440415214">"المجلدات"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"المزيد"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"مزيد من الحسابات"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"المزامنة والإشعارات"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"إعدادات المجلد"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"إعدادات الحساب"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"تم تغيير المجلد."</item>
<item quantity="other" msgid="8918589141287976985">"تم تغيير المجلدات."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"تم النقل إلى <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"النتائج"</string>
<string name="search_unsupported" msgid="4654227193354052607">"لا يمكن استخدام البحث على هذا الحساب."</string>
<string name="searchMode" msgid="3329807422114758583">"وضع البحث"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index b3e54f6..91cbe92 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"Move to"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Folder settings"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Folders"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"More"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"More accounts"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"Sync & notify"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"Folder settings"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"Account settings"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"Changed folder."</item>
<item quantity="other" msgid="8918589141287976985">"Changed folders."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"Moved to <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Results"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Search is not supported on this account."</string>
<string name="searchMode" msgid="3329807422114758583">"Search Mode"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2e17b51..93c57c4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"Sposta in"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Impostazioni cartella"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Cartelle"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"Altre"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Altri account"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizza e notifica"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"Impostazioni cartella"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"Impostazioni account"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"Cartella cambiata."</item>
<item quantity="other" msgid="8918589141287976985">"Cartelle cambiate."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"Spostata in <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Risultati"</string>
<string name="search_unsupported" msgid="4654227193354052607">"La ricerca non è supportata per l\'account in uso."</string>
<string name="searchMode" msgid="3329807422114758583">"Modalità di ricerca"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index dd9dd84..15fdafe 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"העבר אל"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"הגדרות תיקיה"</string>
<string name="folder_list_title" msgid="4276644062440415214">"תיקיות"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"עוד"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"עוד חשבונות"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"סנכרן ושלח התראה"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"הגדרות תיקיה"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"הגדרות חשבון"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"התיקיה שונתה."</item>
<item quantity="other" msgid="8918589141287976985">"התיקיות שונו."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"הועברה אל <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"תוצאות"</string>
<string name="search_unsupported" msgid="4654227193354052607">"חיפוש אינו נתמך בחשבון זה."</string>
<string name="searchMode" msgid="3329807422114758583">"מצב חיפוש"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b33baa4..1ba9a02 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"Mover para"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Definições da pasta"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Mais contas"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"Sincronizar e notificar"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"Definições da pasta"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"Definições da conta"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"Pasta alterada."</item>
<item quantity="other" msgid="8918589141287976985">"Pastas alteradas."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"Movida para <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Resultados"</string>
<string name="search_unsupported" msgid="4654227193354052607">"A pesquisa não é suportada nesta conta."</string>
<string name="searchMode" msgid="3329807422114758583">"Modo de Pesquisa"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7986e2e..bbc4520 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -77,10 +77,8 @@
<string name="menu_move_to" msgid="9138296669516358542">"Перемістити в"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Налаштування папки"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
- <!-- no translation found for folder_list_more (537172187223133825) -->
- <skip />
- <!-- no translation found for folder_list_show_all_accounts (8054807182336991835) -->
- <skip />
+ <string name="folder_list_more" msgid="537172187223133825">"Інші"</string>
+ <string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Інші облікові записи"</string>
<string name="manage_folders_subtitle" msgid="7702199674083260433">"Синхронізація та сповіщення"</string>
<string name="menu_folder_options" msgid="8897520487430647932">"Налаштування папки"</string>
<string name="menu_account_settings" msgid="8230989362863431918">"Налаштування облікового запису"</string>
@@ -225,8 +223,7 @@
<item quantity="one" msgid="4930161390461457462">"Змінено папку."</item>
<item quantity="other" msgid="8918589141287976985">"Змінено папки."</item>
</plurals>
- <!-- no translation found for conversation_folder_moved (297469098857964678) -->
- <skip />
+ <string name="conversation_folder_moved" msgid="297469098857964678">"Переміщено в папку <xliff:g id="FOLDERNAME">%1$s</xliff:g>"</string>
<string name="search_results_header" msgid="4669917471897026269">"Результати"</string>
<string name="search_unsupported" msgid="4654227193354052607">"Функція пошуку в цьому обліковому записі не підтримується."</string>
<string name="searchMode" msgid="3329807422114758583">"Режим пошуку"</string>
diff --git a/src/com/android/mail/browse/ConversationPagerController.java b/src/com/android/mail/browse/ConversationPagerController.java
index 21cf6b9..ab81016 100644
--- a/src/com/android/mail/browse/ConversationPagerController.java
+++ b/src/com/android/mail/browse/ConversationPagerController.java
@@ -157,7 +157,7 @@
mPager.setVisibility(View.GONE);
}
- mSubjectDisplayChanger.clearSubject();
+ mSubjectDisplayChanger.clearSubjectAndUpdate();
LogUtils.d(LOG_TAG, "IN CPC.hide, clearing adapter and unregistering list observer");
mPager.setAdapter(null);
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 9e94d33..55066bd 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -655,14 +655,14 @@
}
@Override
- public void clearSubject() {
+ public void clearSubjectAndUpdate() {
if (!mShowConversationSubject) {
return;
}
-
- mActionBar.setTitle(null);
- mActionBar.setSubtitle(null);
+ // Wipe subject view text
mSubjectView.setText(null);
+ // Set folder and account as title and subtitle
+ setFolderAndAccount();
}
@Override
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 4496489..674ac4c 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -110,9 +110,7 @@
@Override
public void resetActionBarIcon() {
final int mode = mViewMode.getMode();
- if (mode == ViewMode.CONVERSATION_LIST
- && inInbox(mAccount, mConvListContext)
- || mViewMode.isWaitingForSync()) {
+ if (mViewMode.isWaitingForSync()) {
mActionBarView.removeBackButton();
} else {
mActionBarView.setBackButton();
@@ -529,12 +527,21 @@
final int mode = mViewMode.getMode();
if (mode == ViewMode.SEARCH_RESULTS_LIST) {
mActivity.finish();
- } else if ((!inInbox(mAccount, mConvListContext) && mViewMode.isListMode())
+ // Not needed, the activity is going away anyway.
+ return true;
+ }
+ if (inInbox(mAccount, mConvListContext) && mViewMode.isListMode()) {
+ // Up affordance: show the drawer.
+ toggleFolderListState();
+ return true;
+ }
+ if (mViewMode.isListMode()
|| mode == ViewMode.CONVERSATION
|| mode == ViewMode.FOLDER_LIST
|| mode == ViewMode.SEARCH_RESULTS_CONVERSATION) {
// Same as go back.
handleBackPress();
+ return true;
}
return true;
}
diff --git a/src/com/android/mail/ui/SubjectDisplayChanger.java b/src/com/android/mail/ui/SubjectDisplayChanger.java
index 29ccef5..6a19c9a 100644
--- a/src/com/android/mail/ui/SubjectDisplayChanger.java
+++ b/src/com/android/mail/ui/SubjectDisplayChanger.java
@@ -31,9 +31,10 @@
void setSubject(String subject);
/**
- * Clear the subject display.
+ * Clear the subject display and update the action bar to display the
+ * folder/account.
*/
- void clearSubject();
+ void clearSubjectAndUpdate();
/**
* Fits the subject text into the view that will display it, and returns any text that