add build.py --window options to not doing fullscreen app. This is storing a fullscreen metadata attribute in the AndroidManifest.xml.

tito · tito · commit 7afd219e67d6 · 2013-04-29T09:03:16.000+02:00
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -4,18 +4,20 @@ Usage
 Step 1: compile the toolchain
 -----------------------------
 
-If you want to compile the toolchain with only kivy and pyjnius module ::
+If you want to compile the toolchain with only kivy module::
 
-    ./distribute.sh -m "pyjnius kivy"
+    ./distribute.sh -m "kivy"
 
 After a long time, you'll get a "dist/default" directory containing all the compiled
 libraries and build.py script to package your application using thoses
 libraries.
 
-You can include other modules (or "recipes") to compile using `-m`::
+You can include other modules (or "recipes") to compile using `-m`. Put the C
+libraries to compile before any Python module, order is important.
+
+    ./distribute.sh -m "openssl kivy"
+    ./distribute.sh -m "pil ffmpeg kivy"
 
-    ./distribute.sh -m "openssl pyjnius kivy"
-    ./distribute.sh -m "pil ffmpeg pyjnius kivy"
 
 For a full list, refer to :ref:`recipes`
 
@@ -94,11 +96,13 @@ Available options to `build.py`::
                           "preferExternal" or "internalOnly".
     --compile-pyo         Compile all .py files to .pyo, and only distribute the
                           compiled bytecode.
+    --intent-filters INTENT_FILTERS
+                          Add intent-filters xml rules to AndroidManifest.xml
     --blacklist BLACKLIST
                           Use a blacklist file to match unwanted file in the
                           final APK
-
-    --intent-filters FILE
-                          Inject the content of FILE into the activity
-                          definition in the AndroidManifest.xml
+    --sdk SDK_VERSION     Android SDK version to use. Default to 8
+    --minsdk MIN_SDK_VERSION
+                          Minimum Android SDK version to use. Default to 8
+    --window              Indicate if the application will be windowed
 
diff --git a/src/build.py b/src/build.py
@@ -335,6 +335,8 @@ def make_package(args):
         help='Use a blacklist file to match unwanted file in the final APK')
     ap.add_argument('--sdk', dest='sdk_version', default='8', help='Android SDK version to use. Default to 8')
     ap.add_argument('--minsdk', dest='min_sdk_version', default='8', help='Minimum Android SDK version to use. Default to 8')
+    ap.add_argument('--window', dest='window', action='store_true',
+            help='Indicate if the application will be windowed')
     ap.add_argument('command', nargs='*', help='The command to pass to ant (debug, release, installd, installr)')
 
     args = ap.parse_args()
diff --git a/src/src/org/renpy/android/PythonActivity.java b/src/src/org/renpy/android/PythonActivity.java
@@ -22,6 +22,8 @@
 import android.util.Log;
 import android.util.DisplayMetrics;
 import android.os.Debug;
+import android.content.pm.PackageManager;
+import android.content.pm.ApplicationInfo;
 
 import java.io.InputStream;
 import java.io.FileInputStream;
@@ -105,10 +107,19 @@ protected void onCreate(Bundle savedInstanceState) {
             mPath = getFilesDir();
         }
 
-        // go to fullscreen mode
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                             WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+        // go to fullscreen mode if requested
+        try {
+            ApplicationInfo ai = this.getPackageManager().getApplicationInfo(
+                    this.getPackageName(), PackageManager.GET_META_DATA);
+            Log.v("python", "metadata fullscreen is" + ai.metaData.get("fullscreen"));
+            if ( (Integer)ai.metaData.get("fullscreen") == 1 ) {
+                getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+        }
 
         // Start showing an SDLSurfaceView.
         mView = new SDLSurfaceView(
diff --git a/src/templates/AndroidManifest.tmpl.xml b/src/templates/AndroidManifest.tmpl.xml
@@ -10,6 +10,12 @@
                android:icon="@drawable/icon"
                >
 
+    {% if args.window %}
+    <meta-data android:name="fullscreen" android:value="0"/>
+    {% else %}
+    <meta-data android:name="fullscreen" android:value="1"/>
+    {% 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"
