Loading core/java/com/android/internal/statusbar/IStatusBar.aidl +2 −3 Original line number Diff line number Diff line Loading @@ -29,7 +29,6 @@ import android.media.MediaRoute2Info; import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.service.notification.StatusBarNotification; import android.view.InsetsVisibilities; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IUndoMediaTransferCallback; Loading Loading @@ -201,13 +200,13 @@ oneway interface IStatusBar * stacks. * @param navbarColorManagedByIme {@code true} if navigation bar color is managed by IME. * @param behavior the behavior of the focused window. * @param requestedVisibilities the collection of the requested visibilities of system insets. * @param requestedVisibleTypes the collection of insets types requested visible. * @param packageName the package name of the focused app. * @param letterboxDetails a set of letterbox details of apps visible on the screen. */ void onSystemBarAttributesChanged(int displayId, int appearance, in AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, in InsetsVisibilities requestedVisibilities, String packageName, int behavior, int requestedVisibleTypes, String packageName, in LetterboxDetails[] letterboxDetails); /** Loading core/java/com/android/internal/statusbar/RegisterStatusBarResult.java +6 −8 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; import android.view.InsetsVisibilities; import com.android.internal.view.AppearanceRegion; Loading @@ -40,7 +39,7 @@ public final class RegisterStatusBarResult implements Parcelable { public final IBinder mImeToken; public final boolean mNavbarColorManagedByIme; public final int mBehavior; public final InsetsVisibilities mRequestedVisibilities; public final int mRequestedVisibleTypes; public final String mPackageName; public final int[] mTransientBarTypes; public final LetterboxDetails[] mLetterboxDetails; Loading @@ -48,7 +47,7 @@ public final class RegisterStatusBarResult implements Parcelable { public RegisterStatusBarResult(ArrayMap<String, StatusBarIcon> icons, int disabledFlags1, int appearance, AppearanceRegion[] appearanceRegions, int imeWindowVis, int imeBackDisposition, boolean showImeSwitcher, int disabledFlags2, IBinder imeToken, boolean navbarColorManagedByIme, int behavior, InsetsVisibilities requestedVisibilities, boolean navbarColorManagedByIme, int behavior, int requestedVisibleTypes, String packageName, @NonNull int[] transientBarTypes, LetterboxDetails[] letterboxDetails) { mIcons = new ArrayMap<>(icons); Loading @@ -62,7 +61,7 @@ public final class RegisterStatusBarResult implements Parcelable { mImeToken = imeToken; mNavbarColorManagedByIme = navbarColorManagedByIme; mBehavior = behavior; mRequestedVisibilities = requestedVisibilities; mRequestedVisibleTypes = requestedVisibleTypes; mPackageName = packageName; mTransientBarTypes = transientBarTypes; mLetterboxDetails = letterboxDetails; Loading @@ -86,7 +85,7 @@ public final class RegisterStatusBarResult implements Parcelable { dest.writeStrongBinder(mImeToken); dest.writeBoolean(mNavbarColorManagedByIme); dest.writeInt(mBehavior); dest.writeTypedObject(mRequestedVisibilities, 0); dest.writeInt(mRequestedVisibleTypes); dest.writeString(mPackageName); dest.writeIntArray(mTransientBarTypes); dest.writeParcelableArray(mLetterboxDetails, flags); Loading @@ -112,8 +111,7 @@ public final class RegisterStatusBarResult implements Parcelable { final IBinder imeToken = source.readStrongBinder(); final boolean navbarColorManagedByIme = source.readBoolean(); final int behavior = source.readInt(); final InsetsVisibilities requestedVisibilities = source.readTypedObject(InsetsVisibilities.CREATOR); final int requestedVisibleTypes = source.readInt(); final String packageName = source.readString(); final int[] transientBarTypes = source.createIntArray(); final LetterboxDetails[] letterboxDetails = Loading @@ -121,7 +119,7 @@ public final class RegisterStatusBarResult implements Parcelable { return new RegisterStatusBarResult(icons, disabledFlags1, appearance, appearanceRegions, imeWindowVis, imeBackDisposition, showImeSwitcher, disabledFlags2, imeToken, navbarColorManagedByIme, behavior, requestedVisibilities, packageName, transientBarTypes, requestedVisibleTypes, packageName, transientBarTypes, letterboxDetails); } Loading core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java +3 −3 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ import android.os.Binder; import android.os.Parcel; import android.os.UserHandle; import android.util.ArrayMap; import android.view.InsetsVisibilities; import android.view.WindowInsets; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; Loading Loading @@ -65,7 +65,7 @@ public class RegisterStatusBarResultTest { new Binder() /* imeToken */, true /* navbarColorManagedByIme */, BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE, new InsetsVisibilities() /* requestedVisibilities */, WindowInsets.Type.defaultVisible(), "test" /* packageName */, new int[0] /* transientBarTypes */, new LetterboxDetails[] {letterboxDetails}); Loading @@ -87,7 +87,7 @@ public class RegisterStatusBarResultTest { assertThat(copy.mImeToken).isSameInstanceAs(original.mImeToken); assertThat(copy.mNavbarColorManagedByIme).isEqualTo(original.mNavbarColorManagedByIme); assertThat(copy.mBehavior).isEqualTo(original.mBehavior); assertThat(copy.mRequestedVisibilities).isEqualTo(original.mRequestedVisibilities); assertThat(copy.mRequestedVisibleTypes).isEqualTo(original.mRequestedVisibleTypes); assertThat(copy.mPackageName).isEqualTo(original.mPackageName); assertThat(copy.mTransientBarTypes).isEqualTo(original.mTransientBarTypes); assertThat(copy.mLetterboxDetails).isEqualTo(original.mLetterboxDetails); Loading packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +2 −2 Original line number Diff line number Diff line Loading @@ -87,7 +87,6 @@ import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.InsetsFrameProvider; import android.view.InsetsState.InternalInsetsType; import android.view.InsetsVisibilities; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.Surface; Loading @@ -99,6 +98,7 @@ import android.view.ViewRootImpl.SurfaceChangedCallback; import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.InternalInsetsInfo; import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; import android.view.WindowManager; Loading Loading @@ -1085,7 +1085,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, @Behavior int behavior, @InsetsType int requestedVisibleTypes, String packageName, LetterboxDetails[] letterboxDetails) { if (displayId != mDisplayId) { return; Loading packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +2 −2 Original line number Diff line number Diff line Loading @@ -49,8 +49,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.Log; import android.view.Display; import android.view.InsetsVisibilities; import android.view.View; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; Loading Loading @@ -355,7 +355,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onSystemBarAttributesChanged(int displayId, int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, InsetsVisibilities requestedVisibilities, String packageName, @InsetsType int requestedVisibleTypes, String packageName, LetterboxDetails[] letterboxDetails) { mOverviewProxyService.onSystemBarAttributesChanged(displayId, behavior); boolean nbModeChanged = false; Loading Loading
core/java/com/android/internal/statusbar/IStatusBar.aidl +2 −3 Original line number Diff line number Diff line Loading @@ -29,7 +29,6 @@ import android.media.MediaRoute2Info; import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.service.notification.StatusBarNotification; import android.view.InsetsVisibilities; import com.android.internal.statusbar.IAddTileResultCallback; import com.android.internal.statusbar.IUndoMediaTransferCallback; Loading Loading @@ -201,13 +200,13 @@ oneway interface IStatusBar * stacks. * @param navbarColorManagedByIme {@code true} if navigation bar color is managed by IME. * @param behavior the behavior of the focused window. * @param requestedVisibilities the collection of the requested visibilities of system insets. * @param requestedVisibleTypes the collection of insets types requested visible. * @param packageName the package name of the focused app. * @param letterboxDetails a set of letterbox details of apps visible on the screen. */ void onSystemBarAttributesChanged(int displayId, int appearance, in AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, in InsetsVisibilities requestedVisibilities, String packageName, int behavior, int requestedVisibleTypes, String packageName, in LetterboxDetails[] letterboxDetails); /** Loading
core/java/com/android/internal/statusbar/RegisterStatusBarResult.java +6 −8 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ import android.os.IBinder; import android.os.Parcel; import android.os.Parcelable; import android.util.ArrayMap; import android.view.InsetsVisibilities; import com.android.internal.view.AppearanceRegion; Loading @@ -40,7 +39,7 @@ public final class RegisterStatusBarResult implements Parcelable { public final IBinder mImeToken; public final boolean mNavbarColorManagedByIme; public final int mBehavior; public final InsetsVisibilities mRequestedVisibilities; public final int mRequestedVisibleTypes; public final String mPackageName; public final int[] mTransientBarTypes; public final LetterboxDetails[] mLetterboxDetails; Loading @@ -48,7 +47,7 @@ public final class RegisterStatusBarResult implements Parcelable { public RegisterStatusBarResult(ArrayMap<String, StatusBarIcon> icons, int disabledFlags1, int appearance, AppearanceRegion[] appearanceRegions, int imeWindowVis, int imeBackDisposition, boolean showImeSwitcher, int disabledFlags2, IBinder imeToken, boolean navbarColorManagedByIme, int behavior, InsetsVisibilities requestedVisibilities, boolean navbarColorManagedByIme, int behavior, int requestedVisibleTypes, String packageName, @NonNull int[] transientBarTypes, LetterboxDetails[] letterboxDetails) { mIcons = new ArrayMap<>(icons); Loading @@ -62,7 +61,7 @@ public final class RegisterStatusBarResult implements Parcelable { mImeToken = imeToken; mNavbarColorManagedByIme = navbarColorManagedByIme; mBehavior = behavior; mRequestedVisibilities = requestedVisibilities; mRequestedVisibleTypes = requestedVisibleTypes; mPackageName = packageName; mTransientBarTypes = transientBarTypes; mLetterboxDetails = letterboxDetails; Loading @@ -86,7 +85,7 @@ public final class RegisterStatusBarResult implements Parcelable { dest.writeStrongBinder(mImeToken); dest.writeBoolean(mNavbarColorManagedByIme); dest.writeInt(mBehavior); dest.writeTypedObject(mRequestedVisibilities, 0); dest.writeInt(mRequestedVisibleTypes); dest.writeString(mPackageName); dest.writeIntArray(mTransientBarTypes); dest.writeParcelableArray(mLetterboxDetails, flags); Loading @@ -112,8 +111,7 @@ public final class RegisterStatusBarResult implements Parcelable { final IBinder imeToken = source.readStrongBinder(); final boolean navbarColorManagedByIme = source.readBoolean(); final int behavior = source.readInt(); final InsetsVisibilities requestedVisibilities = source.readTypedObject(InsetsVisibilities.CREATOR); final int requestedVisibleTypes = source.readInt(); final String packageName = source.readString(); final int[] transientBarTypes = source.createIntArray(); final LetterboxDetails[] letterboxDetails = Loading @@ -121,7 +119,7 @@ public final class RegisterStatusBarResult implements Parcelable { return new RegisterStatusBarResult(icons, disabledFlags1, appearance, appearanceRegions, imeWindowVis, imeBackDisposition, showImeSwitcher, disabledFlags2, imeToken, navbarColorManagedByIme, behavior, requestedVisibilities, packageName, transientBarTypes, requestedVisibleTypes, packageName, transientBarTypes, letterboxDetails); } Loading
core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java +3 −3 Original line number Diff line number Diff line Loading @@ -25,7 +25,7 @@ import android.os.Binder; import android.os.Parcel; import android.os.UserHandle; import android.util.ArrayMap; import android.view.InsetsVisibilities; import android.view.WindowInsets; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.SmallTest; Loading Loading @@ -65,7 +65,7 @@ public class RegisterStatusBarResultTest { new Binder() /* imeToken */, true /* navbarColorManagedByIme */, BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE, new InsetsVisibilities() /* requestedVisibilities */, WindowInsets.Type.defaultVisible(), "test" /* packageName */, new int[0] /* transientBarTypes */, new LetterboxDetails[] {letterboxDetails}); Loading @@ -87,7 +87,7 @@ public class RegisterStatusBarResultTest { assertThat(copy.mImeToken).isSameInstanceAs(original.mImeToken); assertThat(copy.mNavbarColorManagedByIme).isEqualTo(original.mNavbarColorManagedByIme); assertThat(copy.mBehavior).isEqualTo(original.mBehavior); assertThat(copy.mRequestedVisibilities).isEqualTo(original.mRequestedVisibilities); assertThat(copy.mRequestedVisibleTypes).isEqualTo(original.mRequestedVisibleTypes); assertThat(copy.mPackageName).isEqualTo(original.mPackageName); assertThat(copy.mTransientBarTypes).isEqualTo(original.mTransientBarTypes); assertThat(copy.mLetterboxDetails).isEqualTo(original.mLetterboxDetails); Loading
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java +2 −2 Original line number Diff line number Diff line Loading @@ -87,7 +87,6 @@ import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.InsetsFrameProvider; import android.view.InsetsState.InternalInsetsType; import android.view.InsetsVisibilities; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.Surface; Loading @@ -99,6 +98,7 @@ import android.view.ViewRootImpl.SurfaceChangedCallback; import android.view.ViewTreeObserver; import android.view.ViewTreeObserver.InternalInsetsInfo; import android.view.ViewTreeObserver.OnComputeInternalInsetsListener; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; import android.view.WindowManager; Loading Loading @@ -1085,7 +1085,7 @@ public class NavigationBar extends ViewController<NavigationBarView> implements @Override public void onSystemBarAttributesChanged(int displayId, @Appearance int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, @Behavior int behavior, InsetsVisibilities requestedVisibilities, String packageName, @Behavior int behavior, @InsetsType int requestedVisibleTypes, String packageName, LetterboxDetails[] letterboxDetails) { if (displayId != mDisplayId) { return; Loading
packages/SystemUI/src/com/android/systemui/navigationbar/TaskbarDelegate.java +2 −2 Original line number Diff line number Diff line Loading @@ -49,8 +49,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.Log; import android.view.Display; import android.view.InsetsVisibilities; import android.view.View; import android.view.WindowInsets.Type.InsetsType; import android.view.WindowInsetsController.Appearance; import android.view.WindowInsetsController.Behavior; Loading Loading @@ -355,7 +355,7 @@ public class TaskbarDelegate implements CommandQueue.Callbacks, @Override public void onSystemBarAttributesChanged(int displayId, int appearance, AppearanceRegion[] appearanceRegions, boolean navbarColorManagedByIme, int behavior, InsetsVisibilities requestedVisibilities, String packageName, @InsetsType int requestedVisibleTypes, String packageName, LetterboxDetails[] letterboxDetails) { mOverviewProxyService.onSystemBarAttributesChanged(displayId, behavior); boolean nbModeChanged = false; Loading