Remove logspam for resolved bug (7e5d8558) · Commits · e / os / android_packages_apps_Trebuchet

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,6 @@ import android.os.SystemProperties;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.provider.Settings;		import android.provider.Settings;
	import android.provider.Settings.Global;		import android.provider.Settings.Global;
	import android.util.Log;
	import android.util.Pair;		import android.util.Pair;
	import android.util.Size;		import android.util.Size;
	import android.view.CrossWindowBlurListeners;		import android.view.CrossWindowBlurListeners;
	@@ -1776,7 +1775,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
	RemoteAnimationTarget[] wallpaperTargets,		RemoteAnimationTarget[] wallpaperTargets,
	RemoteAnimationTarget[] nonAppTargets,		RemoteAnimationTarget[] nonAppTargets,
	LauncherAnimationRunner.AnimationResult result) {		LauncherAnimationRunner.AnimationResult result) {
	Log.d("b/318394698", "AppLaunchAnimationRunner: onAnimationStart");
	AnimatorSet anim = new AnimatorSet();		AnimatorSet anim = new AnimatorSet();
	boolean launcherClosing =		boolean launcherClosing =
	launcherIsATargetWithMode(appTargets, MODE_CLOSING);		launcherIsATargetWithMode(appTargets, MODE_CLOSING);
	@@ -1812,7 +1810,6 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener

	@Override		@Override
	public void onAnimationCancelled() {		public void onAnimationCancelled() {
	Log.d("b/318394698", "AppLaunchAnimationRunner: onAnimationCancelled");
	mOnEndCallback.executeAllAndDestroy();		mOnEndCallback.executeAllAndDestroy();
	}		}
	}		}

quickstep/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java

+0 −16

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import android.animation.Animator;
	import android.animation.AnimatorSet;		import android.animation.AnimatorSet;
	import android.animation.ObjectAnimator;		import android.animation.ObjectAnimator;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.util.Log;
	import android.view.HapticFeedbackConstants;		import android.view.HapticFeedbackConstants;
	import android.view.View;		import android.view.View;
	import android.view.ViewGroup;		import android.view.ViewGroup;
	@@ -81,7 +80,6 @@ public class HotseatPredictionController implements DragController.DragListener,
	SystemShortcut.Factory<QuickstepLauncher>, DeviceProfile.OnDeviceProfileChangeListener,		SystemShortcut.Factory<QuickstepLauncher>, DeviceProfile.OnDeviceProfileChangeListener,
	DragSource, ViewGroup.OnHierarchyChangeListener {		DragSource, ViewGroup.OnHierarchyChangeListener {

	private static final String TAG = "HotseatPredictionController";
	private static final int FLAG_UPDATE_PAUSED = 1 << 0;		private static final int FLAG_UPDATE_PAUSED = 1 << 0;
	private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1;		private static final int FLAG_DRAG_IN_PROGRESS = 1 << 1;
	private static final int FLAG_FILL_IN_PROGRESS = 1 << 2;		private static final int FLAG_FILL_IN_PROGRESS = 1 << 2;
	@@ -190,7 +188,6 @@ public class HotseatPredictionController implements DragController.DragListener,
	}		}

	private void fillGapsWithPrediction(boolean animate) {		private void fillGapsWithPrediction(boolean animate) {
	Log.d(TAG, "fillGapsWithPrediction flags: " + getStateString(mPauseFlags));
	if (mPauseFlags != 0) {		if (mPauseFlags != 0) {
	return;		return;
	}		}
	@@ -215,16 +212,12 @@ public class HotseatPredictionController implements DragController.DragListener,
	View child = mHotseat.getChildAt(		View child = mHotseat.getChildAt(
	mHotseat.getCellXFromOrder(rank),		mHotseat.getCellXFromOrder(rank),
	mHotseat.getCellYFromOrder(rank));		mHotseat.getCellYFromOrder(rank));
	Log.d(TAG, "Hotseat app child is: " + child + " and isPredictedIcon() evaluates to"
	+ ": " + isPredictedIcon(child));

	if (child != null && !isPredictedIcon(child)) {		if (child != null && !isPredictedIcon(child)) {
	continue;		continue;
	}		}
	if (mPredictedItems.size() <= predictionIndex) {		if (mPredictedItems.size() <= predictionIndex) {
	// Remove predicted apps from the past		// Remove predicted apps from the past
	Log.d(TAG, "Remove predicted apps from the past\nPrediction Index: "
	+ predictionIndex);
	if (isPredictedIcon(child)) {		if (isPredictedIcon(child)) {
	mHotseat.removeView(child);		mHotseat.removeView(child);
	}		}
	@@ -232,11 +225,6 @@ public class HotseatPredictionController implements DragController.DragListener,
	}		}
	WorkspaceItemInfo predictedItem =		WorkspaceItemInfo predictedItem =
	(WorkspaceItemInfo) mPredictedItems.get(predictionIndex++);		(WorkspaceItemInfo) mPredictedItems.get(predictionIndex++);
	Log.d(TAG, "Predicted item is: " + predictedItem);
	if (child != null) {
	Log.d(TAG, "Predicted item is enabled: " + child.isEnabled());
	}

	if (isPredictedIcon(child) && child.isEnabled()) {		if (isPredictedIcon(child) && child.isEnabled()) {
	PredictedAppIcon icon = (PredictedAppIcon) child;		PredictedAppIcon icon = (PredictedAppIcon) child;
	boolean animateIconChange = icon.shouldAnimateIconChange(predictedItem);		boolean animateIconChange = icon.shouldAnimateIconChange(predictedItem);
	@@ -256,7 +244,6 @@ public class HotseatPredictionController implements DragController.DragListener,
	}		}

	private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate) {		private void bindItems(List<WorkspaceItemInfo> itemsToAdd, boolean animate) {
	Log.d(TAG, "bindItems to hotseat: " + itemsToAdd);
	AnimatorSet animationSet = new AnimatorSet();		AnimatorSet animationSet = new AnimatorSet();
	for (WorkspaceItemInfo item : itemsToAdd) {		for (WorkspaceItemInfo item : itemsToAdd) {
	PredictedAppIcon icon = PredictedAppIcon.createIcon(mHotseat, item);		PredictedAppIcon icon = PredictedAppIcon.createIcon(mHotseat, item);
	@@ -296,7 +283,6 @@ public class HotseatPredictionController implements DragController.DragListener,
	* start and pauses predicted apps update on the hotseat		* start and pauses predicted apps update on the hotseat
	*/		*/
	public void setPauseUIUpdate(boolean paused) {		public void setPauseUIUpdate(boolean paused) {
	Log.d(TAG, "setPauseUIUpdate parameter `paused` is " + paused);
	mPauseFlags = paused		mPauseFlags = paused
	? (mPauseFlags \| FLAG_UPDATE_PAUSED)		? (mPauseFlags \| FLAG_UPDATE_PAUSED)
	: (mPauseFlags & ~FLAG_UPDATE_PAUSED);		: (mPauseFlags & ~FLAG_UPDATE_PAUSED);
	@@ -311,10 +297,8 @@ public class HotseatPredictionController implements DragController.DragListener,
	public void setPredictedItems(FixedContainerItems items) {		public void setPredictedItems(FixedContainerItems items) {
	mPredictedItems = new ArrayList(items.items);		mPredictedItems = new ArrayList(items.items);
	if (mPredictedItems.isEmpty()) {		if (mPredictedItems.isEmpty()) {
	Log.d(TAG, "Predicted items is initially empty");
	HotseatRestoreHelper.restoreBackup(mLauncher);		HotseatRestoreHelper.restoreBackup(mLauncher);
	}		}
	Log.d(TAG, "Predicted items: " + mPredictedItems);
	fillGapsWithPrediction();		fillGapsWithPrediction();
	}		}

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,6 @@ import android.os.IRemoteCallback;
	import android.os.SystemProperties;		import android.os.SystemProperties;
	import android.os.Trace;		import android.os.Trace;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.util.Log;
	import android.view.Display;		import android.view.Display;
	import android.view.HapticFeedbackConstants;		import android.view.HapticFeedbackConstants;
	import android.view.View;		import android.view.View;
	@@ -207,9 +206,6 @@ public class QuickstepLauncher extends Launcher {
	SystemProperties.getBoolean("persist.debug.trace_layouts", false);		SystemProperties.getBoolean("persist.debug.trace_layouts", false);
	private static final String TRACE_RELAYOUT_CLASS =		private static final String TRACE_RELAYOUT_CLASS =
	SystemProperties.get("persist.debug.trace_request_layout_class", null);		SystemProperties.get("persist.debug.trace_request_layout_class", null);

	private static final String TAG = "QuickstepLauncher";

	public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false;		public static final boolean GO_LOW_RAM_RECENTS_ENABLED = false;

	protected static final String RING_APPEAR_ANIMATION_PREFIX = "RingAppearAnimation\t";		protected static final String RING_APPEAR_ANIMATION_PREFIX = "RingAppearAnimation\t";
	@@ -371,8 +367,6 @@ public class QuickstepLauncher extends Launcher {
	public RunnableList startActivitySafely(View v, Intent intent, ItemInfo item) {		public RunnableList startActivitySafely(View v, Intent intent, ItemInfo item) {
	// Only pause is taskbar controller is not present until the transition (if it exists) ends		// Only pause is taskbar controller is not present until the transition (if it exists) ends
	mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);		mHotseatPredictionController.setPauseUIUpdate(getTaskbarUIController() == null);
	Log.d("b/318394698", "startActivitySafely being run, getTaskbarUIController is: "
	+ getTaskbarUIController());
	PredictionRowView<?> predictionRowView =		PredictionRowView<?> predictionRowView =
	getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class);		getAppsView().getFloatingHeaderView().findFixedRowByType(PredictionRowView.class);
	// Pause the prediction row updates until the transition (if it exists) ends.		// Pause the prediction row updates until the transition (if it exists) ends.
	@@ -485,7 +479,6 @@ public class QuickstepLauncher extends Launcher {

	@Override		@Override
	public void bindExtraContainerItems(FixedContainerItems item) {		public void bindExtraContainerItems(FixedContainerItems item) {
	Log.d(TAG, "Bind extra container items. ContainerId = " + item.containerId);
	if (item.containerId == Favorites.CONTAINER_PREDICTION) {		if (item.containerId == Favorites.CONTAINER_PREDICTION) {
	mAllAppsPredictions = item;		mAllAppsPredictions = item;
	PredictionRowView<?> predictionRowView =		PredictionRowView<?> predictionRowView =
	@@ -493,7 +486,6 @@ public class QuickstepLauncher extends Launcher {
	PredictionRowView.class);		PredictionRowView.class);
	predictionRowView.setPredictedApps(item.items);		predictionRowView.setPredictedApps(item.items);
	} else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) {		} else if (item.containerId == Favorites.CONTAINER_HOTSEAT_PREDICTION) {
	Log.d(TAG, "Bind extra container item is hotseat prediction");
	mHotseatPredictionController.setPredictedItems(item);		mHotseatPredictionController.setPredictedItems(item);
	} else if (item.containerId == Favorites.CONTAINER_WIDGETS_PREDICTION) {		} else if (item.containerId == Favorites.CONTAINER_WIDGETS_PREDICTION) {
	getPopupDataProvider().setRecommendedWidgets(item.items);		getPopupDataProvider().setRecommendedWidgets(item.items);

src/com/android/launcher3/WorkspaceLayoutManager.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,7 +55,6 @@ public interface WorkspaceLayoutManager {
	int y = presenterPos.cellY;		int y = presenterPos.cellY;
	if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT		if (info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT
	\|\| info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {		\|\| info.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION) {
	Log.d(TAG, "add predicted icon " + child.getTag().toString() + " to home screen");
	int screenId = presenterPos.screenId;		int screenId = presenterPos.screenId;
	x = getHotseat().getCellXFromOrder(screenId);		x = getHotseat().getCellXFromOrder(screenId);
	y = getHotseat().getCellYFromOrder(screenId);		y = getHotseat().getCellYFromOrder(screenId);