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

Commit 4c0a0fc1 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

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

am: 2ead893b

Change-Id: I1de100ecc38e0fc72506b6ecd123ea2cfb86416b
parents c911e0e7 2ead893b

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);