aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2014-02-14 04:07:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-02-14 04:07:46 +0000
commit4197c6f3ab1db7d37bfb5fca05bd7169504f451e (patch)
treea2c096df9dd2efdf9b388ae225bb4b34d9b7c55a /java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
parenta2c8e166e9d680ee0121f1e01c2f33305623c59d (diff)
parent8adedbf47c7ac150d4ac7e6cdbee3ece38f346e7 (diff)
downloadlatinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.tar.gz
latinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.tar.xz
latinime-4197c6f3ab1db7d37bfb5fca05bd7169504f451e.zip
Merge "Show the suggestion strip for the important notice"
Diffstat (limited to 'java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java b/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
index 4a0823155..604c36488 100644
--- a/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
+++ b/java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
@@ -42,7 +42,7 @@ public final class ImportantNoticeUtils {
// This utility class is not publicly instantiable.
}
- public static boolean isInSystemSetupWizard(final Context context) {
+ private static boolean isInSystemSetupWizard(final Context context) {
try {
final int userSetupComplete = Settings.Secure.getInt(
context.getContentResolver(), Settings_Secure_USER_SETUP_COMPLETE);
@@ -62,10 +62,11 @@ public final class ImportantNoticeUtils {
return context.getResources().getInteger(R.integer.config_important_notice_version);
}
- public static boolean hasNewImportantNotice(final Context context) {
+ public static boolean hasNewImportantNoticeAndNotInSetupWizard(final Context context) {
final SharedPreferences prefs = getImportantNoticePreferences(context);
final int lastVersion = prefs.getInt(KEY_IMPORTANT_NOTICE_VERSION, 0);
- return getCurrentImportantNoticeVersion(context) > lastVersion;
+ return getCurrentImportantNoticeVersion(context) > lastVersion
+ && !isInSystemSetupWizard(context);
}
public static void updateLastImportantNoticeVersion(final Context context) {