Merge "Removing unused tracing" (e1358149) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SY
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.content.res.Configuration;
		import android.util.Log;
		import android.view.View;

		import com.android.launcher3.BaseQuickstepLauncher;
		@@ -55,7 +54,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems;
		import com.android.launcher3.model.data.ItemInfo;
		import com.android.launcher3.popup.SystemShortcut;
		import com.android.launcher3.statemanager.StateManager.AtomicAnimationFactory;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.uioverrides.states.QuickstepAtomicAnimationFactory;
		import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController;
		import com.android.launcher3.uioverrides.touchcontrollers.NavBarToHomeTouchController;
		@@ -273,9 +271,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {

		@Override
		public TouchController[] createTouchControllers() {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.1");
		}
		Mode mode = SysUINavigationMode.getMode(this);

		ArrayList<TouchController> list = new ArrayList<>();
		@@ -283,9 +278,6 @@ public class QuickstepLauncher extends BaseQuickstepLauncher {
		if (mode == NO_BUTTON) {
		list.add(new NoButtonQuickSwitchTouchController(this));
		list.add(new NavBarToHomeTouchController(this));
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "createTouchControllers.2");
		}
		list.add(new NoButtonNavbarToOverviewTouchController(this));
		} else {
		if (getDeviceProfile().isVerticalBarLayout()) {

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCH
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

		import android.animation.ValueAnimator;
		import android.util.Log;
		import android.view.MotionEvent;
		import android.view.animation.Interpolator;

		@@ -47,7 +46,6 @@ import com.android.launcher3.compat.AccessibilityManagerCompat;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.graphics.OverviewScrim;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.touch.SingleAxisSwipeDetector;
		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.TaskUtils;
		@@ -103,37 +101,19 @@ public class NavBarToHomeTouchController implements TouchController,
		}

		private boolean canInterceptTouch(MotionEvent ev) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NavBarToHomeTouchController.canInterceptTouch "
		+ ev);
		}
		boolean cameFromNavBar = (ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) != 0;
		if (!cameFromNavBar) {
		return false;
		}
		if (mStartState.overviewUi \|\| mStartState == ALL_APPS) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED,
		"NavBarToHomeTouchController.canInterceptTouch true 1 "
		+ mStartState.overviewUi + " " + (mStartState == ALL_APPS));
		}
		return true;
		}
		int typeToClose = ENABLE_ALL_APPS_EDU.get() ? TYPE_ALL & ~TYPE_ALL_APPS_EDU : TYPE_ALL;
		if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED,
		"NavBarToHomeTouchController.canInterceptTouch true 2 "
		+ AbstractFloatingView.getTopOpenView(mLauncher), new Exception());
		}
		return true;
		}
		if (FeatureFlags.ASSISTANT_GIVES_LAUNCHER_FOCUS.get()
		&& AssistantUtilities.isExcludedAssistantRunning()) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED,
		"NavBarToHomeTouchController.canInterceptTouch true 3");
		}
		return true;
		}
		return false;

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_O
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.graphics.PointF;
		import android.util.Log;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.ViewConfiguration;
		@@ -49,7 +48,6 @@ import com.android.launcher3.anim.AnimatorPlaybackController;
		import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.graphics.OverviewScrim;
		import com.android.launcher3.states.StateAnimationConfig;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.util.VibratorWrapper;
		import com.android.quickstep.SystemUiProxy;
		import com.android.quickstep.util.AnimatorControllerWithResistance;
		@@ -90,9 +88,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch
		mRecentsView = l.getOverviewPanel();
		mMotionPauseDetector = new MotionPauseDetector(l);
		mMotionPauseMinDisplacement = ViewConfiguration.get(l).getScaledTouchSlop();
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController.ctor");
		}
		}

		@Override
		@@ -221,9 +216,6 @@ public class NoButtonNavbarToOverviewTouchController extends PortraitStatesTouch

		@Override
		public boolean onDrag(float yDisplacement, float xDisplacement, MotionEvent event) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "NoButtonNavbarToOverviewTouchController");
		}
		if (mStartedOverview) {
		if (!mReachedOverview) {
		mStartDisplacement.set(xDisplacement, yDisplacement);

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -59,7 +59,6 @@ import android.graphics.PointF;
		import android.graphics.Rect;
		import android.os.Build;
		import android.os.SystemClock;
		import android.util.Log;
		import android.view.MotionEvent;
		import android.view.View;
		import android.view.View.OnApplyWindowInsetsListener;
		@@ -80,7 +79,6 @@ import com.android.launcher3.anim.Interpolators;
		import com.android.launcher3.logging.StatsLogManager;
		import com.android.launcher3.logging.StatsLogManager.StatsLogger;
		import com.android.launcher3.statemanager.StatefulActivity;
		import com.android.launcher3.testing.TestProtocol;
		import com.android.launcher3.tracing.InputConsumerProto;
		import com.android.launcher3.tracing.SwipeHandlerProto;
		import com.android.launcher3.util.TraceHelper;
		@@ -324,13 +322,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<?>, Q extends

		protected boolean onActivityInit(Boolean alreadyOnHome) {
		T createdActivity = mActivityInterface.getCreatedActivity();
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "BaseSwipeUpHandler.1");
		}
		if (createdActivity != null) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "BaseSwipeUpHandler.2");
		}
		initTransitionEndpoints(createdActivity.getDeviceProfile());
		}
		final T activity = mActivityInterface.getCreatedActivity();

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -627,10 +627,6 @@ public class TouchInteractionService extends Service implements PluginListener<O
		}

		private void handleOrientationSetup(InputConsumer baseInputConsumer) {
		if (TestProtocol.sDebugTracing) {
		Log.d(TestProtocol.PAUSE_NOT_DETECTED, "handleOrientationSetup.1");
		}

		baseInputConsumer.notifyOrientationSetup();
		}