Merge "Fix DoubleBraceInitialization errorprone issues" into main (09a4c07e) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/com/android/internal/jank/CujTest.java

+24 −21

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import org.junit.Test;
		import java.lang.reflect.Field;
		import java.lang.reflect.Modifier;
		import java.util.Arrays;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Map;
		@@ -47,26 +46,30 @@ import java.util.stream.Stream;
		public class CujTest {
		private static final String ENUM_NAME_PREFIX =
		"UIINTERACTION_FRAME_INFO_REPORTED__INTERACTION_TYPE__";
		private static final Set<String> DEPRECATED_VALUES = new HashSet<>() {
		{
		add(ENUM_NAME_PREFIX + "IME_INSETS_ANIMATION");
		}
		};
		private static final Map<Integer, String> ENUM_NAME_EXCEPTION_MAP = new HashMap<>() {
		{
		put(Cuj.CUJ_NOTIFICATION_ADD, getEnumName("SHADE_NOTIFICATION_ADD"));
		put(Cuj.CUJ_NOTIFICATION_HEADS_UP_APPEAR, getEnumName("SHADE_HEADS_UP_APPEAR"));
		put(Cuj.CUJ_NOTIFICATION_APP_START, getEnumName("SHADE_APP_LAUNCH"));
		put(Cuj.CUJ_NOTIFICATION_HEADS_UP_DISAPPEAR, getEnumName("SHADE_HEADS_UP_DISAPPEAR"));
		put(Cuj.CUJ_NOTIFICATION_REMOVE, getEnumName("SHADE_NOTIFICATION_REMOVE"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE, getEnumName("NOTIFICATION_SHADE_SWIPE"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE, getEnumName("SHADE_QS_EXPAND_COLLAPSE"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_QS_SCROLL_SWIPE, getEnumName("SHADE_QS_SCROLL_SWIPE"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_ROW_EXPAND, getEnumName("SHADE_ROW_EXPAND"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_ROW_SWIPE, getEnumName("SHADE_ROW_SWIPE"));
		put(Cuj.CUJ_NOTIFICATION_SHADE_SCROLL_FLING, getEnumName("SHADE_SCROLL_FLING"));
		}
		};
		private static final Set<String> DEPRECATED_VALUES = Set.of(
		ENUM_NAME_PREFIX + "IME_INSETS_ANIMATION"
		);
		private static final Map<Integer, String> ENUM_NAME_EXCEPTION_MAP = Map.ofEntries(
		Map.entry(Cuj.CUJ_NOTIFICATION_ADD, getEnumName("SHADE_NOTIFICATION_ADD")),
		Map.entry(Cuj.CUJ_NOTIFICATION_HEADS_UP_APPEAR, getEnumName("SHADE_HEADS_UP_APPEAR")),
		Map.entry(Cuj.CUJ_NOTIFICATION_APP_START, getEnumName("SHADE_APP_LAUNCH")),
		Map.entry(
		Cuj.CUJ_NOTIFICATION_HEADS_UP_DISAPPEAR,
		getEnumName("SHADE_HEADS_UP_DISAPPEAR")),
		Map.entry(Cuj.CUJ_NOTIFICATION_REMOVE, getEnumName("SHADE_NOTIFICATION_REMOVE")),
		Map.entry(
		Cuj.CUJ_NOTIFICATION_SHADE_EXPAND_COLLAPSE,
		getEnumName("NOTIFICATION_SHADE_SWIPE")),
		Map.entry(
		Cuj.CUJ_NOTIFICATION_SHADE_QS_EXPAND_COLLAPSE,
		getEnumName("SHADE_QS_EXPAND_COLLAPSE")),
		Map.entry(
		Cuj.CUJ_NOTIFICATION_SHADE_QS_SCROLL_SWIPE,
		getEnumName("SHADE_QS_SCROLL_SWIPE")),
		Map.entry(Cuj.CUJ_NOTIFICATION_SHADE_ROW_EXPAND, getEnumName("SHADE_ROW_EXPAND")),
		Map.entry(Cuj.CUJ_NOTIFICATION_SHADE_ROW_SWIPE, getEnumName("SHADE_ROW_SWIPE")),
		Map.entry(Cuj.CUJ_NOTIFICATION_SHADE_SCROLL_FLING, getEnumName("SHADE_SCROLL_FLING"))
		);

		@Rule
		public final Expect mExpect = Expect.create();

packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/model/A11yMenuShortcut.java

+26 −27

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import android.util.Log;

		import com.android.systemui.accessibility.accessibilitymenu.R;

		import java.util.HashMap;
		import java.util.Map;

		/**
		@@ -52,80 +51,80 @@ public class A11yMenuShortcut {
		private static final int LABEL_TEXT_INDEX = 3;

		/** Map stores all shortcut resource IDs that is in matching order of defined shortcut. */
		private static final Map<ShortcutId, int[]> sShortcutResource = new HashMap<>() {{
		put(ShortcutId.ID_ASSISTANT_VALUE, new int[] {
		private static final Map<ShortcutId, int[]> sShortcutResource = Map.ofEntries(
		Map.entry(ShortcutId.ID_ASSISTANT_VALUE, new int[] {
		R.drawable.ic_logo_a11y_assistant_24dp,
		R.color.assistant_color,
		R.string.assistant_utterance,
		R.string.assistant_label,
		});
		put(ShortcutId.ID_A11YSETTING_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_A11YSETTING_VALUE, new int[] {
		R.drawable.ic_logo_a11y_settings_24dp,
		R.color.a11y_settings_color,
		R.string.a11y_settings_label,
		R.string.a11y_settings_label,
		});
		put(ShortcutId.ID_POWER_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_POWER_VALUE, new int[] {
		R.drawable.ic_logo_a11y_power_24dp,
		R.color.power_color,
		R.string.power_utterance,
		R.string.power_label,
		});
		put(ShortcutId.ID_RECENT_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_RECENT_VALUE, new int[] {
		R.drawable.ic_logo_a11y_recent_apps_24dp,
		R.color.recent_apps_color,
		R.string.recent_apps_label,
		R.string.recent_apps_label,
		});
		put(ShortcutId.ID_LOCKSCREEN_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_LOCKSCREEN_VALUE, new int[] {
		R.drawable.ic_logo_a11y_lock_24dp,
		R.color.lockscreen_color,
		R.string.lockscreen_label,
		R.string.lockscreen_label,
		});
		put(ShortcutId.ID_QUICKSETTING_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_QUICKSETTING_VALUE, new int[] {
		R.drawable.ic_logo_a11y_quick_settings_24dp,
		R.color.quick_settings_color,
		R.string.quick_settings_label,
		R.string.quick_settings_label,
		});
		put(ShortcutId.ID_NOTIFICATION_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_NOTIFICATION_VALUE, new int[] {
		R.drawable.ic_logo_a11y_notifications_24dp,
		R.color.notifications_color,
		R.string.notifications_label,
		R.string.notifications_label,
		});
		put(ShortcutId.ID_SCREENSHOT_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_SCREENSHOT_VALUE, new int[] {
		R.drawable.ic_logo_a11y_screenshot_24dp,
		R.color.screenshot_color,
		R.string.screenshot_utterance,
		R.string.screenshot_label,
		});
		put(ShortcutId.ID_BRIGHTNESS_UP_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_BRIGHTNESS_UP_VALUE, new int[] {
		R.drawable.ic_logo_a11y_brightness_up_24dp,
		R.color.brightness_color,
		R.string.brightness_up_label,
		R.string.brightness_up_label,
		});
		put(ShortcutId.ID_BRIGHTNESS_DOWN_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_BRIGHTNESS_DOWN_VALUE, new int[] {
		R.drawable.ic_logo_a11y_brightness_down_24dp,
		R.color.brightness_color,
		R.string.brightness_down_label,
		R.string.brightness_down_label,
		});
		put(ShortcutId.ID_VOLUME_UP_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_VOLUME_UP_VALUE, new int[] {
		R.drawable.ic_logo_a11y_volume_up_24dp,
		R.color.volume_color,
		R.string.volume_up_label,
		R.string.volume_up_label,
		});
		put(ShortcutId.ID_VOLUME_DOWN_VALUE, new int[] {
		}),
		Map.entry(ShortcutId.ID_VOLUME_DOWN_VALUE, new int[] {
		R.drawable.ic_logo_a11y_volume_down_24dp,
		R.color.volume_color,
		R.string.volume_down_label,
		R.string.volume_down_label,
		});
		}};
		})
		);

		/** Shortcut id used to identify. */
		private int mShortcutId = ShortcutId.UNSPECIFIED_ID_VALUE.ordinal();