Merge pull request kivy#1256 from SomberNight/manifest_set_launchMode

akshayaurora · web-flow · commit 93759f36ba45 · 2018-04-10T17:19:11.000+05:30
allow setting launchMode for the main activity in the manifest
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -297,6 +297,8 @@ def make_package(args):
     
     args.add_activity = args.add_activity or []
 
+    args.activity_launch_mode = args.activity_launch_mode or ''
+
     if args.extra_source_dirs:
         esd = []
         for spec in args.extra_source_dirs:
@@ -514,6 +516,8 @@ def parse_args(args=None):
                           'the appropriate environment variables.'))
     ap.add_argument('--add-activity', dest='add_activity', action='append',
                     help='Add this Java class as an Activity to the manifest.')
+    ap.add_argument('--activity-launch-mode', dest='activity_launch_mode',
+                    help='Set the launch mode of the main activity in the manifest.')
 
     if args is None:
         args = sys.argv[1:]
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml
@@ -65,6 +65,9 @@
                   android:label="@string/app_name"
                   android:configChanges="keyboardHidden|orientation{% if args.min_sdk_version >= 13 %}|screenSize{% endif %}"
                   android:screenOrientation="{{ args.orientation }}"
+                  {% if args.activity_launch_mode %}
+                  android:launchMode="{{ args.activity_launch_mode }}"
+                  {% endif %}
                   >
 
             {% if args.launcher %}

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,9 @@`
`65`	`65`	`android:label="@string/app_name"`
`66`	`66`	`android:configChanges="keyboardHidden\|orientation{% if args.min_sdk_version >= 13 %}\|screenSize{% endif %}"`
`67`	`67`	`android:screenOrientation="{{ args.orientation }}"`
	`68`	`+ {% if args.activity_launch_mode %}`
	`69`	`+ android:launchMode="{{ args.activity_launch_mode }}"`
	`70`	`+ {% endif %}`
`68`	`71`	`>`
`69`	`72`
`70`	`73`	`{% if args.launcher %}`