summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Zivkovic <zivkovic@google.com>2015-03-23 10:51:54 -0700
committerThe Android Automerger <android-build@google.com>2015-03-25 18:49:51 -0700
commit4585f3236d681cb39ca5f24c06d72fc6046f9d03 (patch)
tree0f7955bd76a357dfbba6281e83b2f396f237cc99
parent93a5c853bdde0a16d6594043dc51b583e1d72ad7 (diff)
downloadandroid_packages_inputmethods_LatinIME-4585f3236d681cb39ca5f24c06d72fc6046f9d03.tar.gz
android_packages_inputmethods_LatinIME-4585f3236d681cb39ca5f24c06d72fc6046f9d03.tar.bz2
android_packages_inputmethods_LatinIME-4585f3236d681cb39ca5f24c06d72fc6046f9d03.zip
Block overflow menu during setup. DO NOT MERGE
Bug 19866981. Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c (cherry picked from commit 75fc9080a83881e5d8961eb21caa93496a84483e)
-rw-r--r--java/src/com/android/inputmethod/latin/settings/SettingsFragment.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
index 4fc17387f..6c8ab573a 100644
--- a/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
+++ b/java/src/com/android/inputmethod/latin/settings/SettingsFragment.java
@@ -16,10 +16,12 @@
package com.android.inputmethod.latin.settings;
+import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceScreen;
+import android.provider.Settings.Secure;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -67,13 +69,23 @@ 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 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();
if (itemId == MENU_HELP_AND_FEEDBACK) {
- FeedbackUtils.showHelpAndFeedbackForm(getActivity());
+ FeedbackUtils.showHelpAndFeedbackForm(activity);
return true;
}
if (itemId == MENU_ABOUT) {
- final Intent aboutIntent = FeedbackUtils.getAboutKeyboardIntent(getActivity());
+ final Intent aboutIntent = FeedbackUtils.getAboutKeyboardIntent(activity);
if (aboutIntent != null) {
startActivity(aboutIntent);
return true;