commit 3c6ac75c48e0f57d389305c9c22a3be960682ed2
author Jatin Matani <jatinm@google.com> Wed Oct 08 23:40:26 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 08 23:40:27 2014 +0000
tree 3eb7d73948ec180eb01d666b09a00d9f950fec9d
parent 9bda19891ceb5571cb92a164061eb7912c81f2a7
parent f66a6a3bb0a7b6d90793b24d623fc21a588e7ae3

Merge "Fix messaging for sync now feature, when no account is selected"

java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java

diff --git a/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/AccountsSettingsFragment.java
index 3288003..45792fe 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 @@
         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);
         }
     }