From 8adedbf47c7ac150d4ac7e6cdbee3ece38f346e7 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 12 Feb 2014 16:52:44 +0900 Subject: Show the suggestion strip for the important notice Bug: 10587358 Change-Id: Ia060a9ca9dfc2e7fe0750536a9fea3b9cc5900c4 --- .../com/android/inputmethod/latin/utils/ImportantNoticeUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java') 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) { -- cgit v1.2.3-83-g751a