Merge "Remove unused/obsolete feature flags" into udc-dev (4f69ca52) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -41,11 +41,9 @@ import com.android.launcher3.allapps.AllAppsTransitionController;
		import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.anim.PendingAnimation;
		import com.android.launcher3.compat.AccessibilityManagerCompat;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.TaskUtils;
		import com.android.quickstep.TopTaskTracker;
		import com.android.quickstep.util.AnimatorControllerWithResistance;
		import com.android.quickstep.util.OverviewToHomeAnim;
		import com.android.quickstep.views.RecentsView;
		@@ -108,11 +106,6 @@ public class NavBarToHomeTouchController implements TouchController,
		if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {
		return true;
		}
		if (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
		&& TopTaskTracker.INSTANCE.get(mLauncher).getCachedTopTask(false)
		.isExcludedAssistant()) {
		return true;
		}
		return false;
		}

quickstep/src/com/android/quickstep/TouchInteractionService.java

+3 −9

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import static android.view.MotionEvent.ACTION_POINTER_UP;
		import static android.view.MotionEvent.ACTION_UP;

		import static com.android.launcher3.Launcher.INTENT_ACTION_ALL_APPS_TOGGLE;
		import static com.android.launcher3.config.FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_TRACKPAD_GESTURE;
		import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;
		import static com.android.quickstep.GestureState.DEFAULT_STATE;
		@@ -1089,22 +1088,17 @@ public class TouchInteractionService extends Service
		boolean hasWindowFocus = activity.getRootView().hasWindowFocus();
		boolean isPreviousGestureAnimatingToLauncher =
		previousGestureState.isRunningAnimationToLauncher();
		boolean forcingOverviewInputConsumer =
		ASSISTANT_GIVES_LAUNCHER_FOCUS.get() && forceOverviewInputConsumer;
		boolean isInLiveTileMode = gestureState.getActivityInterface().isInLiveTileMode();
		reasonString.append(SUBSTRING_PREFIX)
		.append(hasWindowFocus
		? "activity has window focus"
		: (isPreviousGestureAnimatingToLauncher
		? "previous gesture is still animating to launcher"
		: (forcingOverviewInputConsumer
		? "assistant gives launcher focus and forcing focus"
		: (isInLiveTileMode
		: isInLiveTileMode
		? "device is in live mode"
		: "all overview focus conditions failed"))));
		: "all overview focus conditions failed"));
		if (hasWindowFocus
		\|\| isPreviousGestureAnimatingToLauncher
		\|\| forcingOverviewInputConsumer
		\|\| isInLiveTileMode) {
		reasonString.append(SUBSTRING_PREFIX)
		.append("overview should have focus, using OverviewInputConsumer");

src/com/android/launcher3/config/FeatureFlags.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -211,17 +211,9 @@ public final class FeatureFlags {
		"Allows on device search in all apps logging");

		// TODO(Block 14): Cleanup flags
		public static final BooleanFlag ASSISTANT_GIVES_LAUNCHER_FOCUS = getDebugFlag(270391641,
		"ASSISTANT_GIVES_LAUNCHER_FOCUS", DISABLED,
		"Allow Launcher to handle nav bar gestures while Assistant is running over it");

		public static final BooleanFlag NOTIFY_CRASHES = getDebugFlag(270393108, "NOTIFY_CRASHES",
		DISABLED, "Sends a notification whenever launcher encounters an uncaught exception.");

		public static final BooleanFlag FORCE_PERSISTENT_TASKBAR = getDebugFlag(270395077,
		"FORCE_PERSISTENT_TASKBAR", DISABLED, "Forces taskbar to be persistent, even in gesture"
		+ " nav mode and when transient taskbar is enabled.");

		public static final BooleanFlag ENABLE_TRANSIENT_TASKBAR = getDebugFlag(270395798,
		"ENABLE_TRANSIENT_TASKBAR", ENABLED, "Enables transient taskbar.");