From 7a1175701b6e63281fc255f4df06c4a7cc0a33ce Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Thu, 1 Sep 2011 13:34:05 +0800
Subject: [PATCH] Replace match_parent with fill_parent; Declare importGLInit()
 and importGLDeinit() regardless DISABLE_IMPORTGL (otherwise compiling in c++
 may fail)

Change-Id: I6ed8bcbfe6d0500f2f0564e3dd06e2b6aafa35ff
---
 .../android-4/samples/san-angeles/jni/importgl.h      | 11 +++++------
 .../android-4/samples/san-angeles/res/layout/main.xml |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/ndk/platforms/android-4/samples/san-angeles/jni/importgl.h b/ndk/platforms/android-4/samples/san-angeles/jni/importgl.h
index b05e0c84f..a19a3a7a3 100644
--- a/ndk/platforms/android-4/samples/san-angeles/jni/importgl.h
+++ b/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
diff --git a/ndk/platforms/android-4/samples/san-angeles/res/layout/main.xml b/ndk/platforms/android-4/samples/san-angeles/res/layout/main.xml
index ca19a18ae..3e76662d6 100644
--- a/ndk/platforms/android-4/samples/san-angeles/res/layout/main.xml
+++ b/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"
     />