am a1a9896b: Rename production flag for cloud sync feature

* commit 'a1a9896b42ae4f2d31793ff75b82a3b17a45316a':
  Rename production flag for cloud sync feature
main
Jatin Matani 2014-12-30 12:13:20 +00:00 committed by Android Git Automerger
commit e3b181cc96
2 changed files with 6 additions and 5 deletions

View File

@ -45,9 +45,10 @@ public final class ProductionFlags {
public static final boolean ENABLE_ACCOUNT_SIGN_IN = false; public static final boolean ENABLE_ACCOUNT_SIGN_IN = false;
/** /**
* When {@code true}, personal dictionary sync feature is ready to be enabled. * When {@code true}, user history dictionary sync feature is ready to be enabled.
*/ */
public static final boolean ENABLE_PERSONAL_DICTIONARY_SYNC = ENABLE_ACCOUNT_SIGN_IN && false; public static final boolean ENABLE_USER_HISTORY_DICTIONARY_SYNC =
ENABLE_ACCOUNT_SIGN_IN && false;
/** /**
* When {@code true}, the IME maintains per account {@link UserHistoryDictionary}. * When {@code true}, the IME maintains per account {@link UserHistoryDictionary}.

View File

@ -84,7 +84,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
removePreference(PREF_SYNC_NOW); removePreference(PREF_SYNC_NOW);
removePreference(PREF_CLEAR_SYNC_DATA); removePreference(PREF_CLEAR_SYNC_DATA);
} }
if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) { if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
removePreference(PREF_ENABLE_CLOUD_SYNC); removePreference(PREF_ENABLE_CLOUD_SYNC);
removePreference(PREF_SYNC_NOW); removePreference(PREF_SYNC_NOW);
removePreference(PREF_CLEAR_SYNC_DATA); removePreference(PREF_CLEAR_SYNC_DATA);
@ -154,7 +154,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
* Enables the Sync preference UI and updates its summary. * Enables the Sync preference UI and updates its summary.
*/ */
private void enableSyncPreference() { private void enableSyncPreference() {
if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) { if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
return; return;
} }
@ -168,7 +168,7 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
* the fact that an account needs to be selected for sync. * the fact that an account needs to be selected for sync.
*/ */
private void disableSyncPreference() { private void disableSyncPreference() {
if (!ProductionFlags.ENABLE_PERSONAL_DICTIONARY_SYNC) { if (!ProductionFlags.ENABLE_USER_HISTORY_DICTIONARY_SYNC) {
return; return;
} }