activate screenSize configchanges only if api >= 13. closes kivy#148

tito · tito · commit 8f4d23a04c97 · 2013-10-15T13:12:03.000+02:00
diff --git a/src/build.py b/src/build.py
@@ -246,6 +246,9 @@ def make_package(args):
             print 'Invalid --ouya-category argument. should be one of GAME or APP'
             sys.exit(-1)
 
+    # Get target android API
+    android_api = int(os.environ.get('ANDROIDAPI', '8'))
+
     # Render the various templates into control files.
     render(
         'AndroidManifest.tmpl.xml',
@@ -255,7 +258,7 @@ def make_package(args):
         url_scheme=url_scheme,
         intent_filters=intent_filters,
         manifest_extra=manifest_extra,
-        )
+        android_api=android_api)
 
     render(
         'Configuration.tmpl.java',
@@ -277,9 +280,9 @@ def make_package(args):
         args=args)
 
     # Update the project to a recent version.
-    android_api = 'android-%s' % os.environ.get('ANDROIDAPI', '8')
     try:
-        subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t', android_api])
+        subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t',
+            'android-{}'.format(android_api)])
     except (OSError, IOError):
         print 'An error occured while calling', ANDROID, 'update'
         print 'Your PATH must include android tools.'
diff --git a/src/templates/AndroidManifest.tmpl.xml b/src/templates/AndroidManifest.tmpl.xml
@@ -15,7 +15,7 @@
 
     <activity android:name="org.renpy.android.PythonActivity"
               android:label="@string/iconName"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|screenSize"
+			  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode{% if android_api >= 13 %}|screenSize{% endif %}"
               android:launchMode="singleTask"
               android:process=":python"
               android:screenOrientation="{{ args.orientation }}"
