Fine tuning

Author: kuzeyron

doc/source/buildoptions.rst

@@ -74,7 +74,6 @@ options (this list may not be exhaustive):
   ``--home-app`` Gives you the option to set your application as a home app (launcher) on your Android device.
   ``--display-cutout``: Enables the display cutout (notch) functionality.
   `Android documentation <https://developer.android.com/develop/ui/views/layout/display-cutout>`__.
-  ``--translucent-bars`` Sets the statusbar and navigationbar to be translucent (no opacity).
 
   .. Note ::
     ``--permission`` accepts the following syntaxes: 

pythonforandroid/bootstraps/common/build/build.py

@@ -543,8 +543,11 @@ def make_package(args):
         "service_names": service_names,
         "android_api": android_api,
         "debug": "debug" in args.build_mode,
-        "native_services": args.native_services
+        "native_services": args.native_services,
+        "support_cutout": all([android_api >= 28,
+                              args.display_cutout != 'never'])
     }
+    print("FUCKER:", render_args, '\n', args.display_cutout, '\n', args)
     if get_bootstrap_name() == "sdl2":
         render_args["url_scheme"] = url_scheme
     render(
@@ -776,10 +779,9 @@ def create_argument_parser():
                               'launcher, rather than a single app.'))
         ap.add_argument('--home-app', dest='home_app', action='store_true', default=False,
                         help=('Turn your application into a home app (launcher)'))
-        ap.add_argument('--display-cutout', dest='display_cutout', action='store_true', default='never',
-                        help=('Enables display-cutout (notch) to render where the front camera is on newer devices'))
-        ap.add_argument('--translucent-bars', dest='translucent_bars', action='store_true', default=False,
-                        help=('Translucent statusbar and navigationbar'))
+        ap.add_argument('--display-cutout', dest='display_cutout', default='never',
+                        help=('Enables display-cutout (notch) to render where the front camera is on newer devices. '
+                              'Must have disabled fullscreen and display_cutout not set to never.'))
     ap.add_argument('--permission', dest='permissions', action='append', default=[],
                     help='The permissions to give this app.', nargs='+')
     ap.add_argument('--meta-data', dest='meta_data', action='append', default=[],

pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml

@@ -71,7 +71,9 @@
                   android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode{% if args.min_sdk_version >= 8 %}|uiMode{% endif %}{% if args.min_sdk_version >= 13 %}|screenSize|smallestScreenSize{% endif %}{% if args.min_sdk_version >= 17 %}|layoutDirection{% endif %}{% if args.min_sdk_version >= 24 %}|density{% endif %}"
                   android:screenOrientation="{{ args.manifest_orientation }}"
                   android:exported="true"
+                  {% if support_cutout %}
                   android:theme="@style/BaseStyle"
+                  {% endif %}
                   {% if args.activity_launch_mode %}
                   android:launchMode="{{ args.activity_launch_mode }}"
                   {% endif %}

pythonforandroid/bootstraps/sdl2/build/templates/strings.tmpl.xml

@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="BaseStyle">
-    {% if android_api >= 28 %}
-        {% if args.display_cutouts != 'never' %}
-            <item name="android:windowLayoutInDisplayCutoutMode">{{ args.display_cutouts }}</item>
-            <item name="android:windowNoTitle">true</item>
-            <item name="android:windowContentOverlay">@null</item>
-            <item name="android:windowActionBar">false</item>
-        {% endif %}
-    {% endif %}
-    {% if args.translucent_bars %}
+        <item name="android:windowLayoutInDisplayCutoutMode">{{ args.display_cutout }}</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">true</item>
-    {% endif %}
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
     </style>
     <string name="app_name">{{ args.name }}</string>
     <string name="private_version">{{ private_version }}</string>