Merge "Print out teamfood status of flags" into main (566191e0) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/flags/FlagCommand.java

+24 −3

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,13 @@ public class FlagCommand implements Command {
	\|\| (flag instanceof SysPropFlag);		\|\| (flag instanceof SysPropFlag);
	}		}

			private Boolean isTeamfoodFlag(Flag<?> flag) {
			if (!(flag instanceof BooleanFlag)) {
			return null;
			}
			return flag.getTeamfood();
			}

	private boolean isBooleanFlagEnabled(Flag<?> flag) {		private boolean isBooleanFlagEnabled(Flag<?> flag) {
	if (flag instanceof ReleasedFlag) {		if (flag instanceof ReleasedFlag) {
	return mFeatureFlags.isEnabled((ReleasedFlag) flag);		return mFeatureFlags.isEnabled((ReleasedFlag) flag);
	@@ -232,11 +239,13 @@ public class FlagCommand implements Command {
	for (int i = 0; i < longestFieldName - "Flag Name".length() + 1; i++) {		for (int i = 0; i < longestFieldName - "Flag Name".length() + 1; i++) {
	pw.print(" ");		pw.print(" ");
	}		}
	pw.println(" Value");		pw.print(" Value ");
			pw.println(" Teamfood?");
	for (int i = 0; i < longestFieldName; i++) {		for (int i = 0; i < longestFieldName; i++) {
	pw.print("=");		pw.print("=");
	}		}
	pw.println(" ========");		pw.println(" ======= ===========");

	for (String fieldName : fields.keySet()) {		for (String fieldName : fields.keySet()) {
	Flag<?> flag = fields.get(fieldName);		Flag<?> flag = fields.get(fieldName);
	if (!mAllFlags.containsKey(flag.getName())) {		if (!mAllFlags.containsKey(flag.getName())) {
	@@ -249,7 +258,19 @@ public class FlagCommand implements Command {
	}		}
	pw.print(" ");		pw.print(" ");
	if (isBooleanFlag(flag)) {		if (isBooleanFlag(flag)) {
	pw.println(isBooleanFlagEnabled(flag));		boolean enabled = isBooleanFlagEnabled(flag);
			pw.print(enabled);
			if (enabled) {
			pw.print(" ");
			} else {
			pw.print(" ");
			}
			Boolean teamfood = isTeamfoodFlag(flag);
			if (teamfood != null) {
			pw.print(teamfood);
			}
			pw.println();

	} else if (isStringFlag(flag)) {		} else if (isStringFlag(flag)) {
	pw.println(getStringFlag(flag));		pw.println(getStringFlag(flag));
	} else if (isIntFlag(flag)) {		} else if (isIntFlag(flag)) {