Refresh pref settings for cloud sync

- Show the opt-in text
- Show the account picker if user presses 'enable sync'. Previously
  we disabled the sync pref which was confusing.
- Remove the debug tags from some prefs; and improve messaging overall

General rules;
- sync is turned ON : user checks 'enable sync' pref AND
  accepts the opt-in AND chooses an account
- sync is turned OFF: when user signs out

Demo link
https://drive.google.com/a/google.com/file/d/0B9tNQOWdRuiWSUdVVE5rVDJudlk/view?usp=sharing

Change-Id: I2e7933796b15e47005ba9970a8c1294416ef31a0

1 files changed, 2 insertions, 9 deletions

diff --git a/java/res/xml/prefs_screen_accounts.xml b/java/res/xml/prefs_screen_accounts.xml
index 462488547..e4baf7984 100644
--- a/java/res/xml/prefs_screen_accounts.xml
+++ b/java/res/xml/prefs_screen_accounts.xml
@@ -36,21 +36,14 @@
         android:persistent="true"
         android:disableDependentsState="false" />
 
-    <!-- Title will be set programmatically to embed application name -->
-    <CheckBoxPreference
-        android:key="pref_enable_metrics_logging"
-        android:summary="@string/enable_metrics_logging_summary"
-        android:defaultValue="true"
-        android:persistent="true" />
-
     <!-- This preference (acts like a button) enables the user to initiate an one time sync. -->
-    <Preference android:key="pref_beanstalk"
+    <Preference android:key="pref_sync_now"
         android:persistent="false"
         android:title="@string/sync_now_title"
         android:dependency="pref_enable_cloud_sync" />
 
     <!-- This preference (acts like a button) enables the user to clear data from the cloud. -->
-    <Preference android:key="pref_beanstalk_clear_data"
+    <Preference android:key="pref_clear_sync_data"
         android:persistent="false"
         android:title="@string/clear_sync_data_title"
         android:summary="@string/clear_sync_data_summary"