Merge "Remove unused code for old mult select design" into udc-dev (d9a38b8d) · Commits · e / os / BlissLauncher3

src/com/android/launcher3/CellLayout.java

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ package com.android.launcher3;
	import static android.animation.ValueAnimator.areAnimatorsEnabled;		import static android.animation.ValueAnimator.areAnimatorsEnabled;

	import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;		import static com.android.launcher3.anim.Interpolators.DEACCEL_1_5;
	import static com.android.launcher3.config.FeatureFlags.SHOW_HOME_GARDENING;
	import static com.android.launcher3.dragndrop.DraggableView.DRAGGABLE_ICON;		import static com.android.launcher3.dragndrop.DraggableView.DRAGGABLE_ICON;
	import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;		import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;
	import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_REORDER_BOUNCE_OFFSET;		import static com.android.launcher3.util.MultiTranslateDelegate.INDEX_REORDER_BOUNCE_OFFSET;
	@@ -557,9 +556,7 @@ public class CellLayout extends ViewGroup {
	public void setSpringLoadedProgress(float progress) {		public void setSpringLoadedProgress(float progress) {
	if (Float.compare(progress, mSpringLoadedProgress) != 0) {		if (Float.compare(progress, mSpringLoadedProgress) != 0) {
	mSpringLoadedProgress = progress;		mSpringLoadedProgress = progress;
	if (!SHOW_HOME_GARDENING.get()) {
	updateBgAlpha();		updateBgAlpha();
	}
	setGridAlpha(progress);		setGridAlpha(progress);
	}		}
	}		}
	@@ -584,11 +581,9 @@ public class CellLayout extends ViewGroup {
	public void setScrollProgress(float progress) {		public void setScrollProgress(float progress) {
	if (Float.compare(Math.abs(progress), mScrollProgress) != 0) {		if (Float.compare(Math.abs(progress), mScrollProgress) != 0) {
	mScrollProgress = Math.abs(progress);		mScrollProgress = Math.abs(progress);
	if (!SHOW_HOME_GARDENING.get()) {
	updateBgAlpha();		updateBgAlpha();
	}		}
	}		}
	}

	private void setGridAlpha(float gridAlpha) {		private void setGridAlpha(float gridAlpha) {
	if (Float.compare(gridAlpha, mGridAlpha) != 0) {		if (Float.compare(gridAlpha, mGridAlpha) != 0) {
	@@ -625,7 +620,7 @@ public class CellLayout extends ViewGroup {
	}		}
	}		}

	if (mVisualizeDropLocation && !SHOW_HOME_GARDENING.get()) {		if (mVisualizeDropLocation) {
	for (int i = 0; i < mDragOutlines.length; i++) {		for (int i = 0; i < mDragOutlines.length; i++) {
	final float alpha = mDragOutlineAlphas[i];		final float alpha = mDragOutlineAlphas[i];
	if (alpha <= 0) continue;		if (alpha <= 0) continue;

src/com/android/launcher3/DropTargetBar.java

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.launcher3;

	import static com.android.launcher3.ButtonDropTarget.TOOLTIP_DEFAULT;		import static com.android.launcher3.ButtonDropTarget.TOOLTIP_DEFAULT;
	import static com.android.launcher3.anim.AlphaUpdateListener.updateVisibility;		import static com.android.launcher3.anim.AlphaUpdateListener.updateVisibility;
	import static com.android.launcher3.config.FeatureFlags.HOME_GARDENING_WORKSPACE_BUTTONS;

	import android.animation.TimeInterpolator;		import android.animation.TimeInterpolator;
	import android.content.Context;		import android.content.Context;
	@@ -119,13 +118,7 @@ public class DropTargetBar extends FrameLayout
	lp.rightMargin = (grid.widthPx - lp.width) / 2;		lp.rightMargin = (grid.widthPx - lp.width) / 2;
	}		}
	lp.height = grid.dropTargetBarSizePx;		lp.height = grid.dropTargetBarSizePx;
	// TODO: Add tablet support for DropTargetBar when HOME_GARDENING_WORKSPACE_BUTTONS flag
	// is on
	if (HOME_GARDENING_WORKSPACE_BUTTONS.get()) {
	lp.gravity = Gravity.CENTER_HORIZONTAL \| Gravity.BOTTOM;
	} else {
	lp.gravity = Gravity.CENTER_HORIZONTAL \| Gravity.TOP;		lp.gravity = Gravity.CENTER_HORIZONTAL \| Gravity.TOP;
	}

	DeviceProfile dp = mLauncher.getDeviceProfile();		DeviceProfile dp = mLauncher.getDeviceProfile();
	int horizontalPadding = dp.dropTargetHorizontalPaddingPx;		int horizontalPadding = dp.dropTargetHorizontalPaddingPx;

src/com/android/launcher3/Workspace.java

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -952,10 +952,6 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
	return mScreenOrder;		return mScreenOrder;
	}		}

	protected View getFirstPagePinnedItem() {
	return mFirstPagePinnedItem;
	}

	/**		/**
	* Returns the screen ID of a page that is shown together with the given page screen ID when the		* Returns the screen ID of a page that is shown together with the given page screen ID when the
	* two panel UI is enabled.		* two panel UI is enabled.

src/com/android/launcher3/WorkspaceStateTransitionAnimation.java

+0 −27

Original line number	Original line	Diff line number	Diff line
	@@ -29,14 +29,11 @@ import static com.android.launcher3.LauncherState.FLAG_HOTSEAT_INACCESSIBLE;
	import static com.android.launcher3.LauncherState.HINT_STATE;		import static com.android.launcher3.LauncherState.HINT_STATE;
	import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;		import static com.android.launcher3.LauncherState.HOTSEAT_ICONS;
	import static com.android.launcher3.LauncherState.NORMAL;		import static com.android.launcher3.LauncherState.NORMAL;
	import static com.android.launcher3.LauncherState.SPRING_LOADED;
	import static com.android.launcher3.LauncherState.WORKSPACE_PAGE_INDICATOR;		import static com.android.launcher3.LauncherState.WORKSPACE_PAGE_INDICATOR;
	import static com.android.launcher3.anim.Interpolators.ACCEL_2;		import static com.android.launcher3.anim.Interpolators.ACCEL_2;
	import static com.android.launcher3.anim.Interpolators.LINEAR;		import static com.android.launcher3.anim.Interpolators.LINEAR;
	import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;		import static com.android.launcher3.anim.Interpolators.ZOOM_OUT;
	import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;		import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
	import static com.android.launcher3.config.FeatureFlags.HOME_GARDENING_WORKSPACE_BUTTONS;
	import static com.android.launcher3.config.FeatureFlags.SHOW_HOME_GARDENING;
	import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;		import static com.android.launcher3.graphics.Scrim.SCRIM_PROGRESS;
	import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;		import static com.android.launcher3.graphics.SysUiScrim.SYSUI_PROGRESS;
	import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;		import static com.android.launcher3.states.StateAnimationConfig.ANIM_HOTSEAT_FADE;
	@@ -160,30 +157,6 @@ public class WorkspaceStateTransitionAnimation {
	float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;		float hotseatIconsAlpha = (elements & HOTSEAT_ICONS) != 0 ? 1 : 0;
	propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, hotseatFadeInterpolator);		propertySetter.setViewAlpha(hotseat, hotseatIconsAlpha, hotseatFadeInterpolator);

	if (SHOW_HOME_GARDENING.get()) {
	propertySetter.setViewAlpha(
	mWorkspace.getFirstPagePinnedItem(),
	state == SPRING_LOADED ? FIRST_PAGE_PINNED_WIDGET_DISABLED_ALPHA : 1,
	workspaceFadeInterpolator);
	propertySetter.addEndListener(success -> {
	if (success) {
	mWorkspace.getFirstPagePinnedItem().setClickable(state != SPRING_LOADED);
	}
	});
	}

	if (HOME_GARDENING_WORKSPACE_BUTTONS.get()) {
	propertySetter.setViewAlpha(
	mLauncher.getHotseat().getQsb(),
	state == SPRING_LOADED ? 0 : 1,
	workspaceFadeInterpolator);
	propertySetter.addEndListener(success -> {
	if (success) {
	mLauncher.getHotseat().getQsb().setClickable(state != SPRING_LOADED);
	}
	});
	}

	// Update the accessibility flags for hotseat based on launcher state.		// Update the accessibility flags for hotseat based on launcher state.
	hotseat.setImportantForAccessibility(		hotseat.setImportantForAccessibility(
	state.hasFlag(FLAG_HOTSEAT_INACCESSIBLE)		state.hasFlag(FLAG_HOTSEAT_INACCESSIBLE)

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -269,13 +269,6 @@ public final class FeatureFlags {
	public static final BooleanFlag ENABLE_SEARCH_UNINSTALLED_APPS = getReleaseFlag(270395269,		public static final BooleanFlag ENABLE_SEARCH_UNINSTALLED_APPS = getReleaseFlag(270395269,
	"ENABLE_SEARCH_UNINSTALLED_APPS", DISABLED, "Search uninstalled app results.");		"ENABLE_SEARCH_UNINSTALLED_APPS", DISABLED, "Search uninstalled app results.");

	public static final BooleanFlag SHOW_HOME_GARDENING = getDebugFlag(270395183,
	"SHOW_HOME_GARDENING", DISABLED, "Show the new home gardening mode");

	public static final BooleanFlag HOME_GARDENING_WORKSPACE_BUTTONS = getDebugFlag(270395133,
	"HOME_GARDENING_WORKSPACE_BUTTONS", DISABLED,
	"Change workspace edit buttons to reflect home gardening");

	public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V2 = getReleaseFlag(270395134,		public static final BooleanFlag ENABLE_DOWNLOAD_APP_UX_V2 = getReleaseFlag(270395134,
	"ENABLE_DOWNLOAD_APP_UX_V2", ENABLED, "Updates the download app UX"		"ENABLE_DOWNLOAD_APP_UX_V2", ENABLED, "Updates the download app UX"
	+ " to have better visuals");		+ " to have better visuals");