diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-19 19:34:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-19 19:34:21 -0700 |
| commit | 06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68 (patch) | |
| tree | 14cda7bbbdc5e6cabb492d7af1977a2f5548062b /core/jni | |
| parent | 90177e59e5211dd9ab33761ce800e8a86a49d1e2 (diff) | |
| parent | c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a (diff) | |
| download | frameworks_base-06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68.zip frameworks_base-06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68.tar.gz frameworks_base-06a8ceacb0dc2713cb0bb2c93d2a750f2a58db68.tar.bz2 | |
am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.
* commit 'c851ea5672f6e042c2e89b2a2ce4a2467e1fcd2a':
Add new "-swNNNdp" resource qualifier.
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_content_res_Configuration.cpp | 14 | ||||
| -rw-r--r-- | core/jni/android_util_AssetManager.cpp | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/core/jni/android_content_res_Configuration.cpp b/core/jni/android_content_res_Configuration.cpp index 28a43ab..5e09b38 100644 --- a/core/jni/android_content_res_Configuration.cpp +++ b/core/jni/android_content_res_Configuration.cpp @@ -40,6 +40,9 @@ static struct { jfieldID navigationHidden; jfieldID orientation; jfieldID uiMode; + jfieldID screenWidthDp; + jfieldID screenHeightDp; + jfieldID smallestScreenWidthDp; } gConfigurationClassInfo; void android_Configuration_getFromJava( @@ -62,6 +65,11 @@ void android_Configuration_getFromJava( out->orientation = env->GetIntField(clazz, gConfigurationClassInfo.orientation); out->uiMode = env->GetIntField(clazz, gConfigurationClassInfo.uiMode); + + out->screenWidthDp = env->GetIntField(clazz, gConfigurationClassInfo.screenWidthDp); + out->screenHeightDp = env->GetIntField(clazz, gConfigurationClassInfo.screenHeightDp); + out->smallestScreenWidthDp = env->GetIntField(clazz, + gConfigurationClassInfo.smallestScreenWidthDp); } /* @@ -110,6 +118,12 @@ int register_android_content_res_Configuration(JNIEnv* env) "orientation", "I"); GET_FIELD_ID(gConfigurationClassInfo.uiMode, gConfigurationClassInfo.clazz, "uiMode", "I"); + GET_FIELD_ID(gConfigurationClassInfo.screenWidthDp, gConfigurationClassInfo.clazz, + "screenWidthDp", "I"); + GET_FIELD_ID(gConfigurationClassInfo.screenHeightDp, gConfigurationClassInfo.clazz, + "screenHeightDp", "I"); + GET_FIELD_ID(gConfigurationClassInfo.smallestScreenWidthDp, gConfigurationClassInfo.clazz, + "smallestScreenWidthDp", "I"); return AndroidRuntime::registerNativeMethods(env, "android/content/res/Configuration", gMethods, NELEM(gMethods)); diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 7a2d020..636d257 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -532,6 +532,7 @@ static void android_content_AssetManager_setConfiguration(JNIEnv* env, jobject c jint keyboard, jint keyboardHidden, jint navigation, jint screenWidth, jint screenHeight, + jint smallestScreenWidthDp, jint screenWidthDp, jint screenHeightDp, jint screenLayout, jint uiMode, jint sdkVersion) @@ -556,6 +557,7 @@ static void android_content_AssetManager_setConfiguration(JNIEnv* env, jobject c config.navigation = (uint8_t)navigation; config.screenWidth = (uint16_t)screenWidth; config.screenHeight = (uint16_t)screenHeight; + config.smallestScreenWidthDp = (uint16_t)smallestScreenWidthDp; config.screenWidthDp = (uint16_t)screenWidthDp; config.screenHeightDp = (uint16_t)screenHeightDp; config.screenLayout = (uint8_t)screenLayout; @@ -1696,7 +1698,7 @@ static JNINativeMethod gAssetManagerMethods[] = { (void*) android_content_AssetManager_setLocale }, { "getLocales", "()[Ljava/lang/String;", (void*) android_content_AssetManager_getLocales }, - { "setConfiguration", "(IILjava/lang/String;IIIIIIIIIIIII)V", + { "setConfiguration", "(IILjava/lang/String;IIIIIIIIIIIIII)V", (void*) android_content_AssetManager_setConfiguration }, { "getResourceIdentifier","(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", (void*) android_content_AssetManager_getResourceIdentifier }, |