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

Commit 083167ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hide IME Switcher settings during setup flow" into main

parents 08a2b927 97b47c2a

services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java

+6 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.content.Context; 
import android.content.DialogInterface;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Printer;

import android.util.Slog;
@@ -115,7 +116,11 @@ final class InputMethodMenuControllerNew { 
        final var selectedImi = selectedIndex >= 0 ? items.get(selectedIndex).mImi : null;

        final var languageSettingsIntent = selectedImi != null

                ? selectedImi.createImeLanguageSettingsActivityIntent() : null;

        final boolean hasLanguageSettingsButton = languageSettingsIntent != null;

        final boolean isDeviceProvisioned = Settings.Global.getInt(

                dialogWindowContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED,

                0) != 0;

        final boolean hasLanguageSettingsButton = languageSettingsIntent != null

                && isDeviceProvisioned;

        if (hasLanguageSettingsButton) {

            final View buttonBar = contentView

                    .requireViewById(com.android.internal.R.id.button_bar);