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

Merge "Block overflow menu during setup."

main
Dan Zivkovic 2015-03-23 20:13:15 +00:00 committed by Android (Google) Code Review
parent bc1cf0817b 75fc9080a8
commit e02d483187
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,12 @@
package com.android.inputmethod.latin.settings; package com.android.inputmethod.latin.settings;
import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.provider.Settings.Secure;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
@ -68,13 +70,23 @@ public final class SettingsFragment extends InputMethodSettingsFragment {
@Override @Override
public boolean onOptionsItemSelected(final MenuItem item) { 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 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;
}
final int itemId = item.getItemId(); final int itemId = item.getItemId();
if (itemId == MENU_HELP_AND_FEEDBACK) { if (itemId == MENU_HELP_AND_FEEDBACK) {
FeedbackUtils.showHelpAndFeedbackForm(getActivity()); FeedbackUtils.showHelpAndFeedbackForm(activity);
return true; return true;
} }
if (itemId == MENU_ABOUT) { if (itemId == MENU_ABOUT) {
final Intent aboutIntent = FeedbackUtils.getAboutKeyboardIntent(getActivity()); final Intent aboutIntent = FeedbackUtils.getAboutKeyboardIntent(activity);
if (aboutIntent != null) { if (aboutIntent != null) {
startActivity(aboutIntent); startActivity(aboutIntent);
return true; return true;