fix for android native in sdl2 bootstrap transparent surface

ibobalo · ibobalo · commit 9bc52b658371 · 2015-10-27T14:48:02.000+02:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -31,12 +31,10 @@ public class PythonActivity extends SDLActivity {
 
     public static PythonActivity mActivity = null;
     
-    private ResourceManager resourceManager;
+    private ResourceManager resourceManager = null;
+    private Bundle mMetaData = null;
+    private PowerManager.WakeLock mWakeLock = null;
 
-    // Access to our meta-data
-    private ApplicationInfo ai;
-    private PowerManager.WakeLock wakeLock;
-    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.v(TAG, "My oncreate running");
@@ -63,17 +61,18 @@ protected void onCreate(Bundle savedInstanceState) {
         // nativeSetEnv("ANDROID_ARGUMENT", getFilesDir());
 
         try {
-            ai = act.getPackageManager().getApplicationInfo(
-                    act.getPackageName(), PackageManager.GET_META_DATA);
-            PowerManager pm = (PowerManager) mActivity.getSystemService(Context.POWER_SERVICE);
-            wakeLock = null;
-            if ( (Integer)ai.metaData.get("wakelock") == 1 ) {
-                wakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
+            Log.v(TAG, "Access to our meta-data...");
+            this.mMetaData = this.mActivity.getPackageManager().getApplicationInfo(
+                    this.mActivity.getPackageName(), PackageManager.GET_META_DATA).metaData;
+
+            PowerManager pm = (PowerManager) this.mActivity.getSystemService(Context.POWER_SERVICE);
+            if ( this.mMetaData.getInt("wakelock") == 1 ) {
+                this.mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, "Screen On");
             }
-            if ( ai.metaData.getInt("surface.transparent") != 0 ) {
+            if ( this.mMetaData.getInt("surface.transparent") != 0 ) {
                 Log.v(TAG, "Surface will be transparent.");
-                mSurface.setZOrderOnTop(true);
-                mSurface.getHolder().setFormat(PixelFormat.TRANSPARENT);
+                getSurface().setZOrderOnTop(true);
+                getSurface().getHolder().setFormat(PixelFormat.TRANSPARENT);
             } else {
                 Log.i(TAG, "Surface will NOT be transparent");
             }
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/renpy/android/AssetExtract.java b/pythonforandroid/bootstraps/sdl2/build/src/org/renpy/android/AssetExtract.java
@@ -60,7 +60,7 @@ public boolean extractTar(String asset, String target) {
                 break;
             }
 
-            Log.i("python", "extracting " + entry.getName());
+            Log.v("python", "extracting " + entry.getName());
 
             if (entry.isDirectory()) {
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public boolean extractTar(String asset, String target) {`
`60`	`60`	`break;`
`61`	`61`	`}`
`62`	`62`
`63`		`- Log.i("python", "extracting " + entry.getName());`
	`63`	`+ Log.v("python", "extracting " + entry.getName());`
`64`	`64`
`65`	`65`	`if (entry.isDirectory()) {`
`66`	`66`