diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-09 19:00:59 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-05-09 19:00:59 -0700 |
| commit | aa9d84c37e05f696ec158dac98ce38cf41e18314 (patch) | |
| tree | 49a8e08d51840eec7ff20b624c59408f2f7523aa /services/jni | |
| parent | 28e77e616d8f005c8e07d6f28a83f8ca9772aedf (diff) | |
| parent | 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a (diff) | |
| download | frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.zip frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.tar.gz frameworks_base-aa9d84c37e05f696ec158dac98ce38cf41e18314.tar.bz2 | |
resolved conflicts for merge of 05be6d6f to master
Change-Id: Ic6a6c5bb300f6f1d43f9ed550b284282b4f16212
Diffstat (limited to 'services/jni')
| -rw-r--r-- | services/jni/com_android_server_InputWindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/jni/com_android_server_InputWindow.cpp b/services/jni/com_android_server_InputWindow.cpp index 99f625c..012ce21 100644 --- a/services/jni/com_android_server_InputWindow.cpp +++ b/services/jni/com_android_server_InputWindow.cpp @@ -38,6 +38,7 @@ static struct { jfieldID frameTop; jfieldID frameRight; jfieldID frameBottom; + jfieldID scaleFactor; jfieldID touchableRegion; jfieldID visible; jfieldID canReceiveKeys; @@ -100,6 +101,8 @@ void android_server_InputWindow_toNative( gInputWindowClassInfo.frameRight); outInputWindow->frameBottom = env->GetIntField(inputWindowObj, gInputWindowClassInfo.frameBottom); + outInputWindow->scaleFactor = env->GetFloatField(inputWindowObj, + gInputWindowClassInfo.scaleFactor); jobject regionObj = env->GetObjectField(inputWindowObj, gInputWindowClassInfo.touchableRegion); @@ -174,6 +177,9 @@ int register_android_server_InputWindow(JNIEnv* env) { GET_FIELD_ID(gInputWindowClassInfo.frameBottom, clazz, "frameBottom", "I"); + GET_FIELD_ID(gInputWindowClassInfo.scaleFactor, clazz, + "scaleFactor", "F"); + GET_FIELD_ID(gInputWindowClassInfo.touchableRegion, clazz, "touchableRegion", "Landroid/graphics/Region;"); |