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

Commit 35be3dee authored by satok's avatar satok Committed by Android (Google) Code Review
Browse files

Merge "Hide "Configure input method" button when the screen is locked."

parents 4273ed65 f90a33e9

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

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import org.xmlpull.v1.XmlSerializer; 


import android.app.ActivityManagerNative;

import android.app.AlertDialog;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.NotificationManager;

import android.app.PendingIntent;
@@ -161,6 +162,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


    // Ongoing notification

    private final NotificationManager mNotificationManager;

    private final KeyguardManager mKeyguardManager;

    private final Notification mImeSwitcherNotification;

    private final PendingIntent mImeSwitchPendingIntent;

    private final boolean mShowOngoingImeSwitcherForPhones;
@@ -521,6 +523,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
            }

        });



        mKeyguardManager = (KeyguardManager)

                mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mNotificationManager = (NotificationManager)

                mContext.getSystemService(Context.NOTIFICATION_SERVICE);

        mImeSwitcherNotification = new Notification();
@@ -2127,7 +2131,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                        }

                    });



            if (showSubtypes) {

            if (showSubtypes && !(mKeyguardManager.isKeyguardLocked()

                    && mKeyguardManager.isKeyguardSecure())) {

                mDialogBuilder.setPositiveButton(

                        com.android.internal.R.string.configure_input_methods,

                        new DialogInterface.OnClickListener() {