added sdl2 bootstrap meta and presplash

bob · bob · commit fdcf5e7c28d1 · 2015-10-27T12:09:31.000+02:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -249,6 +249,10 @@ def make_package(args):
     default_icon = 'templates/kivy-icon.png'
     shutil.copy(args.icon or default_icon, 'res/drawable/icon.png')
 
+    default_presplash = 'templates/kivy-presplash.jpg'
+    shutil.copy(args.presplash or default_presplash,
+                'res/drawable/presplash.jpg')
+
     versioned_name = (args.name.replace(' ', '').replace('\'', '') +
                       '-' + args.version)
 
@@ -324,6 +328,11 @@ def parse_args(args=None):
                     help='A png file to use as the icon for the application.')
     ap.add_argument('--permission', dest='permissions', action='append',
                     help='The permissions to give this app.')
+    ap.add_argument('--meta-data', dest='meta_data', action='append',
+                    help='Custom key=value to add in application metadata')
+    ap.add_argument('--presplash', dest='presplash',
+                    help=('A jpeg file to use as a screen while the '
+                          'application is loading.'))
 
     if args is None:
         args = sys.argv[1:]
@@ -333,6 +342,9 @@ def parse_args(args=None):
     if args.permissions is None:
         args.permissions = []
 
+    if args.meta_data is None:
+        args.meta_data = []
+
     make_package(args)
 
 if __name__ == "__main__":
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -7,22 +7,35 @@
 import java.io.FileWriter;
 import java.io.File;
 
+import android.view.ViewGroup;
+import android.view.SurfaceView;
 import android.app.Activity;
 import android.util.Log;
 import android.widget.Toast;
 import android.os.Bundle;
+import android.os.PowerManager;
+import android.graphics.PixelFormat;
+import android.view.SurfaceHolder;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ApplicationInfo;
 
 import org.libsdl.app.SDLActivity;
 
 import org.renpy.android.ResourceManager;
 import org.renpy.android.AssetExtract;
 
+
 public class PythonActivity extends SDLActivity {
     private static final String TAG = "PythonActivity";
 
     public static PythonActivity mActivity = null;
     
     private ResourceManager resourceManager;
+
+    // Access to our meta-data
+    private ApplicationInfo ai;
+    private PowerManager.WakeLock wakeLock;
     
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -48,6 +61,24 @@ 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");
+            }
+            if ( ai.metaData.getInt("surface.transparent") != 0 ) {
+                Log.v(TAG, "Surface will be transparent.");
+                mSurface.setZOrderOnTop(true);
+                mSurface.getHolder().setFormat(PixelFormat.TRANSPARENT);
+            } else {
+                Log.i(TAG, "Surface will NOT be transparent");
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
     }
     
     // This is just overrides the normal SDLActivity, which just loads
@@ -169,6 +200,13 @@ public void unpackData(final String resource, File target) {
                 Log.w("python", e);
             }
         }
+    }
+    
+    public static ViewGroup getLayout() {
+        return   mLayout;
+    }
 
+    public static SurfaceView getSurface() {
+        return   mSurface;
     }
 }
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.xml.tmpl b/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.xml.tmpl
@@ -38,6 +38,11 @@
                  android:allowBackup="true"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
                  android:hardwareAccelerated="true" >
+
+        {% for m in args.meta_data %}
+        <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
+        <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
+
         <activity android:name="org.kivy.android.PythonActivity"
                   android:label="@string/app_name"
                   android:configChanges="keyboardHidden|orientation"
