Fixing non-fullbleed IAMs by using type dialog instead of panel

Other cleanup as well

Author: emawby

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/activity/MainActivity.java

@@ -18,10 +18,6 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main_activity_layout);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-        }
 
         viewModel = new MainActivityViewModel();
         OneSignal.addPermissionObserver(viewModel);

OneSignalSDK/onesignal/src/main/java/com/onesignal/InAppMessageView.java

@@ -78,6 +78,7 @@ interface InAppMessageViewListener {
     private boolean shouldDismissWhenActive = false;
     private boolean isDragging = false;
     private boolean disableDragDismiss = false;
+    private OSInAppMessageContent messageContent;
     @NonNull private WebViewManager.Position displayLocation;
     private WebView webView;
     private RelativeLayout parentRelativeLayout;
@@ -93,6 +94,7 @@ interface InAppMessageViewListener {
         this.displayDuration = content.getDisplayDuration() == null ? 0 : content.getDisplayDuration();
         this.hasBackground = !displayLocation.isBanner();
         this.disableDragDismiss = disableDragDismiss;
+        this.messageContent = content;
         setMarginsFromContent(content);
     }
 
@@ -307,11 +309,14 @@ private void createPopupWindow(@NonNull RelativeLayout parentRelativeLayout) {
             }
         }
 
-        // Using this instead of TYPE_APPLICATION_PANEL so the layout background does not get
-        //  cut off in immersive mode.
+        // Using panel for fullbleed IAMs and dialog for non-fullbleed. The attached dialog type
+        // does not allow content to bleed under notches but panel does.
+        int displayType = this.messageContent.isFullScreen() ?
+                WindowManager.LayoutParams.TYPE_APPLICATION_PANEL :
+                WindowManager.LayoutParams.TYPE_APPLICATION_ATTACHED_DIALOG;
         PopupWindowCompat.setWindowLayoutType(
                 popupWindow,
-                WindowManager.LayoutParams.TYPE_APPLICATION_PANEL
+                displayType
         );
 
         popupWindow.showAtLocation(

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSViewUtils.java

@@ -76,30 +76,14 @@ void available(@NonNull Activity currentActivity) {
     }
 
     static int[] getWindowInsets(@NonNull Activity activity) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-
-        }
         Rect frame = getWindowVisibleDisplayFrame(activity);
         View contentView = activity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
         float topInset = (frame.top - contentView.getTop()) / Resources.getSystem().getDisplayMetrics().density;
-        float bottomInset = (contentView.getBottom() - frame.bottom) / Resources.getSystem().getDisplayMetrics().density;;
-        float rightInset = (frame.right - contentView.getRight()) / Resources.getSystem().getDisplayMetrics().density;;
-        float leftInset = (contentView.getLeft() - frame.left) / Resources.getSystem().getDisplayMetrics().density;;
+        float bottomInset = (contentView.getBottom() - frame.bottom) / Resources.getSystem().getDisplayMetrics().density;
+        float rightInset = (frame.right - contentView.getRight()) / Resources.getSystem().getDisplayMetrics().density;
+        float leftInset = (contentView.getLeft() - frame.left) / Resources.getSystem().getDisplayMetrics().density;
         return new int[]{Math.round(topInset), Math.round(bottomInset), Math.round(rightInset), Math.round(leftInset)};
     }
-    /*
-    Not using this method for now because the bottom value is not correct (we don't cover the bottom buttons)
-     */
-    // Requirement: Ensure DecorView is ready by using OSViewUtils.decorViewReady
-    @TargetApi(Build.VERSION_CODES.P)
-    private static int[] getWindowInsetsAPI28Plus(@NonNull Activity activity) {
-        View decorView = activity.getWindow().getDecorView();
-        // Use use stable heights as SystemWindowInset subtracts the keyboard
-        WindowInsets windowInsets = decorView.getRootWindowInsets();
-        //if windowInsets.getDisplayCutout().
-        return new int[] {windowInsets.getStableInsetTop(), windowInsets.getStableInsetBottom(),
-                windowInsets.getStableInsetRight(), windowInsets.getStableInsetLeft()};
-    }
 
     static int getWindowWidth(@NonNull Activity activity) {
         return getWindowVisibleDisplayFrame(activity).width();
@@ -126,8 +110,8 @@ private static int getWindowHeightAPI23Plus(@NonNull Activity activity) {
             return decorView.getHeight();
 
         return decorView.getHeight() -
-               windowInsets.getStableInsetBottom();
-//               windowInsets.getStableInsetTop();
+               windowInsets.getStableInsetBottom() -
+               windowInsets.getStableInsetTop();
     }
 
     private static int getWindowHeightLollipop(@NonNull Activity activity) {

OneSignalSDK/onesignal/src/main/java/com/onesignal/WebViewManager.java

@@ -5,15 +5,11 @@
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
-import android.graphics.Rect;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Base64;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowInsets;
-import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
 import android.webkit.WebView;
@@ -353,7 +349,10 @@ public void run() {
                 // At time point the webView isn't attached to a view
                 // Set the WebView to the max screen size then run JS to evaluate the height.
                 setWebViewToMaxSize(activity);
-                updateSafeAreaInsets();
+                if (messageContent.isFullScreen()) {
+                    updateSafeAreaInsets();
+                }
+
                 webView.evaluateJavascript(OSJavaScriptInterface.GET_PAGE_META_DATA_JS_FUNCTION, new ValueCallback<String>() {
                     @Override
                     public void onReceiveValue(final String value) {
@@ -509,7 +508,7 @@ private static void enableWebViewRemoteDebugging() {
 
     private int getWebViewMaxSizeX(Activity activity) {
         int margin = messageContent.isFullScreen() ? 0 : (MARGIN_PX_SIZE * 2);
-        return OSViewUtils.getWindowWidth(activity) - margin; //- (MARGIN_PX_SIZE * 2);
+        return OSViewUtils.getWindowWidth(activity) - margin;
     }
 
     private int getWebViewMaxSizeY(Activity activity) {