Revert "fix: Insets.NONE for Android 8.0/8.1/9"

This reverts commit a1021316e7bbc1c34f5b76e86cf979e0f3c43bef.

GITHUB_CHANGELOG.md

@@ -20,8 +20,6 @@ older (i.e., Lawnchair `15-dev`).
 * Correct Baseline Profile from old `market` to `play` variant, and now should calculate profile for `nightly`
 * Smartspace Battery now reports battery charging status of Fast (more than 90% of 20 W) and Slow (less than 90% of 5 W) charging
 * Fix Private Space crash when Lawnchair is set as Launcher due to flags only available on A16
-* Fix crash on a device with strict export receiver requirements on A14
-* Fix crash on A8.0/8.1/9 device due to Insets.NONE not available
 
 #### Split Branch
 

compatLib/src/main/java/android/view/InsetsSource.java

@@ -26,9 +26,9 @@ import static android.view.WindowInsets.Type.ime;
 
 import android.annotation.IntDef;
 import android.annotation.IntRange;
-//import android.annotation.NonNull;
-//import android.annotation.Nullable;
-//import android.graphics.Insets;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -42,10 +42,6 @@ import java.util.Arrays;
 import java.util.Objects;
 import java.util.StringJoiner;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.Insets;
-
 /**
  * Represents the state of a single entity generating insets for clients.
  *

lawnchair/src/app/lawnchair/ui/preferences/components/OverlayHandlerPreference.kt

@@ -4,8 +4,6 @@ import android.R as AndroidR
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.RadioButton
 import androidx.compose.material3.Text
@@ -28,7 +26,6 @@ val overlayOptions = listOf(
     FullScreenOverlayMode.FADE_IN,
 )
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun OverlayHandlerPreference(
     adapter: PreferenceAdapter<FullScreenOverlayMode>,
@@ -54,10 +51,7 @@ fun OverlayHandlerPreference(
                 ModalBottomSheetContent(
                     title = { Text(label) },
                     buttons = {
-                        OutlinedButton(
-                            onClick = { bottomSheetHandler.hide() },
-                            shapes = ButtonDefaults.shapes()
-                        ) {
+                        OutlinedButton(onClick = { bottomSheetHandler.hide() }) {
                             Text(text = stringResource(id = AndroidR.string.cancel))
                         }
                     },

systemUI/anim/src/com/android/systemui/animation/GhostedViewTransitionAnimatorController.kt

@@ -19,7 +19,7 @@ package com.android.systemui.animation
 import android.content.ComponentName
 import android.graphics.Canvas
 import android.graphics.ColorFilter
-//import android.graphics.Insets
+import android.graphics.Insets
 import android.graphics.Matrix
 import android.graphics.PixelFormat
 import android.graphics.Rect
@@ -41,8 +41,6 @@ import java.util.LinkedList
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-import androidx.core.graphics.Insets
-
 private const val TAG = "GhostedViewTransitionAnimatorController"
 
 /**

wmshell/src/com/android/wm/shell/draganddrop/DragLayout.java

@@ -41,7 +41,7 @@ import android.app.StatusBarManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-//import android.graphics.Insets;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
@@ -66,8 +66,6 @@ import com.android.wm.shell.splitscreen.SplitScreenController;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
-import androidx.core.graphics.Insets;
-
 /**
  * Coordinates the visible drop targets for the current drag within a single display.
  */

wmshell/src/com/android/wm/shell/hidedisplaycutout/HideDisplayCutoutOrganizer.java

@@ -20,7 +20,7 @@ import static android.view.Display.DEFAULT_DISPLAY;
 
 import android.content.Context;
 import android.content.res.Configuration;
-//import android.graphics.Insets;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -47,8 +47,6 @@ import com.android.wm.shell.common.ShellExecutor;
 import java.io.PrintWriter;
 import java.util.List;
 
-import androidx.core.graphics.Insets;
-
 /**
  * Manages the display areas of hide display cutout feature.
  */