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

Commit 42e230cd authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Consolidate InputMethodUtils"

parents 8f5c69a7 b282726d

core/java/com/android/internal/inputmethod/InputMethodUtils.java

+11 −0
Original line number Diff line number Diff line
@@ -432,6 +432,17 @@ public class InputMethodUtils { 
        }

    }



    public static CharSequence getImeAndSubtypeDisplayName(Context context, InputMethodInfo imi,

            InputMethodSubtype subtype) {

        final CharSequence imiLabel = imi.loadLabel(context.getPackageManager());

        return subtype != null

                ? TextUtils.concat(subtype.getDisplayName(context,

                        imi.getPackageName(), imi.getServiceInfo().applicationInfo),

                                (TextUtils.isEmpty(imiLabel) ?

                                        "" : " - " + imiLabel))

                : imiLabel;

    }



    /**

     * Utility class for putting and getting settings for InputMethod

     * TODO: Move all putters and getters of settings to this class.

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

+3 −10
Original line number Diff line number Diff line
@@ -1511,23 +1511,16 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                final InputMethodInfo imi = mMethodMap.get(mCurMethodId);

                if (imi != null && iconVisibility && needsToShowImeSwitchOngoingNotification()) {

                    // Used to load label

                    final PackageManager pm = mContext.getPackageManager();

                    final CharSequence title = mRes.getText(

                            com.android.internal.R.string.select_input_method);

                    final CharSequence imiLabel = imi.loadLabel(pm);

                    final CharSequence summary = mCurrentSubtype != null

                            ? TextUtils.concat(mCurrentSubtype.getDisplayName(mContext,

                                        imi.getPackageName(), imi.getServiceInfo().applicationInfo),

                                                (TextUtils.isEmpty(imiLabel) ?

                                                        "" : " - " + imiLabel))

                            : imiLabel;

                    final CharSequence summary = InputMethodUtils.getImeAndSubtypeDisplayName(

                            mContext, imi, mCurrentSubtype);



                    mImeSwitcherNotification.setLatestEventInfo(

                            mContext, title, summary, mImeSwitchPendingIntent);

                    if (mNotificationManager != null) {

                        if (DEBUG) {

                            Slog.d(TAG, "--- show notification: label =  " + imiLabel

                                    + ", summary = " + summary);

                            Slog.d(TAG, "--- show notification: label =  " + summary);

                        }

                        mNotificationManager.notifyAsUser(null,

                                com.android.internal.R.string.select_input_method,