PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging update and modify model callbacks

Browse Source 
Instead of the dispatcher specifying the type, the UI checks th diff. This
ensures that the UI is updated correctly in all paths

Bug: 390572144
Flag: EXEMPT refactor
Test: Manually verified folder edit path where these callbacks were getting dispatched

Change-Id: Ib73eed5da87a847753a78453a48ab4fc495c1199
This commit is contained in:
Sunny Goyal
2025-04-16 22:48:24 -07:00
parent c562b3ce4e
commit 007cfecf5e
14 changed files with 211 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+33 -7
View File
@@ -19,7 +19,10 @@ package com.android.launcher3;
import static com.android.launcher3.AbstractFloatingView.TYPE_WIDGET_RESIZE_FRAME;
import static com.android.launcher3.BubbleTextView.DISPLAY_FOLDER;
import static com.android.launcher3.LauncherAnimUtils.SPRING_LOADED_EXIT_DELAY;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_DESKTOP;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_HOTSEAT_PREDICTION;
import static com.android.launcher3.LauncherSettings.Favorites.CONTAINER_PREDICTION;
import static com.android.launcher3.LauncherState.ALL_APPS;
import static com.android.launcher3.LauncherState.EDIT_MODE;
import static com.android.launcher3.LauncherState.FLAG_MULTI_PAGE;
@@ -62,6 +65,7 @@ import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.FrameLayout;
import android.widget.Toast;
@@ -2043,9 +2047,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
// Move internally
boolean hasMovedLayouts = (getParentCellLayoutForView(cell) != dropTargetLayout);
boolean hasMovedIntoHotseat = mLauncher.isHotseatLayout(dropTargetLayout);
int container = hasMovedIntoHotseat ?
LauncherSettings.Favorites.CONTAINER_HOTSEAT :
LauncherSettings.Favorites.CONTAINER_DESKTOP;
int container = hasMovedIntoHotseat ? CONTAINER_HOTSEAT : CONTAINER_DESKTOP;
int screenId = (mTargetCell[0] < 0) ?
mDragInfo.screenId : getCellLayoutId(dropTargetLayout);
int spanX = mDragInfo != null ? mDragInfo.spanX : 1;
@@ -2148,8 +2150,8 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
lp.cellVSpan = item.spanY;
lp.isLockedToGrid = true;
if (container != LauncherSettings.Favorites.CONTAINER_HOTSEAT &&
cell instanceof LauncherAppWidgetHostView) {
if (container != CONTAINER_HOTSEAT
&& cell instanceof LauncherAppWidgetHostView) {
// We post this call so that the widget has a chance to be placed
// in its final location
@@ -2805,8 +2807,8 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
*/
private void onDropExternal(final int[] touchXY, final CellLayout cellLayout, DragObject d) {
final int container = mLauncher.isHotseatLayout(cellLayout)
? LauncherSettings.Favorites.CONTAINER_HOTSEAT
: LauncherSettings.Favorites.CONTAINER_DESKTOP;
? CONTAINER_HOTSEAT
: CONTAINER_DESKTOP;
if (d.dragInfo instanceof PendingAddShortcutInfo) {
WorkspaceItemInfo si = ((PendingAddShortcutInfo) d.dragInfo)
.getActivityInfo(mLauncher).createWorkspaceItemInfo();
@@ -3347,6 +3349,30 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
}
}
@Nullable
@Override
public CellInfo getCellInfoForView(@NonNull View view) {
ViewParent parent = view.getParent();
if (parent != null
&& parent.getParent() instanceof CellLayout cl
&& view.getLayoutParams() instanceof CellLayoutLayoutParams lp) {
int container = mLauncher.isHotseatLayout(cl) ? CONTAINER_HOTSEAT : CONTAINER_DESKTOP;
CellPos pos = getCellPosMapper().mapPresenterToModel(
lp.getCellX(), lp.getCellY(), getCellLayoutId(cl), container);
return new CellInfo(view,
pos.screenId, container, pos.cellX, pos.cellY, lp.cellHSpan, lp.cellVSpan);
}
return null;
}
@Override
public boolean isContainerSupported(int container) {
return container == CONTAINER_DESKTOP
|| container == CONTAINER_HOTSEAT
|| container == CONTAINER_PREDICTION
|| container == CONTAINER_HOTSEAT_PREDICTION;
}
@Override
public View mapOverItems(@NonNull ItemOperator op) {
return mapOverCellLayouts(getWorkspaceAndHotseatCellLayouts(), op);