summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Cosmin Băieș <cosminbaies@google.com> 2024-08-22 14:29:46 +0200
committer Cosmin Băieș <cosminbaies@google.com> 2024-08-23 11:50:34 +0200
commit97b47c2a92568aff0a96cf68108c31e8af82f94c (patch)
tree3d0de97b7edad34d22ac7dc4228514bbf073a5fd
parent48d98a08908f494c524a2cae27bce3df8c382a83 (diff)
Hide IME Switcher settings during setup flow
This starts taking into account whether the user is currently in the setup flow when determining whether the IME Switcher menu settings button should be visible. Flag: EXEMPT bugfix Test: atest InputMethodManagerTest#testInputMethodPickerOpenLanguageSettings InputMethodManagerTest#testInputMethodPickerNoLanguageSettingsWhenDeviceNotProvisioned Bug: 361526868 Change-Id: Ic472201599516c65c27dafc4476cd85d83ac8fac
-rw-r--r--services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java b/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java
index d9e9e0021028..cf2cdc1500f8 100644
--- a/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java
+++ b/services/core/java/com/android/server/inputmethod/InputMethodMenuControllerNew.java
@@ -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);