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

am fa22abb9: Merge "Setup wizard status only available on Lollipop++" 

* commit 'fa22abb94dc54650663c2b86313681621135e587':
  Setup wizard status only available on Lollipop++
main
Dan Zivkovic 2015-03-30 21:29:44 +00:00 committed by Android Git Automerger
parent 20e6d83083 fa22abb94d
commit 9ffaa2e3ea
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
View File

@ -18,6 +18,7 @@ package com.android.inputmethod.latin.settings;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
@ -71,11 +72,7 @@ public final class SettingsFragment extends InputMethodSettingsFragment {
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
final Activity activity = getActivity();
final int setupStatus = Secure.getInt(
activity.getContentResolver(),
"user_setup_complete",
0 /* default */);
if (setupStatus == 0) {
if (!isUserSetupComplete(activity)) {
// If setup is not complete, it's not safe to launch Help or other activities
// because they might go to the Play Store. See b/19866981.
return true;
@ -94,4 +91,11 @@ public final class SettingsFragment extends InputMethodSettingsFragment {
}
return super.onOptionsItemSelected(item);
}
private static boolean isUserSetupComplete(final Activity activity) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return true;
}
return Secure.getInt(activity.getContentResolver(), "user_setup_complete", 0) != 0;
}
}