Window Manager Flag Migration (5/n)

Completely remove the system UI visibility from the SystemUI side.

Bug: 118118435
Test: atest InsetsSourceProviderTest InsetsStateControllerTest
            InsetsPolicyTest WindowStateTests CommandQueueTest
            RegisterStatusBarResultTest InsetsFlagsTest
            LightBarControllerTest RegisterStatusBarResultTest
Test: build on specific target
Change-Id: Ibc866c5fbb35582dad8fd1a90376ce47dc501377

3 files changed, 29 insertions, 56 deletions

diff --git a/core/java/com/android/internal/statusbar/IStatusBar.aidl b/core/java/com/android/internal/statusbar/IStatusBar.aidl
index 317469e58245..73f549a31bac 100644
--- a/core/java/com/android/internal/statusbar/IStatusBar.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBar.aidl
@@ -38,25 +38,6 @@ oneway interface IStatusBar
 
     void showWirelessChargingAnimation(int batteryLevel);
 
-    /**
-     * Notifies System UI side of a visibility flag change on the specified display.
-     *
-     * @param displayId the id of the display to notify
-     * @param vis the visibility flags except SYSTEM_UI_FLAG_LIGHT_STATUS_BAR which will be reported
-     *            separately in fullscreenStackVis and dockedStackVis
-     * @param fullscreenStackVis the flags which only apply in the region of the fullscreen stack,
-     *                           which is currently only SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-     * @param dockedStackVis the flags that only apply in the region of the docked stack, which is
-     *                       currently only SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-     * @param mask which flags to change
-     * @param fullscreenBounds the current bounds of the fullscreen stack, in screen coordinates
-     * @param dockedBounds the current bounds of the docked stack, in screen coordinates
-     * @param navbarColorManagedByIme {@code true} if navigation bar color is managed by IME.
-     */
-    void setSystemUiVisibility(int displayId, int vis, int fullscreenStackVis, int dockedStackVis,
-            int mask, in Rect fullscreenBounds, in Rect dockedBounds,
-            boolean navbarColorManagedByIme);
-
     void topAppWindowChanged(int displayId, boolean isFullscreen, boolean isImmersive);
     void setImeWindowStatus(int displayId, in IBinder token, int vis, int backDisposition,
             boolean showImeSwitcher, boolean isMultiClientImeEnabled);
diff --git a/core/java/com/android/internal/statusbar/IStatusBarService.aidl b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
index 499a4d2fb949..4b2498019284 100644
--- a/core/java/com/android/internal/statusbar/IStatusBarService.aidl
+++ b/core/java/com/android/internal/statusbar/IStatusBarService.aidl
@@ -76,7 +76,6 @@ interface IStatusBarService
     void onNotificationSmartReplySent(in String key, in int replyIndex, in CharSequence reply,
             in int notificationLocation, boolean modifiedBeforeSending);
     void onNotificationSettingsViewed(String key);
-    void setSystemUiVisibility(int displayId, int vis, int mask, String cause);
     void onNotificationBubbleChanged(String key, boolean isBubble);
     void grantInlineReplyUriPermission(String key, in Uri uri);
 
diff --git a/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java b/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java
index 4c3f04b10892..9095f05543da 100644
--- a/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java
+++ b/core/java/com/android/internal/statusbar/RegisterStatusBarResult.java
@@ -16,53 +16,50 @@
 
 package com.android.internal.statusbar;
 
-import android.graphics.Rect;
+import android.annotation.NonNull;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.ArrayMap;
 
+import com.android.internal.view.AppearanceRegion;
+
 /**
  * An immutable data object to return a set of values from StatusBarManagerService to its clients.
  */
 public final class RegisterStatusBarResult implements Parcelable {
     public final ArrayMap<String, StatusBarIcon> mIcons;
-    public final int mDisabledFlags1;                  // switch[0]
-    public final int mSystemUiVisibility;              // switch[1]
-    public final int mImeWindowVis;                    // switch[3]
-    public final int mImeBackDisposition;              // switch[4]
-    public final boolean mShowImeSwitcher;             // switch[5]
-    public final int mDisabledFlags2;                  // switch[6]
-    public final int mFullscreenStackSysUiVisibility;  // switch[7]
-    public final int mDockedStackSysUiVisibility;      // switch[8]
+    public final int mDisabledFlags1;                   // switch[0]
+    public final int mAppearance;                       // switch[1]
+    public final AppearanceRegion[] mAppearanceRegions; // switch[2]
+    public final int mImeWindowVis;                     // switch[3]
+    public final int mImeBackDisposition;               // switch[4]
+    public final boolean mShowImeSwitcher;              // switch[5]
+    public final int mDisabledFlags2;                   // switch[6]
     public final IBinder mImeToken;
-    public final Rect mFullscreenStackBounds;
-    public final Rect mDockedStackBounds;
     public final boolean mNavbarColorManagedByIme;
     public final boolean mAppFullscreen;
     public final boolean mAppImmersive;
+    public final int[] mTransientBarTypes;
 
     public RegisterStatusBarResult(ArrayMap<String, StatusBarIcon> icons, int disabledFlags1,
-            int systemUiVisibility, int imeWindowVis, int imeBackDisposition,
-            boolean showImeSwitcher, int disabledFlags2, int fullscreenStackSysUiVisibility,
-            int dockedStackSysUiVisibility, IBinder imeToken, Rect fullscreenStackBounds,
-            Rect dockedStackBounds, boolean navbarColorManagedByIme, boolean appFullscreen,
-            boolean appImmersive) {
+            int appearance, AppearanceRegion[] appearanceRegions, int imeWindowVis,
+            int imeBackDisposition, boolean showImeSwitcher, int disabledFlags2, IBinder imeToken,
+            boolean navbarColorManagedByIme, boolean appFullscreen, boolean appImmersive,
+            @NonNull int[] transientBarTypes) {
         mIcons = new ArrayMap<>(icons);
         mDisabledFlags1 = disabledFlags1;
-        mSystemUiVisibility = systemUiVisibility;
+        mAppearance = appearance;
+        mAppearanceRegions = appearanceRegions;
         mImeWindowVis = imeWindowVis;
         mImeBackDisposition = imeBackDisposition;
         mShowImeSwitcher = showImeSwitcher;
         mDisabledFlags2 = disabledFlags2;
-        mFullscreenStackSysUiVisibility = fullscreenStackSysUiVisibility;
-        mDockedStackSysUiVisibility = dockedStackSysUiVisibility;
         mImeToken = imeToken;
-        mFullscreenStackBounds = fullscreenStackBounds;
-        mDockedStackBounds = dockedStackBounds;
         mNavbarColorManagedByIme = navbarColorManagedByIme;
         mAppFullscreen = appFullscreen;
         mAppImmersive = appImmersive;
+        mTransientBarTypes = transientBarTypes;
     }
 
     @Override
@@ -74,19 +71,17 @@ public final class RegisterStatusBarResult implements Parcelable {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeTypedArrayMap(mIcons, flags);
         dest.writeInt(mDisabledFlags1);
-        dest.writeInt(mSystemUiVisibility);
+        dest.writeInt(mAppearance);
+        dest.writeParcelableArray(mAppearanceRegions, 0);
         dest.writeInt(mImeWindowVis);
         dest.writeInt(mImeBackDisposition);
         dest.writeBoolean(mShowImeSwitcher);
         dest.writeInt(mDisabledFlags2);
-        dest.writeInt(mFullscreenStackSysUiVisibility);
-        dest.writeInt(mDockedStackSysUiVisibility);
         dest.writeStrongBinder(mImeToken);
-        dest.writeTypedObject(mFullscreenStackBounds, flags);
-        dest.writeTypedObject(mDockedStackBounds, flags);
         dest.writeBoolean(mNavbarColorManagedByIme);
         dest.writeBoolean(mAppFullscreen);
         dest.writeBoolean(mAppImmersive);
+        dest.writeIntArray(mTransientBarTypes);
     }
 
     /**
@@ -99,24 +94,22 @@ public final class RegisterStatusBarResult implements Parcelable {
                     final ArrayMap<String, StatusBarIcon> icons =
                             source.createTypedArrayMap(StatusBarIcon.CREATOR);
                     final int disabledFlags1 = source.readInt();
-                    final int systemUiVisibility = source.readInt();
+                    final int appearance = source.readInt();
+                    final AppearanceRegion[] appearanceRegions =
+                            source.readParcelableArray(null, AppearanceRegion.class);
                     final int imeWindowVis = source.readInt();
                     final int imeBackDisposition = source.readInt();
                     final boolean showImeSwitcher = source.readBoolean();
                     final int disabledFlags2 = source.readInt();
-                    final int fullscreenStackSysUiVisibility = source.readInt();
-                    final int dockedStackSysUiVisibility = source.readInt();
                     final IBinder imeToken = source.readStrongBinder();
-                    final Rect fullscreenStackBounds = source.readTypedObject(Rect.CREATOR);
-                    final Rect dockedStackBounds = source.readTypedObject(Rect.CREATOR);
                     final boolean navbarColorManagedByIme = source.readBoolean();
                     final boolean appFullscreen = source.readBoolean();
                     final boolean appImmersive = source.readBoolean();
-                    return new RegisterStatusBarResult(icons, disabledFlags1, systemUiVisibility,
-                            imeWindowVis, imeBackDisposition, showImeSwitcher, disabledFlags2,
-                            fullscreenStackSysUiVisibility, dockedStackSysUiVisibility, imeToken,
-                            fullscreenStackBounds, dockedStackBounds, navbarColorManagedByIme,
-                            appFullscreen, appImmersive);
+                    final int[] transientBarTypes = source.createIntArray();
+                    return new RegisterStatusBarResult(icons, disabledFlags1, appearance,
+                            appearanceRegions, imeWindowVis, imeBackDisposition, showImeSwitcher,
+                            disabledFlags2, imeToken, navbarColorManagedByIme, appFullscreen,
+                            appImmersive, transientBarTypes);
                 }
 
                 @Override