Merge "Remove unused logs" into tm-qpr-dev (f47491bd) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/QuickstepTransitionManager.java

+0 −23

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;
		import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;
		import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;
		import static com.android.launcher3.statehandlers.DepthController.DEPTH;
		import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;
		import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
		import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
		import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;
		@@ -77,7 +76,6 @@ import android.os.Looper;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Size;
		import android.view.SurfaceControl;
		@@ -137,7 +135,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
		import com.android.wm.shell.startingsurface.IStartingWindowListener;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.LinkedHashMap;
		import java.util.List;

		@@ -623,28 +620,9 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		RecentsView overview = mLauncher.getOverviewPanel();
		ObjectAnimator alpha = ObjectAnimator.ofFloat(overview,
		RecentsView.CONTENT_ALPHA, alphas);
		Log.d(BAD_STATE, "QTM composeViewContentAnimator alphas=" + Arrays.toString(alphas));
		alpha.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		Log.d(BAD_STATE, "QTM composeViewContentAnimator onStart");
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		float alpha = overview == null ? -1 : RecentsView.CONTENT_ALPHA.get(overview);
		Log.d(BAD_STATE, "QTM composeViewContentAnimator onCancel, alpha=" + alpha);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		Log.d(BAD_STATE, "QTM composeViewContentAnimator onEnd");
		}
		});
		alpha.setDuration(CONTENT_ALPHA_DURATION);
		alpha.setInterpolator(LINEAR);
		anim.play(alpha);
		Log.d(BAD_STATE, "QTM composeViewContentAnimator setFreezeVisibility=true");
		overview.setFreezeViewVisibility(true);

		ObjectAnimator scaleAnim = ObjectAnimator.ofFloat(overview, SCALE_PROPERTY, scales);
		@@ -653,7 +631,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
		anim.play(scaleAnim);

		return () -> {
		Log.d(BAD_STATE, "QTM composeViewContentAnimator onEnd setFreezeVisibility=false");
		overview.setFreezeViewVisibility(false);
		SCALE_PROPERTY.set(overview, 1f);
		mLauncher.getStateManager().reapplyState();

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

+2 −12

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_SP
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_X;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE_Y;
		import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
		import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;
		import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
		import static com.android.quickstep.views.RecentsView.FIRST_FLOATING_TASK_TRANSLATE_OFFSCREEN;
		import static com.android.quickstep.views.RecentsView.OVERVIEW_PROGRESS;
		@@ -40,7 +39,6 @@ import static com.android.quickstep.views.RecentsView.TASK_SECONDARY_TRANSLATION
		import android.graphics.Rect;
		import android.graphics.RectF;
		import android.util.FloatProperty;
		import android.util.Log;

		import androidx.annotation.NonNull;

		@@ -77,10 +75,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, scaleAndOffset[1]);
		TASK_SECONDARY_TRANSLATION.set(mRecentsView, 0f);

		float recentsAlpha = state.overviewUi ? 1f : 0;
		Log.d(BAD_STATE, "BaseRecentsViewStateController setState state=" + state
		+ ", alpha=" + recentsAlpha);
		getContentAlphaProperty().set(mRecentsView, recentsAlpha);
		getContentAlphaProperty().set(mRecentsView, state.overviewUi ? 1f : 0);
		getTaskModalnessProperty().set(mRecentsView, state.getOverviewModalness());
		RECENTS_GRID_PROGRESS.set(mRecentsView,
		state.displayOverviewTasksAsGrid(mLauncher.getDeviceProfile()) ? 1f : 0f);
		@@ -90,8 +85,6 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		@Override
		public void setStateWithAnimation(LauncherState toState, StateAnimationConfig config,
		PendingAnimation builder) {
		Log.d(BAD_STATE, "BaseRecentsViewStateController setStateWithAnimation state=" + toState
		+ ", config.skipOverview=" + config.hasAnimationFlag(SKIP_OVERVIEW));
		if (config.hasAnimationFlag(SKIP_OVERVIEW)) {
		return;
		}
		@@ -158,10 +151,7 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView>
		}
		}

		float recentsAlpha = toState.overviewUi ? 1 : 0;
		Log.d(BAD_STATE, "BaseRecentsViewStateController setStateWithAnimationInternal toState="
		+ toState + ", alpha=" + recentsAlpha);
		setter.setFloat(mRecentsView, getContentAlphaProperty(), recentsAlpha,
		setter.setFloat(mRecentsView, getContentAlphaProperty(), toState.overviewUi ? 1 : 0,
		config.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT));

		setter.setFloat(

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

+0 −21

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_S
		import static com.android.launcher3.states.StateAnimationConfig.SKIP_ALL_ANIMATIONS;
		import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
		import static com.android.launcher3.states.StateAnimationConfig.SKIP_SCRIM;
		import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;
		import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_RIGHT;
		import static com.android.launcher3.touch.BothAxesSwipeDetector.DIRECTION_UP;
		import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
		@@ -56,7 +55,6 @@ import android.animation.Animator.AnimatorListener;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ValueAnimator;
		import android.graphics.PointF;
		import android.util.Log;
		import android.view.MotionEvent;
		import android.view.animation.Interpolator;

		@@ -227,7 +225,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		// Set RecentView's initial properties.
		RECENTS_SCALE_PROPERTY.set(mRecentsView, fromState.getOverviewScaleAndOffset(mLauncher)[0]);
		ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mRecentsView, 1f);
		Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators setContentAlpha=1");
		mRecentsView.setContentAlpha(1);
		mRecentsView.setFullscreenProgress(fromState.getOverviewFullscreenProgress());
		mLauncher.getActionsView().getVisibilityAlpha().setValue(
		@@ -247,24 +244,6 @@ public class NoButtonQuickSwitchTouchController implements TouchController,
		QUICK_SWITCH.getWorkspaceScrimColor(mLauncher), LINEAR);
		if (mRecentsView.getTaskViewCount() == 0) {
		xAnim.addFloat(mRecentsView, CONTENT_ALPHA, 0f, 1f, LINEAR);
		Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators from: 0 to: 1");
		xAnim.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationStart(Animator animation) {
		Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onStart");
		}

		@Override
		public void onAnimationCancel(Animator animation) {
		float alpha = mRecentsView == null ? -1 : CONTENT_ALPHA.get(mRecentsView);
		Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onCancel, alpha=" + alpha);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		Log.d(BAD_STATE, "NBQSTC setupOverviewAnimators onEnd");
		}
		});
		}
		mXOverviewAnim = xAnim.createPlaybackController();
		mXOverviewAnim.dispatchOnStart();

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import static com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TR
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_VERTICAL_PROGRESS;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_FADE;
		import static com.android.launcher3.states.StateAnimationConfig.ANIM_WORKSPACE_TRANSLATE;
		import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;
		import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
		import static com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET;
		import static com.android.quickstep.views.RecentsView.RECENTS_SCALE_PROPERTY;
		@@ -37,7 +36,6 @@ import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHO
		import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;
		import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_OVERVIEW_DISABLED;

		import android.util.Log;
		import android.view.MotionEvent;

		import com.android.launcher3.Launcher;
		@@ -114,7 +112,6 @@ public class QuickSwitchTouchController extends AbstractStateChangeTouchControll
		RECENTS_SCALE_PROPERTY.set(mOverviewPanel,
		QUICK_SWITCH.getOverviewScaleAndOffset(mLauncher)[0] * 0.85f);
		ADJACENT_PAGE_HORIZONTAL_OFFSET.set(mOverviewPanel, 1f);
		Log.d(BAD_STATE, "QuickSwitchTouchController initCurrentAnimation setContentAlpha=1");
		mOverviewPanel.setContentAlpha(1);

		mCurrentAnimation = mLauncher.getStateManager()

quickstep/src/com/android/quickstep/RecentsActivity.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSI
		import static com.android.launcher3.QuickstepTransitionManager.STATUS_BAR_TRANSITION_PRE_DELAY;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
		import static com.android.launcher3.testing.shared.TestProtocol.BAD_STATE;
		import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_ORDINAL;
		import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely;
		import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;
		@@ -39,7 +38,6 @@ import android.content.res.Configuration;
		import android.os.Bundle;
		import android.os.Handler;
		import android.os.Looper;
		import android.util.Log;
		import android.view.Display;
		import android.view.SurfaceControl.Transaction;
		import android.view.View;
		@@ -314,7 +312,6 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
		protected void onStart() {
		// Set the alpha to 1 before calling super, as it may get set back to 0 due to
		// onActivityStart callback.
		Log.d(BAD_STATE, "RecentsActivity onStart mFallbackRecentsView.setContentAlpha(1)");
		mFallbackRecentsView.setContentAlpha(1);
		super.onStart();
		mFallbackRecentsView.updateLocusId();