LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Using hard-fp

Browse Source 
- Immersive mode in android-19
- Fixed local reference release in JNI helper
- Misc fixes
Change-Id: I3ab19c2b66648bb7a011c462d9d98e75bc136ce6
This commit is contained in:
Hak Matsuda
2013-11-09 01:03:15 -08:00
committed by Andrew Hsieh
parent 1f1e737907
commit cc69f210a7
13 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
View File

@@ -5,7 +5,7 @@
<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="17" />
android:targetSdkVersion="19" />
<uses-feature android:glEsVersion="0x00020000"></uses-feature>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
<application

8
ndk/platforms/android-17/samples/Teapot/jni/Android.mk
View File

@@ -13,6 +13,14 @@ LOCAL_CFLAGS :=
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv2
LOCAL_STATIC_LIBRARIES := cpufeatures android_native_app_glue ndk_helper
ifneq ($(filter %armeabi-v7a,$(TARGET_ARCH_ABI)),)
LOCAL_CFLAGS += -mhard-float -D_NDK_MATH_NO_SOFTFP=1
LOCAL_LDLIBS += -lm_hard
ifeq (,$(filter -fuse-ld=mcld,$(APP_LDFLAGS) $(LOCAL_LDFLAGS)))
LOCAL_LDFLAGS += -Wl,--no-warn-mismatch
endif
endif
include $(BUILD_SHARED_LIBRARY)
$(call import-module,android/ndk_helper)

2
ndk/platforms/android-17/samples/Teapot/jni/Application.mk
View File

@@ -1,4 +1,4 @@
APP_PLATFORM := android-9
APP_ABI := all
APP_STL := stlport_static
APP_STL := stlport_static

2
ndk/platforms/android-17/samples/Teapot/project.properties
View File

@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=Google Inc.:Google APIs:17
target=Google Inc.:Google APIs:19

8
ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
View File

@@ -42,10 +42,16 @@ public class TeapotNativeActivity extends NativeActivity {
{
getWindow().getDecorView().setSystemUiVisibility(View.STATUS_BAR_HIDDEN);
}
else if(SDK_INT >= 14)
else if(SDK_INT >= 14 && SDK_INT < 19)
{
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LOW_PROFILE);
}
else if(SDK_INT >= 19)
{
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
}
}
// Our popup window, you will call it from your C/C++ code later