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

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

@@ -36,12 +36,6 @@ extern "C" {
 #include <GLES/egl.h>
 #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.
  * Should be called once on application initialization.
  * Returns non-zero on success and 0 on failure.
@@ -52,6 +46,11 @@ extern int importGLInit();
  */
 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
 #define IMPORTGL_API extern

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

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