Merge branch 'staging' into fix_stop_views

Author: turtledreams

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 24.7.7
 * Mitigated an issue where an automaticly closed autostopped view's duration could have increased when opening new views
+* Mitigated an issue where, on Android 35 and above, the navigation bar was overlapping with the content display.
 
 ## 24.7.6
 * Added support for localization of content blocks.
@@ -8,6 +9,7 @@
 * Fixed a bug where passing the global content callback was not possible.
 * Mitigated an issue related to content actions navigation.
 * Mitigated an issue that parsing internal content event segmentation.
+
 ## 24.7.5
 * ! Minor breaking change ! All active views will now automatically stop when consent for "views" is revoked.
 

sdk/src/main/java/ly/count/android/sdk/TransparentActivity.java

@@ -7,6 +7,7 @@
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -53,16 +54,24 @@ protected void onCreate(Bundle savedInstanceState) {
         Log.v(Countly.TAG, "[TransparentActivity] onCreate, configPortrait  x: [" + configPortrait.x + "] y: [" + configPortrait.y + "] width: [" + configPortrait.width + "] height: [" + configPortrait.height + "]");
 
         TransparentActivityConfig config;
+        int navBarHeight = 0;
         if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE) {
             config = configLandscape;
         } else {
+            // This is only needed for the portrait mode and
+            // after android 35 the function that gives height gives the full height of the screen
+            // so we need to subtract the height of the navigation bar
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                navBarHeight = getNavigationBarHeight();
+            }
+
             config = configPortrait;
         }
 
         config = setupConfig(config);
 
         int width = config.width;
-        int height = config.height;
+        int height = config.height - navBarHeight;
 
         configLandscape.listeners.add((url, webView) -> {
             if (url.startsWith(URL_START)) {
@@ -126,23 +135,23 @@ private TransparentActivityConfig setupConfig(@Nullable TransparentActivityConfi
         return config;
     }
 
-    private void changeOrientation(TransparentActivityConfig config) {
+    private void changeOrientation(TransparentActivityConfig config, int navBarHeight) {
         Log.d(Countly.TAG, "[TransparentActivity] changeOrientation, config x: [" + config.x + "] y: [" + config.y + "] width: [" + config.width + "] height: [" + config.height + "]");
         WindowManager.LayoutParams params = getWindow().getAttributes();
         params.x = config.x;
         params.y = config.y;
-        params.height = config.height;
+        params.height = config.height - navBarHeight;
         params.width = config.width;
         getWindow().setAttributes(params);
 
         ViewGroup.LayoutParams layoutParams = relativeLayout.getLayoutParams();
         layoutParams.width = config.width;
-        layoutParams.height = config.height;
+        layoutParams.height = config.height - navBarHeight;
         relativeLayout.setLayoutParams(layoutParams);
 
         ViewGroup.LayoutParams webLayoutParams = webView.getLayoutParams();
         webLayoutParams.width = config.width;
-        webLayoutParams.height = config.height;
+        webLayoutParams.height = config.height - navBarHeight;
         webView.setLayoutParams(webLayoutParams);
     }
 
@@ -163,13 +172,21 @@ private void changeOrientationInternal() {
             case Configuration.ORIENTATION_LANDSCAPE:
                 if (configLandscape != null) {
                     configLandscape = setupConfig(configLandscape);
-                    changeOrientation(configLandscape);
+                    changeOrientation(configLandscape, 0);
                 }
                 break;
             case Configuration.ORIENTATION_PORTRAIT:
                 if (configPortrait != null) {
                     configPortrait = setupConfig(configPortrait);
-                    changeOrientation(configPortrait);
+                    // This is only needed for the portrait mode and
+                    // after android 35 the function that gives height gives the full height of the screen
+                    // so we need to subtract the height of the navigation bar
+                    // this is implemented twice because in the future resize_me action will be able to change the height of the content
+                    int navBarHeight = 0;
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+                        navBarHeight = getNavigationBarHeight();
+                    }
+                    changeOrientation(configPortrait, navBarHeight);
                 }
                 break;
             default:
@@ -368,4 +385,12 @@ private WebView createWebView(TransparentActivityConfig config) {
         webView.loadUrl(config.url);
         return webView;
     }
+
+    private int getNavigationBarHeight() {
+        int resourceId = getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            return getResources().getDimensionPixelSize(resourceId);
+        }
+        return 0;
+    }
 }