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

Commit 1b3f178f authored by Ken Wakasa's avatar Ken Wakasa Committed by Android Git Automerger
Browse files

am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select... 

am a7001ee8: Merge "Append IME\'s name to the subtype name in the "Select input method" dialog" into honeycomb-mr1

* commit 'a7001ee8':
  Append IME's name to the subtype name in the "Select input method" dialog
parents 47ffa461 a7001ee8

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