Merge "Improve window manager layout attribute dumping" (7ace43b5) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/ActivityInfo.java

+17 −1

Original line number	Diff line number	Diff line
		@@ -1257,6 +1257,22 @@ public class ActivityInfo extends ComponentInfo implements Parcelable {
		}
		}

		/**
		* @hide
		*/
		public static String colorModeToString(@ColorMode int colorMode) {
		switch (colorMode) {
		case COLOR_MODE_DEFAULT:
		return "COLOR_MODE_DEFAULT";
		case COLOR_MODE_WIDE_COLOR_GAMUT:
		return "COLOR_MODE_WIDE_COLOR_GAMUT";
		case COLOR_MODE_HDR:
		return "COLOR_MODE_HDR";
		default:
		return Integer.toString(colorMode);
		}
		}

		public static final Parcelable.Creator<ActivityInfo> CREATOR
		= new Parcelable.Creator<ActivityInfo>() {
		public ActivityInfo createFromParcel(Parcel source) {

core/java/android/view/Gravity.java

+53 −0

Original line number	Diff line number	Diff line
		@@ -440,4 +440,57 @@ public class Gravity
		}
		return result;
		}

		/**
		* @hide
		*/
		public static String toString(int gravity) {
		final StringBuilder result = new StringBuilder();
		if ((gravity & FILL) != 0) {
		result.append("FILL").append(' ');
		} else {
		if ((gravity & FILL_VERTICAL) != 0) {
		result.append("FILL_VERTICAL").append(' ');
		} else {
		if ((gravity & TOP) != 0) {
		result.append("TOP").append(' ');
		}
		if ((gravity & BOTTOM) != 0) {
		result.append("BOTTOM").append(' ');
		}
		}
		if ((gravity & FILL_HORIZONTAL) != 0) {
		result.append("FILL_HORIZONTAL").append(' ');
		} else {
		if ((gravity & START) != 0) {
		result.append("START").append(' ');
		} else if ((gravity & LEFT) != 0) {
		result.append("LEFT").append(' ');
		}
		if ((gravity & END) != 0) {
		result.append("END").append(' ');
		} else if ((gravity & RIGHT) != 0) {
		result.append("RIGHT").append(' ');
		}
		}
		}
		if ((gravity & CENTER) != 0) {
		result.append("CENTER").append(' ');
		} else {
		if ((gravity & CENTER_VERTICAL) != 0) {
		result.append("CENTER_VERTICAL").append(' ');
		}
		if ((gravity & CENTER_HORIZONTAL) != 0) {
		result.append("CENTER_HORIZONTAL").append(' ');
		}
		}
		if ((gravity & DISPLAY_CLIP_VERTICAL) != 0) {
		result.append("DISPLAY_CLIP_VERTICAL").append(' ');
		}
		if ((gravity & DISPLAY_CLIP_VERTICAL) != 0) {
		result.append("DISPLAY_CLIP_VERTICAL").append(' ');
		}
		result.deleteCharAt(result.length() - 1);
		return result.toString();
		}
		}

core/java/android/view/View.java

+84 −9

Original line number	Diff line number	Diff line
		@@ -3744,13 +3744,88 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		@ViewDebug.ExportedProperty(flagMapping = {
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LOW_PROFILE,
		equals = SYSTEM_UI_FLAG_LOW_PROFILE,
		name = "SYSTEM_UI_FLAG_LOW_PROFILE", outputIf = true),
		name = "LOW_PROFILE"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
		equals = SYSTEM_UI_FLAG_HIDE_NAVIGATION,
		name = "SYSTEM_UI_FLAG_HIDE_NAVIGATION", outputIf = true),
		@ViewDebug.FlagToString(mask = PUBLIC_STATUS_BAR_VISIBILITY_MASK,
		equals = SYSTEM_UI_FLAG_VISIBLE,
		name = "SYSTEM_UI_FLAG_VISIBLE", outputIf = true)
		name = "HIDE_NAVIGATION"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_FULLSCREEN,
		equals = SYSTEM_UI_FLAG_FULLSCREEN,
		name = "FULLSCREEN"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_STABLE,
		equals = SYSTEM_UI_FLAG_LAYOUT_STABLE,
		name = "LAYOUT_STABLE"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
		equals = SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION,
		name = "LAYOUT_HIDE_NAVIGATION"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
		equals = SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN,
		name = "LAYOUT_FULLSCREEN"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE,
		equals = SYSTEM_UI_FLAG_IMMERSIVE,
		name = "IMMERSIVE"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
		equals = SYSTEM_UI_FLAG_IMMERSIVE_STICKY,
		name = "IMMERSIVE_STICKY"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
		equals = SYSTEM_UI_FLAG_LIGHT_STATUS_BAR,
		name = "LIGHT_STATUS_BAR"),
		@ViewDebug.FlagToString(mask = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
		equals = SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR,
		name = "LIGHT_NAVIGATION_BAR"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_EXPAND,
		equals = STATUS_BAR_DISABLE_EXPAND,
		name = "STATUS_BAR_DISABLE_EXPAND"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
		equals = STATUS_BAR_DISABLE_NOTIFICATION_ICONS,
		name = "STATUS_BAR_DISABLE_NOTIFICATION_ICONS"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
		equals = STATUS_BAR_DISABLE_NOTIFICATION_ALERTS,
		name = "STATUS_BAR_DISABLE_NOTIFICATION_ALERTS"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
		equals = STATUS_BAR_DISABLE_NOTIFICATION_TICKER,
		name = "STATUS_BAR_DISABLE_NOTIFICATION_TICKER"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SYSTEM_INFO,
		equals = STATUS_BAR_DISABLE_SYSTEM_INFO,
		name = "STATUS_BAR_DISABLE_SYSTEM_INFO"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_HOME,
		equals = STATUS_BAR_DISABLE_HOME,
		name = "STATUS_BAR_DISABLE_HOME"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_BACK,
		equals = STATUS_BAR_DISABLE_BACK,
		name = "STATUS_BAR_DISABLE_BACK"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_CLOCK,
		equals = STATUS_BAR_DISABLE_CLOCK,
		name = "STATUS_BAR_DISABLE_CLOCK"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_RECENT,
		equals = STATUS_BAR_DISABLE_RECENT,
		name = "STATUS_BAR_DISABLE_RECENT"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_DISABLE_SEARCH,
		equals = STATUS_BAR_DISABLE_SEARCH,
		name = "STATUS_BAR_DISABLE_SEARCH"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_TRANSIENT,
		equals = STATUS_BAR_TRANSIENT,
		name = "STATUS_BAR_TRANSIENT"),
		@ViewDebug.FlagToString(mask = NAVIGATION_BAR_TRANSIENT,
		equals = NAVIGATION_BAR_TRANSIENT,
		name = "NAVIGATION_BAR_TRANSIENT"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_UNHIDE,
		equals = STATUS_BAR_UNHIDE,
		name = "STATUS_BAR_UNHIDE"),
		@ViewDebug.FlagToString(mask = NAVIGATION_BAR_UNHIDE,
		equals = NAVIGATION_BAR_UNHIDE,
		name = "NAVIGATION_BAR_UNHIDE"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_TRANSLUCENT,
		equals = STATUS_BAR_TRANSLUCENT,
		name = "STATUS_BAR_TRANSLUCENT"),
		@ViewDebug.FlagToString(mask = NAVIGATION_BAR_TRANSLUCENT,
		equals = NAVIGATION_BAR_TRANSLUCENT,
		name = "NAVIGATION_BAR_TRANSLUCENT"),
		@ViewDebug.FlagToString(mask = NAVIGATION_BAR_TRANSPARENT,
		equals = NAVIGATION_BAR_TRANSPARENT,
		name = "NAVIGATION_BAR_TRANSPARENT"),
		@ViewDebug.FlagToString(mask = STATUS_BAR_TRANSPARENT,
		equals = STATUS_BAR_TRANSPARENT,
		name = "STATUS_BAR_TRANSPARENT")
		}, formatToHexString = true)
		int mSystemUiVisibility;

core/java/android/view/ViewDebug.java

+73 −0

Original line number	Diff line number	Diff line
		@@ -1375,6 +1375,79 @@ public class ViewDebug {
		}
		}

		/**
		* Converts an integer from a field that is mapped with {@link IntToString} to its string
		* representation.
		*
		* @param clazz The class the field is defined on.
		* @param field The field on which the {@link ExportedProperty} is defined on.
		* @param integer The value to convert.
		* @return The value converted into its string representation.
		* @hide
		*/
		public static String intToString(Class<?> clazz, String field, int integer) {
		final IntToString[] mapping = getMapping(clazz, field);
		if (mapping == null) {
		return Integer.toString(integer);
		}
		final int count = mapping.length;
		for (int j = 0; j < count; j++) {
		final IntToString map = mapping[j];
		if (map.from() == integer) {
		return map.to();
		}
		}
		return Integer.toString(integer);
		}

		/**
		* Converts a set of flags from a field that is mapped with {@link FlagToString} to its string
		* representation.
		*
		* @param clazz The class the field is defined on.
		* @param field The field on which the {@link ExportedProperty} is defined on.
		* @param flags The flags to convert.
		* @return The flags converted into their string representations.
		* @hide
		*/
		public static String flagsToString(Class<?> clazz, String field, int flags) {
		final FlagToString[] mapping = getFlagMapping(clazz, field);
		if (mapping == null) {
		return Integer.toHexString(flags);
		}
		final StringBuilder result = new StringBuilder();
		final int count = mapping.length;
		for (int j = 0; j < count; j++) {
		final FlagToString flagMapping = mapping[j];
		final boolean ifTrue = flagMapping.outputIf();
		final int maskResult = flags & flagMapping.mask();
		final boolean test = maskResult == flagMapping.equals();
		if (test && ifTrue) {
		final String name = flagMapping.name();
		result.append(name).append(' ');
		}
		}
		result.deleteCharAt(result.length() - 1);
		return result.toString();
		}

		private static FlagToString[] getFlagMapping(Class<?> clazz, String field) {
		try {
		return clazz.getDeclaredField(field).getAnnotation(ExportedProperty.class)
		.flagMapping();
		} catch (NoSuchFieldException e) {
		return null;
		}
		}

		private static IntToString[] getMapping(Class<?> clazz, String field) {
		try {
		return clazz.getDeclaredField(field).getAnnotation(ExportedProperty.class).mapping();
		} catch (NoSuchFieldException e) {
		return null;
		}
		}

		private static void exportUnrolledArray(Context context, BufferedWriter out,
		ExportedProperty property, int[] array, String prefix, String suffix)
		throws IOException {

core/java/android/view/WindowManager.java

+289 −106

File changed.

Preview size limit exceeded, changes collapsed.