Move notifications to UnifiedEmail

This involves redoing the persistence model, to split general,
account, and folder settings into separate SharedPreference stores.

It also requires some preferences to be moved into UnifiedEmail.

Depends on Ibe2e3f93ec164370535ffc5f5b2409544cc8d36d (UnifiedEmail)

Change-Id: Ie6ec389b5b5d2e7ab1b299d0877811ae716526e2

9 files changed, 16 insertions, 19 deletions

diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 2c6b83026..04fa921bb 100755
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -94,22 +94,19 @@
         android:title="@string/account_settings_notifications">
 
         <CheckBoxPreference
-            android:key="account_notify"
+            android:key="notifications-enabled"
             android:title="@string/account_settings_notify_label"
             android:defaultValue="true"
             android:summary="@string/account_settings_notify_summary" />
 
-        <RingtonePreference
-            android:key="account_ringtone"
-            android:layout="?android:attr/preferenceLayoutChild"
-            android:dependency="account_notify"
-            android:title="@string/account_settings_ringtone"
-            android:ringtoneType="notification"
-            android:defaultValue="content://settings/system/notification_sound" />
+        <Preference
+            android:key="notification-ringtone"
+            android:dependency="notifications-enabled"
+            android:title="@string/account_settings_ringtone" />
 
         <CheckBoxPreference
-            android:key="account_settings_vibrate"
-            android:dependency="account_notify"
+            android:key="notification-vibrate"
+            android:dependency="notifications-enabled"
             android:defaultValue="false"
             android:title="@string/account_settings_vibrate_when_label" />
 
diff --git a/res/xml/authenticator_alternate.xml b/res/xml/authenticator_alternate.xml
index 003e7f720..1403535c8 100644
--- a/res/xml/authenticator_alternate.xml
+++ b/res/xml/authenticator_alternate.xml
@@ -25,7 +25,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/exchange_name_alternate"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_eas.xml b/res/xml/authenticator_eas.xml
index 4ee83d2c1..eed4c1019 100644
--- a/res/xml/authenticator_eas.xml
+++ b/res/xml/authenticator_eas.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_imap.xml b/res/xml/authenticator_imap.xml
index 72bcf0431..75445645c 100644
--- a/res/xml/authenticator_imap.xml
+++ b/res/xml/authenticator_imap.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_imap"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/imap_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_eas.xml b/res/xml/authenticator_legacy_eas.xml
index b9e31c3aa..041ad2011 100644
--- a/res/xml/authenticator_legacy_eas.xml
+++ b/res/xml/authenticator_legacy_eas.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.exchange"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_email.xml b/res/xml/authenticator_legacy_email.xml
index 5aad049c8..532cc058b 100644
--- a/res/xml/authenticator_legacy_email.xml
+++ b/res/xml/authenticator_legacy_email.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.email"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/exchange_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_legacy_imap.xml b/res/xml/authenticator_legacy_imap.xml
index 8182cef3c..43e0e5d17 100644
--- a/res/xml/authenticator_legacy_imap.xml
+++ b/res/xml/authenticator_legacy_imap.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_legacy_imap"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/imap_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/authenticator_pop3.xml b/res/xml/authenticator_pop3.xml
index 47e022106..6bced4fce 100644
--- a/res/xml/authenticator_pop3.xml
+++ b/res/xml/authenticator_pop3.xml
@@ -23,7 +23,7 @@
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="@string/account_manager_type_pop3"
     android:icon="@mipmap/ic_launcher_mail"
-    android:smallIcon="@drawable/stat_notify_email_generic"
+    android:smallIcon="@drawable/stat_notify_email"
     android:label="@string/pop3_name"
     android:accountPreferences="@xml/account_preferences"
 />
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
index 3bc17df1f..f3c0a642f 100644
--- a/res/xml/general_preferences.xml
+++ b/res/xml/general_preferences.xml
@@ -56,8 +56,8 @@
 
     <!-- This may be removed in GeneralPreferences.java -->
     <CheckBoxPreference
-        android:key="reply_all"
-        android:persistent="true"
+        android:key="default-reply-all"
+        android:persistent="false"
         android:defaultValue="false"
         android:title="@string/general_preference_reply_all_label"
         android:summary="@string/general_preference_reply_all_summary" />