Update account and sync management UX

chrome/android/java/strings/android_chrome_strings.grd

Index: chrome/android/java/strings/android_chrome_strings.grd
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index 65adad0335182d2b988c551e8e735778c7fb07ab..59655a66b61e088e969bc8c5b53143c48ab87985 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -170,6 +170,9 @@ CHAR-LIMIT guidelines:
       <message name="IDS_NEXT" desc="Generic label for a button to advance to the next item. [CHAR-LIMIT=20]">
         Next
       </message>
+      <message name="IDS_SUBMIT" desc="Generic label for a submit button. Used in multiple contexts. [CHAR-LIMIT=20]">

[newt (away), 2016/02/12 22:03:51]

Maybe "Generic label for a button to submit data."

+        Submit
+      </message>
 
       <!-- Main Preferences -->
       <message name="IDS_PREFERENCES" desc="Title for Chrome's Settings.">
@@ -201,9 +204,6 @@ CHAR-LIMIT guidelines:
       <message name="IDS_SIGN_IN_TO_CHROME_SUMMARY" desc="Summary for the button to sign in to Chrome, explaining benefits of signing in.">
         Sign in to get your bookmarks, history, passwords, and other settings on all your devices
       </message>
-      <message name="IDS_NUMBER_OF_SIGNED_IN_ACCOUNTS" desc="Summary indicating the number of accounts (always greater than 1) the user is signed in to the content area.">
-        <ph name="NUMBER_OF_ACCOUNTS">%1$d<ex>3</ex></ph> accounts
-      </message>
 
       <!-- Search engine preferences -->
       <message name="IDS_PREFS_SEARCH_ENGINE" desc="Title for Search Engine preferences. [CHAR-LIMIT=32]">
@@ -821,13 +821,13 @@ To obtain new licenses, connect to the internet and play your downloaded content
         Add account for <ph name="ADD_ACCOUNT_USER_NAME">%1$s<ex>Pablo Picasso</ex></ph>
       </message>
       <message name="IDS_ACCOUNT_MANAGEMENT_TITLE" desc="Header title for the account management screen. [CHAR-LIMIT=32]">
-        Accounts
+        Signed in to Google as
       </message>
-      <message name="IDS_ACCOUNT_MANAGEMENT_GO_INCOGNITO_TEXT" desc="Summary text for going incognito.">
-        Go incognito to browse privately or sign in temporarily
+      <message name="IDS_ACCOUNT_MANAGEMENT_SYNC_SUMMARY" desc="Description for which account the data is being synced to">
+        Syncing to <ph name="SYNC_ACCOUNT_USER_NAME">%1$s<ex>johndoe@gmail.com</ex></ph>
       </message>
-      <message name="IDS_ACCOUNT_MANAGEMENT_NOT_YOU_TEXT" desc="Title text for the section with the incognito button.">
-        Not <ph name="NOT_YOU_USER_NAME">%1$s<ex>Pablo Picasso</ex></ph>?
+      <message name="IDS_ACCOUNT_MANAGEMENT_SIGN_OUT" desc="Button text for signing out of Chrome">
+        Sign out of Chrome
       </message>
 
       <!-- Child accounts -->
@@ -878,6 +878,9 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_SYNC_SETUP_PROGRESS" desc="Message indicating that sync setup is in progress">
         Setup in progress…
       </message>
+      <message name="IDS_SYNC_ACCOUNT_HEADER" desc="Header for indicating to the user which account is being used for syncing">
+        Sync account
+      </message>
 
       <!-- Confirm Sync account change dialog. -->
       <message name="IDS_CONFIRM_ACCOUNT_CHANGE_DIALOG_TITLE" desc="Confirm Account change dialog title. This Dialog warns the user that signing in to sync will merge all their browsing data with the new sync email account. This dialog is displayed when user signs out of sync and tries to sign in again with a different account. Dialog also contains a link which opens a new dialog to clear sync data. [CHAR-LIMIT=40].">
@@ -939,29 +942,29 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_ADD_ACCOUNT_CONTINUE" desc="Continue button for add Google account dialog [CHAR-LIMIT=20]">
         Continue
       </message>
-      <message name="IDS_SIGN_IN_ACCOUNTS_MESSAGE" desc="Description of the signed-in section shown below the header">
-        You’re signed in to the following Google Accounts. Add or remove accounts in Android settings.
-      </message>
-      <message name="IDS_SIGN_IN_ACCOUNTS_MESSAGE_MANAGED" desc="Description of the signed-in section shown below the header when adding or removing accounts is not allowed.">
-        You’re signed in to the following Google Accounts.
-      </message>
-      <message name="IDS_SIGN_IN_ACCOUNTS_MESSAGE_CHILD" desc="Description of the signed-in section shown below the header for child accounts">
-        You’re signed in to the following Google Account.
-      </message>
       <message name="IDS_SIGNOUT_TITLE" desc="Title for sign out of Chrome dialog [CHAR-LIMIT=40]">
-        Sign out of Chrome
+        Sign out of Chrome?
       </message>
       <message name="IDS_SIGNOUT_MESSAGE" desc="Message to display for sign out of Chrome dialog">
-        The data stored on this device as well as the data stored in your Google Account will remain in both places. However, new data or changes you make to your data will not be synchronized between them.
+        Changes to your bookmarks, history, passwords, and other settings will no longer be synced to your Google Account. However, your existing data will remain stored in your Google account.
       </message>
       <message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to display for sign out of Chrome dialog when the account has enterprise management, and all user data will be erased">
         You are signing out of an account managed by <ph name="DOMAIN_NAME">%1$s<ex>google.com</ex></ph>. This will delete the Chrome data stored on this device, but the data will remain in your Google Account.
       </message>
+      <message name="IDS_SIGNOUT_DIALOG_POSITIVE_BUTTON" desc="Positive button for signing out of Chrome dialog">

[newt (away), 2016/02/12 22:03:51]

or just "Button to sign out of Chrome"

+        Sign out
+      </message>
 
       <!-- Sync strings -->
       <message name="IDS_SIGN_IN_SYNC" desc="Sync preference title in signed-in prefs and prefix for notification related to sync [CHAR-LIMIT=32]">
         Sync
       </message>
+      <message name="IDS_SYNC_DESCRIPTION" desc="Describes the purpose of syncing. This will be displayed on the sync on/off toggle [CHAR-LIMIT=64]">

[newt (away), 2016/02/12 22:03:51]

Don't use CHAR-LIMITS unless longer text would break the UI or get cut off. Rule
of thumb: if a CHAR-LIMIT is longer than 32 characters, it's probably not
needed.

[May, 2016/02/16 17:32:08]

Done.

+        Get your bookmarks, history, passwords, and other settings on all your devices
+      </message>
+      <message name="IDS_SYNC_TO_ACCOUNT_HEADER" desc="Header title for selecting the account to sync to [CHAR-LIMIT=32]">
+        Sync to
+      </message>
       <message name="IDS_SYNC_DATA_TYPES" desc="Preference category name for customization of synced data types. [CHAR-LIMT=32]">
         Data types
       </message>
@@ -1005,13 +1008,16 @@ To obtain new licenses, connect to the internet and play your downloaded content
         Encrypt all with Google password as of <ph name="TIME">%1$s<ex>Oct 3, 2014</ex></ph>
       </message>
       <message name="IDS_SYNC_PASSPHRASE_TYPE_CUSTOM" desc="Option to encrypt all sync data with a custom passphrase.">
-        Encrypt all with passphrase
+        Encrypt all synced data with your own sync passphrase
+      </message>
+      <message name="IDS_SYNC_PASSPHRASE_TYPE_CUSTOM_DIALOG_TITLE" desc="Dialog title for custom passphrase creation.">
+        Create passphrase
       </message>
       <message name="IDS_SIGN_IN_GOOGLE_ACCOUNT" desc="Title of sign in account selection dialog. [CHAR-LIMIT=32]">
         Google Account
       </message>
       <message name="IDS_SYNC_CUSTOM_PASSPHRASE" desc="Prompt user to create a custom sync password.">
-        Only someone with your passphrase can read your encrypted data. This passphrase is not sent to or stored by Google. If you forget your passphrase, you will need to reset sync.
+        Encrypting your data with a passphrase lets you sync your data without letting Google read it. To change this setting, you will need to reset sync. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn more<ph name="END_LINK">&lt;/link&gt;</ph>

[newt (away), 2016/02/12 22:03:51]

Looks like this string needs updating to match the new mocks. Also, for
readability where this string is used, I'd use <learnmore> instead of <link>

[May, 2016/02/16 17:32:08]

Done.

       </message>
       <message name="IDS_SYNC_DASHBOARD_URL" desc="URL for the sync dashboard." translateable="false">
         https://www.google.com/settings/chrome/sync
@@ -1026,7 +1032,7 @@ To obtain new licenses, connect to the internet and play your downloaded content
         This field cannot be blank
       </message>
       <message name="IDS_SYNC_PASSPHRASE_RESET_INSTRUCTIONS" desc="Inform the user how they can reset their passphrase if they have forgotten it." meaning="Android">
-        If you’ve forgotten your passphrase, stop and reset Sync via <ph name="BEGIN_LINK">&lt;link&gt;</ph>Google Dashboard<ph name="END_LINK">&lt;/link&gt;</ph>.
+        If you’ve forgotten your passphrase, reset sync. <ph name="BEGIN_LINK">&lt;link&gt;</ph>Learn more<ph name="END_LINK">&lt;/link&gt;</ph>
       </message>
       <message name="IDS_SYNC_PASSPHRASES_DO_NOT_MATCH" desc="Inform user that their sync password does not match.">
         Passphrases do not match
@@ -1040,6 +1046,30 @@ To obtain new licenses, connect to the internet and play your downloaded content
       <message name="IDS_SYNC_LOADING" desc="Preference title to let the user change their encryption password. [CHAR-LIMIT=20]">
         Loading…
       </message>
+      <message name="IDS_SYNC_IMPORT_DATA_TITLE" desc="Preference title of screen to let user choose to switch sync accounts. [CHAR-LIMIT=24]">
+        Import data?
+      </message>
+      <message name="IDS_SYNC_IMPORT_DATA_PROMPT" desc="Prompt for the user to choose how they want to handle their existing sync data">
+        You're switching sync accounts from <ph name="FROM_ACCOUNT">%1$s<ex>johndoe@gmail.com</ex></ph> to <ph name="TO_ACCOUNT">%2$s<ex>john@gmail.com</ex></ph>. What do you want to do with your existing bookmarks, history, passwords, and other settings?

[newt (away), 2016/02/12 22:03:51]

use curly quotes (you can copy paste from elsewhere in this file)

[May, 2016/02/16 17:32:08]

I don't need all these strings yet (import data piece is still being worked on),
so removed from this CL.

+      </message>
+      <message name="IDS_SYNC_IMPORT_EXISTING_DATA" desc="Option to import existing data to the newly selected sync account">
+        Import existing data
+      </message>
+      <message name="IDS_SYNC_IMPORT_EXISTING_DATA_SUBTEXT" desc="Subtext describing what happens if the user elects to import existing data to the newly selected sync account">
+        Keep existing data on your device and permanently import the data to <ph name="ACCOUNT">%1$s<ex>john@doe.com</ex></ph>
+      </message>
+      <message name="IDS_SYNC_IMPORT_EXISTING_DATA_VALUE" desc="Internal value for import data preference" translateable="false">

[newt (away), 2016/02/12 22:03:51]

Unless you need to reference this string from both xml resources and from Java
code, I'd move this from the grd file into a Java file. There's much less
overhead to read a string constant in Java and it's simpler that way. (Likewise
for keep_existing_data below).

[May, 2016/02/16 17:32:08]

Ditto

+        import_existing_data
+      </message>
+      <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE" desc="Option to keep the existing data separate from the newly selected sync account">
+        Keep existing data separate
+      </message>
+      <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_SUBTEXT" desc="Subtext describing what happens if the user elects to keep the existing data separate">
+        Replace this device's data with <ph name="ACCOUNT">%1$s<ex>john@doe.com</ex></ph>'s data. You can retrieve your existing data by switching back to <ph name="ACCOUNT">%1$s<ex>johndoe@gmail.com</ex></ph>

[newt (away), 2016/02/12 22:03:51]

curly quotes

[May, 2016/02/16 17:32:08]

Ditto.

+      </message>
+      <message name="IDS_SYNC_KEEP_EXISTING_DATA_SEPARATE_VALUE" desc="Internal value for keep existing data preference" translateable="false">
+        keep_existing_data
+      </message>
 
       <!-- Bluetooth Picker UI strings -->
       <message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. ">
@@ -1582,7 +1612,7 @@ You are signing in with a managed account and giving its administrator control o
         Set up Chrome
       </message>
       <message name="IDS_FRE_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for account chooser page">
-        Select an account to get your bookmarks, history, passwords, and other settings on all your devices.
+        Select an account to get your bookmarks, history, passwords, and other settings on all your devices

[newt (away), 2016/02/12 22:03:51]

add back the period? It's in the mocks.

[May, 2016/02/16 17:32:08]

Done.

       </message>
       <message name="IDS_FRE_SKIP_TEXT" desc="Text for second page skip button">
         No thanks
@@ -1603,7 +1633,7 @@ You are signing in with a managed account and giving its administrator control o
         Make Chrome yours
       </message>
       <message name="IDS_FRE_NO_ACCOUNT_CHOICE_DESCRIPTION" desc="Text for account chooser page when there are no accounts on the device.">
-        Add an account to get your bookmarks, history, passwords, and other settings on all your devices.
+        Add an account to get your bookmarks, history, passwords, and other settings on all your devices

[newt (away), 2016/02/12 22:03:51]

add back the period?

[May, 2016/02/16 17:32:08]

Done.

       </message>
       <message name="IDS_SIGN_IN_TO_CHROME_SUMMARY_VARIANT" desc="A variant of summary for the signin promo; lists reasons to sign in to Chrome.">
         Sign in to access all your web stuff from any device