start to support custom meta-data

tito · tito · commit c781ad794d49 · 2013-10-31T18:15:15.000+01:00
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -120,3 +120,33 @@ Available options to `build.py`::
                           Minimum Android SDK version to use. Default to 8
     --window              Indicate if the application will be windowed
 
+Meta-data
+---------
+
+.. versionadded:: 1.3
+
+You can extend the `AndroidManifest.xml` with application meta-data. If you are
+using external toolkits like Google Maps, you might want to set your API key in
+the meta-data. You could do it like this::
+
+    ./build.py ... --meta-data com.google.android.maps.v2.API_KEY=YOURAPIKEY
+
+Some meta-data can be used to interact with the behavior of our internal
+component.
+
+.. list-table::
+    :widths: 100 500
+    :header-rows: 1
+
+    * - Token
+      - Description
+    * - `surface.transluent`
+      - If set to 1, the created surface will be transluent (can be used
+        to add background Android widget in the background, or use accelerated
+        widgets)
+    * - `surface.depth`
+      - Size of the depth component, default to 0. 0 means automatic, but you
+        can force it to a specific value. Be warned, some old phone might not
+        support the depth you want.
+    * - `surface.stencil`
+      - Size of the stencil component, default to 8.
diff --git a/src/build.py b/src/build.py
@@ -377,6 +377,8 @@ def make_package(args):
             help='Indicate if the application needs the device to stay on')
     ap.add_argument('command', nargs='*', help='The command to pass to ant (debug, release, installd, installr)')
     ap.add_argument('--add-jar', dest='add_jar', action='append', help='Add a Java .jar to the libs, so you can access its classes with pyjnius. You can specify this argument more than once to include multiple jars')
+    ap.add_argument('--meta-data', dest='meta_data', action='append',
+            help='Custom key=value to add in application metadata')
 
     args = ap.parse_args()
 
diff --git a/src/src/org/renpy/android/SDLSurfaceView.java b/src/src/org/renpy/android/SDLSurfaceView.java
@@ -45,6 +45,7 @@
 import android.os.PowerManager;
 import android.content.pm.PackageManager;
 import android.content.pm.ApplicationInfo;
+import android.graphics.PixelFormat;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -594,11 +595,23 @@ public void run() {
             try {
                 if (configToTest == 0) {
                     Log.i(TAG, "Try to use graphics config R8G8B8A8S8");
-                    ConfigChooser chooser = new ConfigChooser(8, 8, 8, 8, 0, 8);
+                    ConfigChooser chooser = new ConfigChooser(
+							// rgba
+							8, 8, 8, 8,
+							// depth
+							mActivity.mInfo.metaData.getInt("surface:depth", 0),
+							// stencil
+							mActivity.mInfo.metaData.getInt("surface:stencil", 8));
                     mEglConfig = chooser.chooseConfig(mEgl, mEglDisplay);
                 } else if (configToTest == 1) {
                     Log.i(TAG, "Try to use graphics config R5G6B5S8");
-                    ConfigChooser chooser = new ConfigChooser(5, 6, 5, 0, 0, 8);
+                    ConfigChooser chooser = new ConfigChooser(
+							// rgba
+							5, 6, 5, 0,
+							// depth
+							mActivity.mInfo.metaData.getInt("surface:depth", 0),
+							// stencil
+							mActivity.mInfo.metaData.getInt("surface:stencil", 8));
                     mEglConfig = chooser.chooseConfig(mEgl, mEglDisplay);
                 } else {
                     Log.e(TAG, "Unable to find a correct surface for this device !");
@@ -637,6 +650,9 @@ public void run() {
         Log.w(TAG, "Done");
         waitForStart();
 
+		if ( mActivity.mInfo.metaData.getBoolean("surface:transluent") )
+			getHolder().setFormat(PixelFormat.TRANSLUCENT);
+
         nativeResize(mWidth, mHeight);
         nativeInitJavaCallbacks();
         nativeSetEnv("ANDROID_PRIVATE", mFilesDirectory);
diff --git a/src/templates/AndroidManifest.tmpl.xml b/src/templates/AndroidManifest.tmpl.xml
@@ -8,11 +8,15 @@
 
   <application android:label="@string/appName"
                android:icon="@drawable/icon"
+			   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="fullscreen" android:value="{% if args.window %}0{% else %}1{% endif %}"/>
     <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
 
+
     <activity android:name="org.renpy.android.PythonActivity"
               android:label="@string/iconName"
 			  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode{% if android_api >= 13 %}|screenSize{% endif %}"
@@ -89,7 +93,11 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
   {% for perm in args.permissions %}
+  {% if '.' in perm %}
+  <uses-permission android:name="{{ perm }}" />
+  {% else %}
   <uses-permission android:name="android.permission.{{ perm }}" />
+  {% endif %}
   {% endfor %}
 
   {% if args.billing_pubkey %}
