nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am f96bffa6: Suppress important notice when its title message is empty 

* commit 'f96bffa69e5fa01b0bf53fb3af8c8b3539852322':
  Suppress important notice when its title message is empty
main
Tadashi G. Takaoka 2014-03-19 20:58:59 -07:00 committed by Android Git Automerger
parent 75742f839d f96bffa69e
commit 785e59613e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java/src/com/android/inputmethod/latin/utils/ImportantNoticeUtils.java
View File

@ -20,6 +20,7 @@ import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.provider.Settings; import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException; import android.provider.Settings.SettingNotFoundException;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.android.inputmethod.latin.InputAttributes; import com.android.inputmethod.latin.InputAttributes;
@ -82,7 +83,17 @@ public final class ImportantNoticeUtils {
if (inputAttributes == null || inputAttributes.mIsPasswordField) { if (inputAttributes == null || inputAttributes.mIsPasswordField) {
return false; return false;
} }
return hasNewImportantNotice(context) && !isInSystemSetupWizard(context); if (isInSystemSetupWizard(context)) {
return false;
}
if (!hasNewImportantNotice(context)) {
return false;
}
final String importantNoticeTitle = getNextImportantNoticeTitle(context);
if (TextUtils.isEmpty(importantNoticeTitle)) {
return false;
}
return true;
} }
public static void updateLastImportantNoticeVersion(final Context context) { public static void updateLastImportantNoticeVersion(final Context context) {