am dd8e50f4: am cf39bdf3: Add support for switching between multiple keyboard layouts. (534e6488) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/IInputManager.aidl

+7 −2

Original line number	Diff line number	Diff line
		@@ -41,8 +41,13 @@ interface IInputManager {
		// Keyboard layouts configuration.
		KeyboardLayout[] getKeyboardLayouts();
		KeyboardLayout getKeyboardLayout(String keyboardLayoutDescriptor);
		String getKeyboardLayoutForInputDevice(String inputDeviceDescriptor);
		void setKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String getCurrentKeyboardLayoutForInputDevice(String inputDeviceDescriptor);
		void setCurrentKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor);
		String[] getKeyboardLayoutsForInputDevice(String inputDeviceDescriptor);
		void addKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor);
		void removeKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor);

		// Registers an input devices changed listener.

core/java/android/hardware/input/InputManager.java

+128 −12

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.hardware.input;

		import com.android.internal.util.ArrayUtils;

		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.content.Context;
		@@ -216,6 +218,41 @@ public final class InputManager {
		}
		}

		/**
		* Gets information about the input device with the specified descriptor.
		* @param descriptor The input device descriptor.
		* @return The input device or null if not found.
		* @hide
		*/
		public InputDevice getInputDeviceByDescriptor(String descriptor) {
		if (descriptor == null) {
		throw new IllegalArgumentException("descriptor must not be null.");
		}

		synchronized (mInputDevicesLock) {
		populateInputDevicesLocked();

		int numDevices = mInputDevices.size();
		for (int i = 0; i < numDevices; i++) {
		InputDevice inputDevice = mInputDevices.valueAt(i);
		if (inputDevice == null) {
		int id = mInputDevices.keyAt(i);
		try {
		inputDevice = mIm.getInputDevice(id);
		} catch (RemoteException ex) {
		// Ignore the problem for the purposes of this method.
		continue;
		}
		mInputDevices.setValueAt(i, inputDevice);
		}
		if (descriptor.equals(inputDevice.getDescriptor())) {
		return inputDevice;
		}
		}
		return null;
		}
		}

		/**
		* Gets the ids of all input devices in the system.
		* @return The input device ids.
		@@ -332,50 +369,129 @@ public final class InputManager {
		}

		/**
		* Gets the keyboard layout descriptor for the specified input device.
		* Gets the current keyboard layout descriptor for the specified input device.
		*
		* @param inputDeviceDescriptor The input device descriptor.
		* @return The keyboard layout descriptor, or null if unknown or if the default
		* keyboard layout will be used.
		* @return The keyboard layout descriptor, or null if no keyboard layout has been set.
		*
		* @hide
		*/
		public String getKeyboardLayoutForInputDevice(String inputDeviceDescriptor) {
		public String getCurrentKeyboardLayoutForInputDevice(String inputDeviceDescriptor) {
		if (inputDeviceDescriptor == null) {
		throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
		}

		try {
		return mIm.getKeyboardLayoutForInputDevice(inputDeviceDescriptor);
		return mIm.getCurrentKeyboardLayoutForInputDevice(inputDeviceDescriptor);
		} catch (RemoteException ex) {
		Log.w(TAG, "Could not get keyboard layout for input device.", ex);
		Log.w(TAG, "Could not get current keyboard layout for input device.", ex);
		return null;
		}
		}

		/**
		* Sets the keyboard layout descriptor for the specified input device.
		* Sets the current keyboard layout descriptor for the specified input device.
		* <p>
		* This method may have the side-effect of causing the input device in question
		* to be reconfigured.
		* </p>
		*
		* @param inputDeviceDescriptor The input device descriptor.
		* @param keyboardLayoutDescriptor The keyboard layout descriptor, or null to remove
		* the mapping so that the default keyboard layout will be used for the input device.
		* @param keyboardLayoutDescriptor The keyboard layout descriptor to use, must not be null.
		*
		* @hide
		*/
		public void setKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		public void setCurrentKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor) {
		if (inputDeviceDescriptor == null) {
		throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
		}
		if (keyboardLayoutDescriptor == null) {
		throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");
		}

		try {
		mIm.setCurrentKeyboardLayoutForInputDevice(inputDeviceDescriptor,
		keyboardLayoutDescriptor);
		} catch (RemoteException ex) {
		Log.w(TAG, "Could not set current keyboard layout for input device.", ex);
		}
		}

		/**
		* Gets all keyboard layout descriptors that are enabled for the specified input device.
		*
		* @param inputDeviceDescriptor The input device descriptor.
		* @return The keyboard layout descriptors.
		*
		* @hide
		*/
		public String[] getKeyboardLayoutsForInputDevice(String inputDeviceDescriptor) {
		if (inputDeviceDescriptor == null) {
		throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
		}

		try {
		return mIm.getKeyboardLayoutsForInputDevice(inputDeviceDescriptor);
		} catch (RemoteException ex) {
		Log.w(TAG, "Could not get keyboard layouts for input device.", ex);
		return ArrayUtils.emptyArray(String.class);
		}
		}

		/**
		* Adds the keyboard layout descriptor for the specified input device.
		* <p>
		* This method may have the side-effect of causing the input device in question
		* to be reconfigured.
		* </p>
		*
		* @param inputDeviceDescriptor The input device descriptor.
		* @param keyboardLayoutDescriptor The descriptor of the keyboard layout to add.
		*
		* @hide
		*/
		public void addKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor) {
		if (inputDeviceDescriptor == null) {
		throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
		}
		if (keyboardLayoutDescriptor == null) {
		throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");
		}

		try {
		mIm.addKeyboardLayoutForInputDevice(inputDeviceDescriptor, keyboardLayoutDescriptor);
		} catch (RemoteException ex) {
		Log.w(TAG, "Could not add keyboard layout for input device.", ex);
		}
		}

		/**
		* Removes the keyboard layout descriptor for the specified input device.
		* <p>
		* This method may have the side-effect of causing the input device in question
		* to be reconfigured.
		* </p>
		*
		* @param inputDeviceDescriptor The input device descriptor.
		* @param keyboardLayoutDescriptor The descriptor of the keyboard layout to remove.
		*
		* @hide
		*/
		public void removeKeyboardLayoutForInputDevice(String inputDeviceDescriptor,
		String keyboardLayoutDescriptor) {
		if (inputDeviceDescriptor == null) {
		throw new IllegalArgumentException("inputDeviceDescriptor must not be null");
		}
		if (keyboardLayoutDescriptor == null) {
		throw new IllegalArgumentException("keyboardLayoutDescriptor must not be null");
		}

		try {
		mIm.setKeyboardLayoutForInputDevice(inputDeviceDescriptor, keyboardLayoutDescriptor);
		mIm.removeKeyboardLayoutForInputDevice(inputDeviceDescriptor, keyboardLayoutDescriptor);
		} catch (RemoteException ex) {
		Log.w(TAG, "Could not set keyboard layout for input device.", ex);
		Log.w(TAG, "Could not remove keyboard layout for input device.", ex);
		}
		}

core/java/android/view/WindowManagerPolicy.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -386,6 +386,12 @@ public interface WindowManagerPolicy {
		*/
		public InputChannel monitorInput(String name);

		/**
		* Switch the keyboard layout for the given device.
		* Direction should be +1 or -1 to go to the next or previous keyboard layout.
		*/
		public void switchKeyboardLayout(int deviceId, int direction);

		public void shutdown();
		public void rebootSafeMode();
		}

core/res/res/drawable-hdpi/ic_settings_language.png

0 → 100755

+986 B

Loading image diff...

core/res/res/drawable-mdpi/ic_settings_language.png

0 → 100644

+756 B

Loading image diff...