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

Commit a7001ee8 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Append IME's name to the subtype name in the "Select input method"... 

Merge "Append IME's name to the subtype name in the "Select input method" dialog" into honeycomb-mr1
parents 6e71c954 81f6e3d8

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

+4 −3
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                    enabledSubtypeSet.add(String.valueOf(subtype.hashCode()));

                }

                ArrayList<InputMethodSubtype> subtypes = getSubtypes(imi);

                CharSequence label = imi.loadLabel(pm);

                final CharSequence label = imi.loadLabel(pm);

                if (showSubtypes && enabledSubtypeSet.size() > 0) {

                    final int subtypeCount = imi.getSubtypeCount();

                    for (int j = 0; j < subtypeCount; ++j) {
@@ -1771,8 +1771,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                            int nameResId = subtype.getNameResId();

                            String mode = subtype.getMode();

                            if (nameResId != 0) {

                                title = pm.getText(imi.getPackageName(), nameResId,

                                        imi.getServiceInfo().applicationInfo);

                                title = TextUtils.concat(pm.getText(imi.getPackageName(),

                                        nameResId, imi.getServiceInfo().applicationInfo),

                                        " (", label, ")");

                            } else {

                                CharSequence language = subtype.getLocale();

                                // TODO: Use more friendly Title and UI