Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75fc9080 authored by Dan Zivkovic's avatar Dan Zivkovic
Browse files

Block overflow menu during setup.

Bug 19866981.

Change-Id: I757dacaa29a132c65841b9aaa2cc070ed9fa712c
parent 13271bfd
Loading
Loading
Loading
Loading
+14 −2
Original line number Diff line number Diff line
@@ -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;
@@ -68,13 +70,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;