Merge "Convert Flags.java to Flags.kt" into tm-qpr-dev am: 8c0ea7ee86 (7885577e) · Commits · e / os / android_frameworks_base

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

deleted100644 → 0

+0 −430

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.flags;

		import static android.provider.DeviceConfig.NAMESPACE_WINDOW_MANAGER;

		import com.android.internal.annotations.Keep;
		import com.android.systemui.R;

		import java.lang.reflect.Field;
		import java.util.ArrayList;
		import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		/**
		* List of {@link Flag} objects for use in SystemUI.
		*
		* Flag Ids are integers.
		* Ids must be unique. This is enforced in a unit test.
		* Ids need not be sequential. Flags can "claim" a chunk of ids for flags in related features with
		* a comment. This is purely for organizational purposes.
		*
		* On public release builds, flags will always return their default value. There is no way to
		* change their value on release builds.
		*
		* See {@link FeatureFlagsDebug} for instructions on flipping the flags via adb.
		*/
		public class Flags {
		public static final UnreleasedFlag TEAMFOOD = new UnreleasedFlag(1);

		/***************************************/
		// 100 - notification
		// TODO(b/254512751): Tracking Bug
		public static final UnreleasedFlag NOTIFICATION_PIPELINE_DEVELOPER_LOGGING =
		new UnreleasedFlag(103);

		// TODO(b/254512732): Tracking Bug
		public static final UnreleasedFlag NSSL_DEBUG_LINES =
		new UnreleasedFlag(105);

		// TODO(b/254512505): Tracking Bug
		public static final UnreleasedFlag NSSL_DEBUG_REMOVE_ANIMATION =
		new UnreleasedFlag(106);

		// TODO(b/254512624): Tracking Bug
		public static final ResourceBooleanFlag NOTIFICATION_DRAG_TO_CONTENTS =
		new ResourceBooleanFlag(108, R.bool.config_notificationToContents);

		// TODO(b/254512517): Tracking Bug
		public static final UnreleasedFlag FSI_REQUIRES_KEYGUARD =
		new UnreleasedFlag(110, true);

		// TODO(b/254512538): Tracking Bug
		public static final UnreleasedFlag INSTANT_VOICE_REPLY = new UnreleasedFlag(111, true);

		// TODO(b/254512425): Tracking Bug
		public static final UnreleasedFlag NOTIFICATION_MEMORY_MONITOR_ENABLED = new UnreleasedFlag(112,
		false);

		// TODO(b/254512731): Tracking Bug
		public static final UnreleasedFlag NOTIFICATION_DISMISSAL_FADE = new UnreleasedFlag(113, true);

		public static final UnreleasedFlag STABILITY_INDEX_FIX = new UnreleasedFlag(114, true);

		public static final UnreleasedFlag SEMI_STABLE_SORT = new UnreleasedFlag(115, true);

		// next id: 116

		/***************************************/
		// 200 - keyguard/lockscreen

		// Flag retired
		// public static final BooleanFlag KEYGUARD_LAYOUT =
		// new BooleanFlag(200, true);

		// TODO(b/254512713): Tracking Bug
		public static final ReleasedFlag LOCKSCREEN_ANIMATIONS =
		new ReleasedFlag(201);

		// TODO(b/254512750): Tracking Bug
		public static final ReleasedFlag NEW_UNLOCK_SWIPE_ANIMATION =
		new ReleasedFlag(202);

		public static final ResourceBooleanFlag CHARGING_RIPPLE =
		new ResourceBooleanFlag(203, R.bool.flag_charging_ripple);

		// TODO(b/254512281): Tracking Bug
		public static final ResourceBooleanFlag BOUNCER_USER_SWITCHER =
		new ResourceBooleanFlag(204, R.bool.config_enableBouncerUserSwitcher);

		// TODO(b/254512694): Tracking Bug
		public static final ResourceBooleanFlag FACE_SCANNING_ANIM =
		new ResourceBooleanFlag(205, R.bool.config_enableFaceScanningAnimation);

		// TODO(b/254512676): Tracking Bug
		public static final UnreleasedFlag LOCKSCREEN_CUSTOM_CLOCKS =
		new UnreleasedFlag(207, /* teamfood = */ true);

		/**
		* Flag to enable the usage of the new bouncer data source. This is a refactor of and
		* eventual replacement of KeyguardBouncer.java.
		*/
		// TODO(b/254512385): Tracking Bug
		public static final UnreleasedFlag MODERN_BOUNCER = new UnreleasedFlag(208);

		/**
		* Whether the user interactor and repository should use `UserSwitcherController`.
		*
		* <p>If this is {@code false}, the interactor and repo skip the controller and directly access
		* the framework APIs.
		*/
		// TODO(b/254513286): Tracking Bug
		public static final UnreleasedFlag USER_INTERACTOR_AND_REPO_USE_CONTROLLER =
		new UnreleasedFlag(210);

		/**
		* Whether `UserSwitcherController` should use the user interactor.
		*
		* <p>When this is {@code true}, the controller does not directly access framework APIs.
		* Instead, it goes through the interactor.
		*
		* <p>Note: do not set this to true if {@link #USER_INTERACTOR_AND_REPO_USE_CONTROLLER} is
		* {@code true} as it would created a cycle between controller -> interactor -> controller.
		*/
		// TODO(b/254513102): Tracking Bug
		public static final ReleasedFlag USER_CONTROLLER_USES_INTERACTOR = new ReleasedFlag(211);

		/**
		* Whether the clock on a wide lock screen should use the new "stepping" animation for moving
		* the digits when the clock moves.
		*/
		public static final UnreleasedFlag STEP_CLOCK_ANIMATION = new UnreleasedFlag(212);

		/***************************************/
		// 300 - power menu
		// TODO(b/254512600): Tracking Bug
		public static final ReleasedFlag POWER_MENU_LITE =
		new ReleasedFlag(300);

		/***************************************/
		// 400 - smartspace

		// TODO(b/254513100): Tracking Bug
		public static final ReleasedFlag SMARTSPACE_SHARED_ELEMENT_TRANSITION_ENABLED =
		new ReleasedFlag(401);

		public static final ResourceBooleanFlag SMARTSPACE =
		new ResourceBooleanFlag(402, R.bool.flag_smartspace);

		/***************************************/
		// 500 - quick settings
		/**
		* @deprecated Not needed anymore
		*/
		@Deprecated
		public static final ReleasedFlag NEW_USER_SWITCHER =
		new ReleasedFlag(500);

		// TODO(b/254512321): Tracking Bug
		public static final UnreleasedFlag COMBINED_QS_HEADERS =
		new UnreleasedFlag(501, true);

		public static final ResourceBooleanFlag PEOPLE_TILE =
		new ResourceBooleanFlag(502, R.bool.flag_conversations);

		public static final ResourceBooleanFlag QS_USER_DETAIL_SHORTCUT =
		new ResourceBooleanFlag(503, R.bool.flag_lockscreen_qs_user_detail_shortcut);

		/**
		* @deprecated Not needed anymore
		*/
		// TODO(b/254512699): Tracking Bug
		@Deprecated
		public static final ReleasedFlag NEW_FOOTER = new ReleasedFlag(504);

		// TODO(b/254512747): Tracking Bug
		public static final UnreleasedFlag NEW_HEADER = new UnreleasedFlag(505, true);
		// TODO(b/254512383): Tracking Bug
		public static final ResourceBooleanFlag FULL_SCREEN_USER_SWITCHER =
		new ResourceBooleanFlag(506, R.bool.config_enableFullscreenUserSwitcher);

		// TODO(b/254512678): Tracking Bug
		public static final ReleasedFlag NEW_FOOTER_ACTIONS = new ReleasedFlag(507);

		/***************************************/
		// 600- status bar
		// TODO(b/254513246): Tracking Bug
		public static final ResourceBooleanFlag STATUS_BAR_USER_SWITCHER =
		new ResourceBooleanFlag(602, R.bool.flag_user_switcher_chip);

		// TODO(b/254513025): Tracking Bug
		public static final ReleasedFlag STATUS_BAR_LETTERBOX_APPEARANCE =
		new ReleasedFlag(603, false);

		/**
		* @deprecated replaced by mobile and wifi specific flags.
		*
		* TODO(b/254512623): Tracking Bug
		*/
		@Deprecated
		public static final UnreleasedFlag NEW_STATUS_BAR_PIPELINE_BACKEND =
		new UnreleasedFlag(604, false);

		/**
		* @deprecated replaced by mobile and wifi specific flags.
		*
		* TODO(b/254512660): Tracking Bug
		*/
		@Deprecated
		public static final UnreleasedFlag NEW_STATUS_BAR_PIPELINE_FRONTEND =
		new UnreleasedFlag(605, false);

		public static final UnreleasedFlag NEW_STATUS_BAR_MOBILE_ICONS =
		new UnreleasedFlag(606, false);

		public static final UnreleasedFlag NEW_STATUS_BAR_WIFI_ICON =
		new UnreleasedFlag(607, false);

		/***************************************/
		// 700 - dialer/calls
		// TODO(b/254512734): Tracking Bug
		public static final ReleasedFlag ONGOING_CALL_STATUS_BAR_CHIP =
		new ReleasedFlag(700);

		// TODO(b/254512681): Tracking Bug
		public static final ReleasedFlag ONGOING_CALL_IN_IMMERSIVE =
		new ReleasedFlag(701);

		// TODO(b/254512753): Tracking Bug
		public static final ReleasedFlag ONGOING_CALL_IN_IMMERSIVE_CHIP_TAP =
		new ReleasedFlag(702);

		/***************************************/
		// 800 - general visual/theme
		public static final ResourceBooleanFlag MONET =
		new ResourceBooleanFlag(800, R.bool.flag_monet);

		/***************************************/
		// 801 - region sampling
		// TODO(b/254512848): Tracking Bug
		public static final UnreleasedFlag REGION_SAMPLING = new UnreleasedFlag(801);

		// 802 - wallpaper rendering
		// TODO(b/254512923): Tracking Bug
		public static final UnreleasedFlag USE_CANVAS_RENDERER = new UnreleasedFlag(802, true);

		// 803 - screen contents translation
		// TODO(b/254513187): Tracking Bug
		public static final UnreleasedFlag SCREEN_CONTENTS_TRANSLATION = new UnreleasedFlag(803);

		// 804 - monochromatic themes
		public static final UnreleasedFlag MONOCHROMATIC_THEMES = new UnreleasedFlag(804);

		/***************************************/
		// 900 - media
		// TODO(b/254512697): Tracking Bug
		public static final ReleasedFlag MEDIA_TAP_TO_TRANSFER = new ReleasedFlag(900);
		// TODO(b/254512502): Tracking Bug
		public static final UnreleasedFlag MEDIA_SESSION_ACTIONS = new UnreleasedFlag(901);
		// TODO(b/254512726): Tracking Bug
		public static final ReleasedFlag MEDIA_NEARBY_DEVICES = new ReleasedFlag(903);
		// TODO(b/254512695): Tracking Bug
		public static final ReleasedFlag MEDIA_MUTE_AWAIT = new ReleasedFlag(904);
		// TODO(b/254512654): Tracking Bug
		public static final UnreleasedFlag DREAM_MEDIA_COMPLICATION = new UnreleasedFlag(905);
		// TODO(b/254512673): Tracking Bug
		public static final UnreleasedFlag DREAM_MEDIA_TAP_TO_OPEN = new UnreleasedFlag(906);
		// TODO(b/254513168): Tracking Bug
		public static final UnreleasedFlag UMO_SURFACE_RIPPLE = new UnreleasedFlag(907);

		// 1000 - dock
		public static final ReleasedFlag SIMULATE_DOCK_THROUGH_CHARGING =
		new ReleasedFlag(1000);

		// TODO(b/254512444): Tracking Bug
		public static final ReleasedFlag DOCK_SETUP_ENABLED = new ReleasedFlag(1001);

		// TODO(b/254512758): Tracking Bug
		public static final ReleasedFlag ROUNDED_BOX_RIPPLE = new ReleasedFlag(1002);

		// TODO(b/254512525): Tracking Bug
		public static final ReleasedFlag REFACTORED_DOCK_SETUP = new ReleasedFlag(1003);

		// 1100 - windowing
		@Keep
		public static final SysPropBooleanFlag WM_ENABLE_SHELL_TRANSITIONS =
		new SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", false);

		/**
		* b/170163464: animate bubbles expanded view collapse with home gesture
		*/
		@Keep
		public static final SysPropBooleanFlag BUBBLES_HOME_GESTURE =
		new SysPropBooleanFlag(1101, "persist.wm.debug.bubbles_home_gesture", true);

		// TODO(b/254513207): Tracking Bug
		@Keep
		public static final DeviceConfigBooleanFlag WM_ENABLE_PARTIAL_SCREEN_SHARING =
		new DeviceConfigBooleanFlag(1102, "record_task_content",
		NAMESPACE_WINDOW_MANAGER, false, true);

		// TODO(b/254512674): Tracking Bug
		@Keep
		public static final SysPropBooleanFlag HIDE_NAVBAR_WINDOW =
		new SysPropBooleanFlag(1103, "persist.wm.debug.hide_navbar_window", false);

		@Keep
		public static final SysPropBooleanFlag WM_DESKTOP_WINDOWING =
		new SysPropBooleanFlag(1104, "persist.wm.debug.desktop_mode", false);

		@Keep
		public static final SysPropBooleanFlag WM_CAPTION_ON_SHELL =
		new SysPropBooleanFlag(1105, "persist.wm.debug.caption_on_shell", false);

		@Keep
		public static final SysPropBooleanFlag FLOATING_TASKS_ENABLED =
		new SysPropBooleanFlag(1106, "persist.wm.debug.floating_tasks", false);

		@Keep
		public static final SysPropBooleanFlag SHOW_FLOATING_TASKS_AS_BUBBLES =
		new SysPropBooleanFlag(1107, "persist.wm.debug.floating_tasks_as_bubbles", false);

		@Keep
		public static final SysPropBooleanFlag ENABLE_FLING_TO_DISMISS_BUBBLE =
		new SysPropBooleanFlag(1108, "persist.wm.debug.fling_to_dismiss_bubble", true);
		@Keep
		public static final SysPropBooleanFlag ENABLE_FLING_TO_DISMISS_PIP =
		new SysPropBooleanFlag(1109, "persist.wm.debug.fling_to_dismiss_pip", true);

		@Keep
		public static final SysPropBooleanFlag ENABLE_PIP_KEEP_CLEAR_ALGORITHM =
		new SysPropBooleanFlag(1110, "persist.wm.debug.enable_pip_keep_clear_algorithm", false);

		// 1200 - predictive back
		@Keep
		public static final SysPropBooleanFlag WM_ENABLE_PREDICTIVE_BACK = new SysPropBooleanFlag(
		1200, "persist.wm.debug.predictive_back", true);
		@Keep
		public static final SysPropBooleanFlag WM_ENABLE_PREDICTIVE_BACK_ANIM = new SysPropBooleanFlag(
		1201, "persist.wm.debug.predictive_back_anim", false);
		@Keep
		public static final SysPropBooleanFlag WM_ALWAYS_ENFORCE_PREDICTIVE_BACK =
		new SysPropBooleanFlag(1202, "persist.wm.debug.predictive_back_always_enforce", false);

		// TODO(b/254512728): Tracking Bug
		public static final UnreleasedFlag NEW_BACK_AFFORDANCE =
		new UnreleasedFlag(1203, false /* teamfood */);

		// 1300 - screenshots

		// TODO(b/254512719): Tracking Bug
		public static final UnreleasedFlag SCREENSHOT_REQUEST_PROCESSOR = new UnreleasedFlag(1300);
		// TODO(b/254513155): Tracking Bug
		public static final UnreleasedFlag SCREENSHOT_WORK_PROFILE_POLICY = new UnreleasedFlag(1301);

		// 1400 - columbus
		// TODO(b/254512756): Tracking Bug
		public static final ReleasedFlag QUICK_TAP_IN_PCC = new ReleasedFlag(1400);

		// 1500 - chooser
		// TODO(b/254512507): Tracking Bug
		public static final UnreleasedFlag CHOOSER_UNBUNDLED = new UnreleasedFlag(1500);

		// 1700 - clipboard
		public static final UnreleasedFlag CLIPBOARD_OVERLAY_REFACTOR = new UnreleasedFlag(1700);

		// 1800 - shade container
		public static final UnreleasedFlag LEAVE_SHADE_OPEN_FOR_BUGREPORT =
		new UnreleasedFlag(1800, true);

		// Pay no attention to the reflection behind the curtain.
		// ========================== Curtain ==========================
		// \| \|
		// \| . . . . . . . . . . . . . . . . . . . \|
		private static Map<Integer, Flag<?>> sFlagMap;
		static Map<Integer, Flag<?>> collectFlags() {
		if (sFlagMap != null) {
		return sFlagMap;
		}

		Map<Integer, Flag<?>> flags = new HashMap<>();
		List<Field> flagFields = getFlagFields();

		for (Field field : flagFields) {
		try {
		Flag<?> flag = (Flag<?>) field.get(null);
		flags.put(flag.getId(), flag);
		} catch (IllegalAccessException e) {
		// no-op
		}
		}

		sFlagMap = flags;

		return sFlagMap;
		}

		static List<Field> getFlagFields() {
		Field[] fields = Flags.class.getFields();
		List<Field> result = new ArrayList<>();

		for (Field field : fields) {
		Class<?> t = field.getType();
		if (Flag.class.isAssignableFrom(t)) {
		result.add(field);
		}
		}

		return result;
		}
		// \| . . . . . . . . . . . . . . . . . . . \|
		// \| \|
		// \_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/\_/

		}

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

0 → 100644

+353 −0

File added.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/tests/src/com/android/systemui/flags/FlagCommandTest.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -50,14 +50,6 @@ class FlagCommandTest : SysuiTestCase() {
		cmd = FlagCommand(featureFlags, flagMap)
		}

		@Test
		fun noOpCommand() {
		cmd.execute(pw, ArrayList())
		Mockito.verify(pw, Mockito.atLeastOnce()).println()
		Mockito.verify(featureFlags).isEnabled(flagA)
		Mockito.verify(featureFlags).isEnabled(flagB)
		}

		@Test
		fun readFlagCommand() {
		cmd.execute(pw, listOf(flagA.id.toString()))

packages/SystemUI/tests/utils/src/com/android/systemui/flags/FakeFeatureFlags.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ class FakeFeatureFlags : FeatureFlags {
		private val listenerFlagIds = mutableMapOf<FlagListenable.Listener, MutableSet<Int>>()

		init {
		Flags.getFlagFields().forEach { field ->
		Flags.flagFields.forEach { field ->
		val flag: Flag<> = field.get(null) as Flag<>
		knownFlagNames[flag.id] = field.name
		}