}
private void showKeyboardLayoutDialog(InputDeviceIdentifier inputDeviceIdentifier) {
- KeyboardLayoutDialogFragment fragment = new KeyboardLayoutDialogFragment(
- inputDeviceIdentifier);
- fragment.setTargetFragment(this, 0);
- fragment.show(getActivity().getFragmentManager(), "keyboardLayout");
+ KeyboardLayoutDialogFragment fragment = (KeyboardLayoutDialogFragment)
+ getFragmentManager().findFragmentByTag("keyboardLayout");
+ if (fragment == null) {
+ fragment = new KeyboardLayoutDialogFragment(inputDeviceIdentifier);
+ fragment.setTargetFragment(this, 0);
+ fragment.show(getActivity().getFragmentManager(), "keyboardLayout");
+ }
}
@Override
private int mInputDeviceId = -1;
private InputManager mIm;
private KeyboardLayoutAdapter mAdapter;
+ private boolean mHasShownLayoutSelectionScreen;
public KeyboardLayoutDialogFragment() {
}
dialog.getListView().setItemChecked(data.current, true);
}
updateSwitchHintVisibility();
+ showSetupKeyboardLayoutsIfNecessary();
}
@Override
}
}
+ private void showSetupKeyboardLayoutsIfNecessary() {
+ AlertDialog dialog = (AlertDialog)getDialog();
+ if (dialog != null
+ && mAdapter.getCount() == 1 && mAdapter.getItem(0) == null
+ && !mHasShownLayoutSelectionScreen) {
+ mHasShownLayoutSelectionScreen = true;
+ ((OnSetupKeyboardLayoutsListener)getTargetFragment()).onSetupKeyboardLayouts(
+ mInputDeviceIdentifier);
+ }
+ }
+
private static final class KeyboardLayoutAdapter extends ArrayAdapter<KeyboardLayout> {
private final LayoutInflater mInflater;
private int mCheckedItem = -1;
public Keyboards loadInBackground() {
Keyboards keyboards = new Keyboards();
InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE);
- String[] keyboardLayoutDescriptors = im.getKeyboardLayoutsForInputDevice(
+ String[] keyboardLayoutDescriptors = im.getEnabledKeyboardLayoutsForInputDevice(
mInputDeviceIdentifier);
for (String keyboardLayoutDescriptor : keyboardLayoutDescriptors) {
KeyboardLayout keyboardLayout = im.getKeyboardLayout(keyboardLayoutDescriptor);
public interface OnSetupKeyboardLayoutsListener {
public void onSetupKeyboardLayouts(InputDeviceIdentifier mInputDeviceIdentifier);
}
-}
\ No newline at end of file
+}
}
mIm = (InputManager)getSystemService(Context.INPUT_SERVICE);
- mKeyboardLayouts = mIm.getKeyboardLayouts();
+ mKeyboardLayouts = mIm.getKeyboardLayoutsForInputDevice(mInputDeviceIdentifier);
Arrays.sort(mKeyboardLayouts);
setPreferenceScreen(createPreferenceHierarchy());
}
}
private void updateCheckedState() {
- String[] enabledKeyboardLayouts = mIm.getKeyboardLayoutsForInputDevice(
+ String[] enabledKeyboardLayouts = mIm.getEnabledKeyboardLayoutsForInputDevice(
mInputDeviceIdentifier);
Arrays.sort(enabledKeyboardLayouts);