Merge cherrypicks of [11559179, 11556529] into rvc-release (0df9fee2) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/res/values/override.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,5 +26,7 @@
		<string name="main_process_initializer_class" translatable="false">com.android.quickstep.QuickstepProcessInitializer</string>

		<string name="user_event_dispatcher_class" translatable="false">com.android.quickstep.logging.UserEventDispatcherAppPredictionExtension</string>

		<string name="prediction_model_class" translatable="false">com.android.launcher3.hybridhotseat.HotseatPredictionModel</string>
		</resources>

+69 −216

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+136 −0

File added.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@
		<string name="app_launch_tracker_class" translatable="false"></string>
		<string name="test_information_handler_class" translatable="false"></string>
		<string name="launcher_activity_logic_class" translatable="false"></string>
		<string name="prediction_model_class" translatable="false"></string>

		<!-- View ID to use for QSB widget -->
		<item type="id" name="qsb_widget" />

+12 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,18 @@ public interface DropTarget {

		return res;
		}


		/**
		* This is used to determine if an object is dropped at a different location than it was
		* dragged from
		*/
		public boolean isMoved() {
		return dragInfo.cellX != originalDragInfo.cellX
		\|\| dragInfo.cellY != originalDragInfo.cellY
		\|\| dragInfo.screenId != originalDragInfo.screenId
		\|\| dragInfo.container != originalDragInfo.container;
		}
		}

		/**