Merge "Remove unused binder in setImeWindowStatus calls" into main (fb62ef36) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/statusbar/IStatusBar.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,7 @@ oneway interface IStatusBar

		void showWirelessChargingAnimation(int batteryLevel);

		void setImeWindowStatus(int displayId, in IBinder token, int vis, int backDisposition,
		boolean showImeSwitcher);
		void setImeWindowStatus(int displayId, int vis, int backDisposition, boolean showImeSwitcher);
		void setWindowState(int display, int window, int state);

		void showRecentApps(boolean triggeredFromAltTab);

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,7 @@ interface IStatusBarService
		void setIconVisibility(String slot, boolean visible);
		@UnsupportedAppUsage
		void removeIcon(String slot);
		void setImeWindowStatus(int displayId, in IBinder token, int vis, int backDisposition,
		boolean showImeSwitcher);
		void setImeWindowStatus(int displayId, int vis, int backDisposition, boolean showImeSwitcher);
		void expandSettingsPanel(String subPanel);

		// ---- Methods below are for use by the status bar policy services ----

core/java/com/android/internal/statusbar/RegisterStatusBarResult.java

+2 −7

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		package com.android.internal.statusbar;

		import android.os.IBinder;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.ArrayMap;
		@@ -35,7 +34,6 @@ public final class RegisterStatusBarResult implements Parcelable {
		public final int mImeBackDisposition; // switch[4]
		public final boolean mShowImeSwitcher; // switch[5]
		public final int mDisabledFlags2; // switch[6]
		public final IBinder mImeToken;
		public final boolean mNavbarColorManagedByIme;
		public final int mBehavior;
		public final int mRequestedVisibleTypes;
		@@ -45,7 +43,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,
		int imeBackDisposition, boolean showImeSwitcher, int disabledFlags2,
		boolean navbarColorManagedByIme, int behavior, int requestedVisibleTypes,
		String packageName, int transientBarTypes, LetterboxDetails[] letterboxDetails) {
		mIcons = new ArrayMap<>(icons);
		@@ -56,7 +54,6 @@ public final class RegisterStatusBarResult implements Parcelable {
		mImeBackDisposition = imeBackDisposition;
		mShowImeSwitcher = showImeSwitcher;
		mDisabledFlags2 = disabledFlags2;
		mImeToken = imeToken;
		mNavbarColorManagedByIme = navbarColorManagedByIme;
		mBehavior = behavior;
		mRequestedVisibleTypes = requestedVisibleTypes;
		@@ -80,7 +77,6 @@ public final class RegisterStatusBarResult implements Parcelable {
		dest.writeInt(mImeBackDisposition);
		dest.writeBoolean(mShowImeSwitcher);
		dest.writeInt(mDisabledFlags2);
		dest.writeStrongBinder(mImeToken);
		dest.writeBoolean(mNavbarColorManagedByIme);
		dest.writeInt(mBehavior);
		dest.writeInt(mRequestedVisibleTypes);
		@@ -106,7 +102,6 @@ public final class RegisterStatusBarResult implements Parcelable {
		final int imeBackDisposition = source.readInt();
		final boolean showImeSwitcher = source.readBoolean();
		final int disabledFlags2 = source.readInt();
		final IBinder imeToken = source.readStrongBinder();
		final boolean navbarColorManagedByIme = source.readBoolean();
		final int behavior = source.readInt();
		final int requestedVisibleTypes = source.readInt();
		@@ -116,7 +111,7 @@ public final class RegisterStatusBarResult implements Parcelable {
		source.readParcelableArray(null, LetterboxDetails.class);
		return new RegisterStatusBarResult(icons, disabledFlags1, appearance,
		appearanceRegions, imeWindowVis, imeBackDisposition, showImeSwitcher,
		disabledFlags2, imeToken, navbarColorManagedByIme, behavior,
		disabledFlags2, navbarColorManagedByIme, behavior,
		requestedVisibleTypes, packageName, transientBarTypes,
		letterboxDetails);
		}

core/tests/coretests/src/com/android/internal/statusbar/RegisterStatusBarResultTest.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_B
		import static com.google.common.truth.Truth.assertThat;

		import android.graphics.Rect;
		import android.os.Binder;
		import android.os.Parcel;
		import android.os.UserHandle;
		import android.util.ArrayMap;
		@@ -63,7 +62,6 @@ public class RegisterStatusBarResultTest {
		0x10 /* imeBackDisposition */,
		false /* showImeSwitcher */,
		0x20 /* disabledFlags2 */,
		new Binder() /* imeToken */,
		true /* navbarColorManagedByIme */,
		BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE,
		WindowInsets.Type.defaultVisible(),
		@@ -85,7 +83,6 @@ public class RegisterStatusBarResultTest {
		assertThat(copy.mImeBackDisposition).isEqualTo(original.mImeBackDisposition);
		assertThat(copy.mShowImeSwitcher).isEqualTo(original.mShowImeSwitcher);
		assertThat(copy.mDisabledFlags2).isEqualTo(original.mDisabledFlags2);
		assertThat(copy.mImeToken).isSameInstanceAs(original.mImeToken);
		assertThat(copy.mNavbarColorManagedByIme).isEqualTo(original.mNavbarColorManagedByIme);
		assertThat(copy.mBehavior).isEqualTo(original.mBehavior);
		assertThat(copy.mRequestedVisibleTypes).isEqualTo(original.mRequestedVisibleTypes);

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarControllerImpl.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -406,9 +406,8 @@ public class NavigationBarControllerImpl implements
		@Override
		public void onViewAttachedToWindow(View v) {
		if (result != null) {
		navBar.setImeWindowStatus(display.getDisplayId(), result.mImeToken,
		result.mImeWindowVis, result.mImeBackDisposition,
		result.mShowImeSwitcher);
		navBar.setImeWindowStatus(display.getDisplayId(), result.mImeWindowVis,
		result.mImeBackDisposition, result.mShowImeSwitcher);
		}
		}