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

Merge "Replace match_parent with fill_parent; Declare importGLInit() and importGLDeinit() regardless DISABLE_IMPORTGL (otherwise compiling in c++ may fail)"

Browse Source
This commit is contained in:
David Turner
2011-10-18 01:46:40 -07:00
committed by Android (Google) Code Review
parent ac6db56abd 7a1175701b
commit 207118ad6d
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ndk/platforms/android-4/samples/san-angeles/jni/importgl.h
View File

@@ -36,12 +36,6 @@ extern "C" {
#include <GLES/egl.h> #include <GLES/egl.h>
#endif /* !ANDROID_NDK */ #endif /* !ANDROID_NDK */
/* Use DISABLE_IMPORTGL if you want to link the OpenGL ES at
* compile/link time and not import it dynamically runtime.
*/
#ifndef DISABLE_IMPORTGL
/* Dynamically fetches pointers to the egl & gl functions. /* Dynamically fetches pointers to the egl & gl functions.
* Should be called once on application initialization. * Should be called once on application initialization.
* Returns non-zero on success and 0 on failure. * Returns non-zero on success and 0 on failure.
@@ -52,6 +46,11 @@ extern int importGLInit();
*/ */
extern void importGLDeinit(); extern void importGLDeinit();
/* Use DISABLE_IMPORTGL if you want to link the OpenGL ES at
* compile/link time and not import it dynamically runtime.
*/
#ifndef DISABLE_IMPORTGL
#ifndef IMPORTGL_API #ifndef IMPORTGL_API
#define IMPORTGL_API extern #define IMPORTGL_API extern

6
ndk/platforms/android-4/samples/san-angeles/res/layout/main.xml
View File

@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="match_parent" android:layout_height="fill_parent"
> >
<TextView <TextView
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Hello World, DemoActivity" android:text="Hello World, DemoActivity"
/> />