Commit 8d1094ae authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Unity][Android] Clean up SyncAndServicesPreferences

This CL performs several minor cleanups in SyncAndServicesPreferences
without any changes to the behavior:
1. Reorder constants, fields and calls to have a consistent order for
   preferences.
2. Consistently use PREF_ prefix for preference keys.
3. Use mSync prefix for preferences that control sync data types.
4. Rename mSyncOmnibox to mSyncHistory to match the title string.
5. Replace onPreferenceClick and if chain with separate listener
   objects.

Bug: 814728
Change-Id: I60fda93757fa160e7c70b98925486332880c92d5
Reviewed-on: https://chromium-review.googlesource.com/1185200Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585513}
parent c2ae3991
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
android:title="@string/sync_bookmarks"/> android:title="@string/sync_bookmarks"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:persistent="false" android:persistent="false"
android:key="payments_integration" android:key="sync_payments_integration"
android:title="@string/payments_integration"/> android:title="@string/sync_payments_integration"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:persistent="false" android:persistent="false"
android:key="sync_omnibox" android:key="sync_history"
android:title="@string/sync_history"/> android:title="@string/sync_history"/>
<org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference <org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference
android:persistent="false" android:persistent="false"
......
...@@ -1592,7 +1592,7 @@ To obtain new licenses, connect to the internet and play your downloaded content ...@@ -1592,7 +1592,7 @@ To obtain new licenses, connect to the internet and play your downloaded content
<message name="IDS_PAYMENTS_INTEGRATION_LEGACY" desc="Title for preference which enables import of Google Pay data for Autofill. 'Google Pay' should not be translated as it is the product name."> <message name="IDS_PAYMENTS_INTEGRATION_LEGACY" desc="Title for preference which enables import of Google Pay data for Autofill. 'Google Pay' should not be translated as it is the product name.">
Cards and addresses using Google Pay Cards and addresses using Google Pay
</message> </message>
<message name="IDS_PAYMENTS_INTEGRATION" desc="Title for preference which enables import of Google Pay data for Autofill. 'Google Pay' should not be translated as it is the product name."> <message name="IDS_SYNC_PAYMENTS_INTEGRATION" desc="Title for preference which enables import of Google Pay data for Autofill. 'Google Pay' should not be translated as it is the product name.">
Credit cards and addresses using Google Pay Credit cards and addresses using Google Pay
</message> </message>
<message name="IDS_SYNC_ACTIVITY_AND_INTERACTIONS_TITLE" desc="Title for preference which enables sync'ing of activity and interactions."> <message name="IDS_SYNC_ACTIVITY_AND_INTERACTIONS_TITLE" desc="Title for preference which enables sync'ing of activity and interactions.">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment