Moved a functionality of setting touchableRegion to InputMethodServiceCompatWrapper.
Change-Id: I8b9fe507885ef5ae7cb09db93a977e23b1bbd0dbmain
parent
b916fab196
commit
24119dfd41
|
@ -20,6 +20,7 @@ import android.content.Intent;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -77,6 +78,18 @@ public class CompatUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Field getField(Class<?> targetClass, String name) {
|
||||||
|
try {
|
||||||
|
return targetClass.getField(name);
|
||||||
|
} catch (SecurityException e) {
|
||||||
|
// ignore
|
||||||
|
return null;
|
||||||
|
} catch (NoSuchFieldException e) {
|
||||||
|
// ignore
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static Object invoke(
|
public static Object invoke(
|
||||||
Object receiver, Object defaultValue, Method method, Object... args) {
|
Object receiver, Object defaultValue, Method method, Object... args) {
|
||||||
if (receiver == null || method == null) return defaultValue;
|
if (receiver == null || method == null) return defaultValue;
|
||||||
|
@ -94,6 +107,28 @@ public class CompatUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Object getFieldValue(Object receiver, Object defaultValue, Field field) {
|
||||||
|
if (receiver == null || field == null) return defaultValue;
|
||||||
|
try {
|
||||||
|
return field.get(receiver);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
return defaultValue;
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setFieldValue(Object receiver, Field field, Object value) {
|
||||||
|
if (receiver == null || field == null) return;
|
||||||
|
try {
|
||||||
|
field.set(receiver, value);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
// ignore
|
||||||
|
} catch (IllegalAccessException e) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static List<InputMethodSubtypeCompatWrapper> copyInputMethodSubtypeListToWrapper(
|
public static List<InputMethodSubtypeCompatWrapper> copyInputMethodSubtypeListToWrapper(
|
||||||
Object listObject) {
|
Object listObject) {
|
||||||
if (!(listObject instanceof List<?>)) return null;
|
if (!(listObject instanceof List<?>)) return null;
|
||||||
|
|
|
@ -62,4 +62,10 @@ public class InputMethodServiceCompatWrapper extends InputMethodService {
|
||||||
SubtypeSwitcher.getInstance().updateSubtype(
|
SubtypeSwitcher.getInstance().updateSubtype(
|
||||||
new InputMethodSubtypeCompatWrapper(subtype));
|
new InputMethodSubtypeCompatWrapper(subtype));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected static void setTouchableRegionCompat(InputMethodService.Insets outInsets,
|
||||||
|
int x, int y, int width, int height) {
|
||||||
|
outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;
|
||||||
|
outInsets.touchableRegion.set(x, y, width, height);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -914,8 +914,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
Log.d(TAG, "Touchable region " + x + ", " + y + ", " + width + ", " + height);
|
Log.d(TAG, "Touchable region " + x + ", " + y + ", " + width + ", " + height);
|
||||||
}
|
}
|
||||||
outInsets.touchableInsets = InputMethodService.Insets.TOUCHABLE_INSETS_REGION;
|
setTouchableRegionCompat(outInsets, x, y, width, height);
|
||||||
outInsets.touchableRegion.set(x, y, width, height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue