Merge "Some RecentsView layout fixes" into ub-launcher3-qt-dev (f17eb616) · Commits · e / os / BlissLauncher3

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

+0 −9

Original line number	Diff line number	Diff line
		@@ -204,15 +204,6 @@ public abstract class RecentsUiFactory {
		}
		}

		/**
		* Clean-up logic that occurs when recents is no longer in use/visible.
		*
		* @param launcher the launcher activity
		*/
		public static void resetOverview(Launcher launcher) {
		launcher.<RecentsView>getOverviewPanel().reset();
		}

		/**
		* Recents logic that triggers when launcher state changes or launcher activity stops/resumes.
		*

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import com.android.launcher3.AbstractFloatingView;
		import com.android.launcher3.Launcher;
		import com.android.launcher3.allapps.AllAppsTransitionController;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.util.ClipAnimationHelper;
		import com.android.quickstep.util.LayoutUtils;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;
		@@ -45,8 +44,6 @@ public class BackgroundAppState extends OverviewState {

		@Override
		public void onStateEnabled(Launcher launcher) {
		RecentsView rv = launcher.getOverviewPanel();
		rv.setOverviewStateEnabled(true);
		AbstractFloatingView.closeAllOpenViews(launcher, false);
		}

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -86,17 +86,9 @@ public class OverviewState extends LauncherState {

		@Override
		public void onStateEnabled(Launcher launcher) {
		RecentsView rv = launcher.getOverviewPanel();
		rv.setOverviewStateEnabled(true);
		AbstractFloatingView.closeAllOpenViews(launcher);
		}

		@Override
		public void onStateDisabled(Launcher launcher) {
		RecentsView rv = launcher.getOverviewPanel();
		rv.setOverviewStateEnabled(false);
		}

		@Override
		public void onStateTransitionEnd(Launcher launcher) {
		launcher.getRotationHelper().setCurrentStateRequest(REQUEST_ROTATE);

quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java

+21 −19

Original line number	Diff line number	Diff line
		@@ -36,8 +36,6 @@ import java.util.List;
		*/
		public class TaskOverlayFactory implements ResourceBasedOverride {

		public static final String AIAI_PACKAGE = "com.google.android.as";

		/** Note that these will be shown in order from top to bottom, if available for the task. */
		private static final TaskSystemShortcut[] MENU_OPTIONS = new TaskSystemShortcut[]{
		new TaskSystemShortcut.AppInfo(),
		@@ -51,18 +49,6 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
		new MainThreadInitializedObject<>(c -> Overrides.getObject(TaskOverlayFactory.class,
		c, R.string.task_overlay_factory_class));

		public TaskOverlay createOverlay(View thumbnailView) {
		return new TaskOverlay();
		}

		public static class TaskOverlay {

		public void setTaskInfo(Task task, ThumbnailData thumbnail, Matrix matrix) {
		}

		public void reset() {
		}

		public List<TaskSystemShortcut> getEnabledShortcuts(TaskView taskView) {
		final ArrayList<TaskSystemShortcut> shortcuts = new ArrayList<>();
		final BaseDraggingActivity activity = BaseActivity.fromContext(taskView.getContext());
		@@ -75,5 +61,21 @@ public class TaskOverlayFactory implements ResourceBasedOverride {
		}
		return shortcuts;
		}

		public TaskOverlay createOverlay(View thumbnailView) {
		return new TaskOverlay();
		}

		public static class TaskOverlay {

		/**
		* Called when the current task is interactive for the user
		*/
		public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix) { }

		/**
		* Called when the overlay is no longer used.
		*/
		public void reset() { }
		}
		}

quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/FallbackRecentsView.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity> {
		public FallbackRecentsView(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		setOverviewStateEnabled(true);
		setOverlayEnabled(true);
		}

		@Override