Merge "Move TYPE_WINDOW_CONTROL toString flag check" into main (a0811c0e) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityWindowInfo.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -880,10 +880,6 @@ public final class AccessibilityWindowInfo implements Parcelable {
		* @hide
		*/
		public static String typeToString(int type) {
		if (Flags.enableTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {
		return "TYPE_WINDOW_CONTROL";
		}

		switch (type) {
		case TYPE_APPLICATION: {
		return "TYPE_APPLICATION";
		@@ -903,10 +899,14 @@ public final class AccessibilityWindowInfo implements Parcelable {
		case TYPE_MAGNIFICATION_OVERLAY: {
		return "TYPE_MAGNIFICATION_OVERLAY";
		}
		default:
		default: {
		if (Flags.enableTypeWindowControl() && type == TYPE_WINDOW_CONTROL) {
		return "TYPE_WINDOW_CONTROL";
		}
		return "<UNKNOWN:" + type + ">";
		}
		}
		}

		/**
		* Reports how this window differs from a possibly different state of the same window. The