aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJatin Matani <jatinm@google.com>2014-10-08 23:46:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-08 23:46:46 +0000
commit45110a7bcf6daa20ebb04e34045a63b8c9985705 (patch)
tree941eb264c7f033b7c4bbca3255a74b3c5a552745 /java/src
parent83d7e4cfef6511c0e96d276b4171c7437dc88e61 (diff)
parent3c6ac75c48e0f57d389305c9c22a3be960682ed2 (diff)
downloadlatinime-45110a7bcf6daa20ebb04e34045a63b8c9985705.tar.gz
latinime-45110a7bcf6daa20ebb04e34045a63b8c9985705.tar.xz
latinime-45110a7bcf6daa20ebb04e34045a63b8c9985705.zip
am 3c6ac75c: Merge "Fix messaging for sync now feature, when no account is selected"
* commit '3c6ac75c48e0f57d389305c9c22a3be960682ed2': Fix messaging for sync now feature, when no account is selected
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
index 32880038f..45792fe0e 100644
--- a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
@@ -158,10 +158,10 @@ public final class AccountsSettingsFragment extends SubScreenFragment {
final String currentAccount = getCurrentlySelectedAccount();
if (currentAccount == null) {
syncNowPreference.setEnabled(false);
- syncNowPreference.setSummary(R.string.sync_now_summary);
+ syncNowPreference.setSummary(R.string.sync_now_summary_disabled_signed_out);
} else {
syncNowPreference.setEnabled(true);
- syncNowPreference.setSummary(R.string.sync_now_summary_disabled_signed_out);
+ syncNowPreference.setSummary(R.string.sync_now_summary);
}
}