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

Commit 2ead893b authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge "Update input method menu to use proper context." into oc-dev

parents e59c6ef3 8a3b4cbb

services/core/java/com/android/server/InputMethodManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.annotation.Nullable; 
import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.ActivityThread;

import android.app.AlertDialog;

import android.app.AppGlobals;

import android.app.AppOpsManager;
@@ -3562,7 +3563,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    private void showInputMethodMenu(boolean showAuxSubtypes) {

        if (DEBUG) Slog.v(TAG, "Show switching menu. showAuxSubtypes=" + showAuxSubtypes);



        final Context context = mContext;

        final boolean isScreenLocked = isScreenLocked();



        final String lastInputMethodId = mSettings.getSelectedInputMethod();
@@ -3610,7 +3610,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                }

            }



            final Context settingsContext = new ContextThemeWrapper(context,

            final Context settingsContext = new ContextThemeWrapper(

                    ActivityThread.currentActivityThread().getSystemUiContext(),

                    com.android.internal.R.style.Theme_DeviceDefault_Settings);



            mDialogBuilder = new AlertDialog.Builder(settingsContext);