diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/input/InputManager.java | 11 | ||||
| -rw-r--r-- | core/java/com/android/internal/inputmethod/InputMethodSubtypeHandle.java | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index fdea5a2f9351..87895f7e612e 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -17,7 +17,6 @@ package android.hardware.input; import android.annotation.IntDef; -import android.annotation.Nullable; import android.annotation.SdkConstant; import android.annotation.SdkConstant.SdkConstantType; import android.annotation.SystemService; @@ -709,16 +708,14 @@ public final class InputManager { * * @param identifier The identifier for the input device. * @param inputMethodInfo The input method. - * @param inputMethodSubtype The input method subtype. {@code null} if this input method does - * not support any subtype. + * @param inputMethodSubtype The input method subtype. * * @return The associated {@link KeyboardLayout}, or null if one has not been set. * * @hide */ - @Nullable public KeyboardLayout getKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier, - InputMethodInfo inputMethodInfo, @Nullable InputMethodSubtype inputMethodSubtype) { + InputMethodInfo inputMethodInfo, InputMethodSubtype inputMethodSubtype) { try { return mIm.getKeyboardLayoutForInputDevice( identifier, inputMethodInfo, inputMethodSubtype); @@ -733,13 +730,13 @@ public final class InputManager { * @param identifier The identifier for the input device. * @param inputMethodInfo The input method with which to associate the keyboard layout. * @param inputMethodSubtype The input method subtype which which to associate the keyboard - * layout. {@code null} if this input method does not support any subtype. + * layout. * @param keyboardLayoutDescriptor The descriptor of the keyboard layout to set * * @hide */ public void setKeyboardLayoutForInputDevice(InputDeviceIdentifier identifier, - InputMethodInfo inputMethodInfo, @Nullable InputMethodSubtype inputMethodSubtype, + InputMethodInfo inputMethodInfo, InputMethodSubtype inputMethodSubtype, String keyboardLayoutDescriptor) { try { mIm.setKeyboardLayoutForInputDevice(identifier, inputMethodInfo, diff --git a/core/java/com/android/internal/inputmethod/InputMethodSubtypeHandle.java b/core/java/com/android/internal/inputmethod/InputMethodSubtypeHandle.java index 04d7f9b2c9c0..975021e85cce 100644 --- a/core/java/com/android/internal/inputmethod/InputMethodSubtypeHandle.java +++ b/core/java/com/android/internal/inputmethod/InputMethodSubtypeHandle.java @@ -16,7 +16,6 @@ package com.android.internal.inputmethod; -import android.annotation.Nullable; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; @@ -27,12 +26,12 @@ public class InputMethodSubtypeHandle { private final String mInputMethodId; private final int mSubtypeId; - public InputMethodSubtypeHandle(InputMethodInfo info, @Nullable InputMethodSubtype subtype) { + public InputMethodSubtypeHandle(InputMethodInfo info, InputMethodSubtype subtype) { mInputMethodId = info.getId(); if (subtype != null) { mSubtypeId = subtype.hashCode(); } else { - mSubtypeId = InputMethodUtils.NOT_A_SUBTYPE_ID; + mSubtypeId = 0; } } |