Merge "Sort keyboard layouts" into main (1dde9a3a) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/inputmethod/NewKeyboardLayoutPickerController.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ public class NewKeyboardLayoutPickerController extends BasePreferenceController
		mFinalSelectedLayout = mLayout;
		mKeyboardLayouts = mIm.getKeyboardLayoutListForInputDevice(
		mInputDeviceIdentifier, mUserId, mInputMethodInfo, mInputMethodSubtype);
		NewKeyboardSettingsUtils.sortKeyboardLayoutsByLabel(mKeyboardLayouts);
		parent.getActivity().setTitle(mTitle);
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import android.view.inputmethod.InputMethodManager;
		import android.view.inputmethod.InputMethodSubtype;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Comparator;
		import java.util.List;

		/**
		@@ -123,4 +125,11 @@ public class NewKeyboardSettingsUtils {
		InputDeviceIdentifier identifier, InputMethodInfo info, InputMethodSubtype subtype) {
		return inputManager.getKeyboardLayoutForInputDevice(identifier, userId, info, subtype);
		}

		static void sortKeyboardLayoutsByLabel(KeyboardLayout[] keyboardLayouts) {
		Arrays.sort(
		keyboardLayouts,
		Comparator.comparing(KeyboardLayout::getLabel)
		);
		}
		}