Merging ub-launcher3-qt-dev, build 5691374 am: 5cd4333b5c am: 11cacbe1ab (038455e8) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -298,7 +298,7 @@ LOCAL_PROGUARD_ENABLED := full
	LOCAL_PACKAGE_NAME := Launcher3GoIconRecents		LOCAL_PACKAGE_NAME := Launcher3GoIconRecents
	LOCAL_PRIVILEGED_MODULE := true		LOCAL_PRIVILEGED_MODULE := true
	LOCAL_PRODUCT_MODULE := true		LOCAL_PRODUCT_MODULE := true
	LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo		LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep
	LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3		LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

	LOCAL_FULL_LIBS_MANIFEST_FILES := \		LOCAL_FULL_LIBS_MANIFEST_FILES := \

go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+2 −19

Original line number	Original line	Diff line number	Diff line
	@@ -16,11 +16,6 @@

	package com.android.launcher3.uioverrides;		package com.android.launcher3.uioverrides;

	import static android.view.View.VISIBLE;
	import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;

	import android.view.View;

	import com.android.launcher3.DeviceProfile;		import com.android.launcher3.DeviceProfile;
	import com.android.launcher3.Launcher;		import com.android.launcher3.Launcher;
	import com.android.launcher3.LauncherStateManager.StateHandler;		import com.android.launcher3.LauncherStateManager.StateHandler;
	@@ -43,8 +38,6 @@ import java.util.ArrayList;
	public abstract class RecentsUiFactory {		public abstract class RecentsUiFactory {

	public static final boolean GO_LOW_RAM_RECENTS_ENABLED = true;		public static final boolean GO_LOW_RAM_RECENTS_ENABLED = true;
	// Scale recents takes before animating in
	private static final float RECENTS_PREPARE_SCALE = 1.33f;

	public static TouchController[] createTouchControllers(Launcher launcher) {		public static TouchController[] createTouchControllers(Launcher launcher) {
	ArrayList<TouchController> list = new ArrayList<>();		ArrayList<TouchController> list = new ArrayList<>();
	@@ -76,18 +69,6 @@ public abstract class RecentsUiFactory {
	return new RecentsViewStateController(launcher);		return new RecentsViewStateController(launcher);
	}		}

	/**
	* Prepare the recents view to animate in.
	*
	* @param launcher the launcher activity
	*/
	public static void prepareToShowOverview(Launcher launcher) {
	View overview = launcher.getOverviewPanel();
	if (overview.getVisibility() != VISIBLE) {
	SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
	}
	}

	/**		/**
	* Clean-up logic that occurs when recents is no longer in use/visible.		* Clean-up logic that occurs when recents is no longer in use/visible.
	*		*
	@@ -108,4 +89,6 @@ public abstract class RecentsUiFactory {
	public static RotationMode getRotationMode(DeviceProfile dp) {		public static RotationMode getRotationMode(DeviceProfile dp) {
	return RotationMode.NORMAL;		return RotationMode.NORMAL;
	}		}

			public static void clearSwipeSharedState(boolean finishAnimation) {}
	}		}

go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+40 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,15 +16,31 @@

	package com.android.launcher3.uioverrides.states;		package com.android.launcher3.uioverrides.states;

			import static android.view.View.VISIBLE;

	import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;		import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
			import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_X;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_SCALE;
			import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
			import static com.android.launcher3.anim.Interpolators.ACCEL;
	import static com.android.launcher3.anim.Interpolators.DEACCEL_2;		import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
			import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_2;
			import static com.android.launcher3.anim.Interpolators.OVERSHOOT_1_7;
	import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;		import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;

			import android.view.View;

	import com.android.launcher3.DeviceProfile;		import com.android.launcher3.DeviceProfile;
	import com.android.launcher3.Launcher;		import com.android.launcher3.Launcher;
	import com.android.launcher3.LauncherState;		import com.android.launcher3.LauncherState;
	import com.android.launcher3.R;		import com.android.launcher3.R;
			import com.android.launcher3.anim.AnimatorSetBuilder;
	import com.android.launcher3.userevent.nano.LauncherLogProto;		import com.android.launcher3.userevent.nano.LauncherLogProto;
			import com.android.quickstep.SysUINavigationMode;
	import com.android.quickstep.views.IconRecentsView;		import com.android.quickstep.views.IconRecentsView;

	/**		/**
	@@ -32,6 +48,9 @@ import com.android.quickstep.views.IconRecentsView;
	*/		*/
	public class OverviewState extends LauncherState {		public class OverviewState extends LauncherState {

			// Scale recents takes before animating in
			private static final float RECENTS_PREPARE_SCALE = 1.33f;

	private static final int STATE_FLAGS = FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED		private static final int STATE_FLAGS = FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED
	\| FLAG_DISABLE_RESTORE \| FLAG_OVERVIEW_UI \| FLAG_DISABLE_ACCESSIBILITY;		\| FLAG_DISABLE_RESTORE \| FLAG_OVERVIEW_UI \| FLAG_DISABLE_ACCESSIBILITY;

	@@ -103,6 +122,27 @@ public class OverviewState extends LauncherState {
	return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;		return dp.allAppsCellHeightPx - dp.allAppsIconTextSizePx;
	}		}

			@Override
			public void prepareForAtomicAnimation(Launcher launcher, LauncherState fromState,
			AnimatorSetBuilder builder) {
			if (fromState == NORMAL && this == OVERVIEW) {
			if (SysUINavigationMode.getMode(launcher) == SysUINavigationMode.Mode.NO_BUTTON) {
			builder.setInterpolator(ANIM_WORKSPACE_SCALE, ACCEL);
			builder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL);
			} else {
			builder.setInterpolator(ANIM_WORKSPACE_SCALE, OVERSHOOT_1_2);
			}
			builder.setInterpolator(ANIM_WORKSPACE_FADE, OVERSHOOT_1_2);
			builder.setInterpolator(ANIM_OVERVIEW_SCALE, OVERSHOOT_1_2);
			builder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_X, OVERSHOOT_1_7);
			builder.setInterpolator(ANIM_OVERVIEW_FADE, OVERSHOOT_1_2);

			View overview = launcher.getOverviewPanel();
			if (overview.getVisibility() != VISIBLE) {
			SCALE_PROPERTY.set(overview, RECENTS_PREPARE_SCALE);
			}
			}
			}

	public static OverviewState newBackgroundState(int id) {		public static OverviewState newBackgroundState(int id) {
	return new OverviewState(id);		return new OverviewState(id);

iconloaderlib/build.gradle

+0 −16

Original line number	Original line	Diff line number	Diff line
	buildscript {
	repositories {
	mavenCentral()
	google()
	}
	dependencies {
	classpath GRADLE_CLASS_PATH
	}
	}

	apply plugin: 'com.android.library'		apply plugin: 'com.android.library'

	android {		android {
	@@ -44,12 +34,6 @@ android {
	}		}
	}		}


	repositories {
	mavenCentral()
	google()
	}

	dependencies {		dependencies {
	implementation "androidx.core:core:${ANDROID_X_VERSION}"		implementation "androidx.core:core:${ANDROID_X_VERSION}"
	}		}

iconloaderlib/src/com/android/launcher3/icons/DotRenderer.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,14 @@ public class DotRenderer {
	return pos;		return pos;
	}		}

			public float[] getLeftDotPosition() {
			return mLeftDotPosition;
			}

			public float[] getRightDotPosition() {
			return mRightDotPosition;
			}

	/**		/**
	* Draw a circle on top of the canvas according to the given params.		* Draw a circle on top of the canvas according to the given params.
	*/		*/