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

Simplifying some view iteration methods

Browse Source 
Bug: 393703968
Flag: EXEMPT refactor
Test: Presubmit
Change-Id: Ieffa3a66fbf8595d542995c348df578a3aec9083
This commit is contained in:
Sunny Goyal
2025-02-27 11:56:36 -08:00
parent 3848c51edb
commit 476d926972
16 changed files with 136 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Workspace.java
+20 -44
View File
@@ -67,6 +67,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
import android.widget.FrameLayout;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.core.view.ViewCompat;
@@ -3157,7 +3158,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
+ "Workspace#onDropCompleted. Please file a bug. ");
}
}
View cell = getHomescreenIconByItemId(d.originalDragInfo.id);
View cell = getViewByItemId(d.originalDragInfo.id);
if (d.cancelled && cell != null) {
cell.setVisibility(VISIBLE);
}
@@ -3306,29 +3307,9 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
return layouts;
}
public View getHomescreenIconByItemId(final int id) {
return getFirstMatch((info, v) -> info != null && info.id == id);
}
public LauncherAppWidgetHostView getWidgetForAppWidgetId(final int appWidgetId) {
return (LauncherAppWidgetHostView) getFirstMatch((info, v) ->
(info instanceof LauncherAppWidgetInfo) &&
((LauncherAppWidgetInfo) info).appWidgetId == appWidgetId);
}
public View getFirstMatch(final ItemOperator operator) {
final View[] value = new View[1];
mapOverItems(new ItemOperator() {
@Override
public boolean evaluate(ItemInfo info, View v) {
if (operator.evaluate(info, v)) {
value[0] = v;
return true;
}
return false;
}
});
return value[0];
return (LauncherAppWidgetHostView) mapOverItems((info, v) ->
(info instanceof LauncherAppWidgetInfo lawi) && lawi.appWidgetId == appWidgetId);
}
void clearDropTargets() {
@@ -3387,31 +3368,26 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
}
@Override
public void mapOverItems(ItemOperator op) {
for (CellLayout layout : getWorkspaceAndHotseatCellLayouts()) {
if (mapOverCellLayout(layout, op) != null) {
return;
}
}
public View mapOverItems(@NonNull ItemOperator op) {
return mapOverCellLayouts(getWorkspaceAndHotseatCellLayouts(), op);
}
/**
* Perform {param operator} over all the items in a given {param layout}.
*
* @return The first item that satisfies the operator or null.
* Perform {param op} over all the items in the provided {param layouts} until a match is found
*/
public View mapOverCellLayout(CellLayout layout, ItemOperator operator) {
// TODO(b/128460496) Potential race condition where layout is not yet loaded
if (layout == null) {
return null;
}
ShortcutAndWidgetContainer container = layout.getShortcutsAndWidgets();
// map over all the shortcuts on the workspace
final int itemCount = container.getChildCount();
for (int itemIdx = 0; itemIdx < itemCount; itemIdx++) {
View item = container.getChildAt(itemIdx);
if (operator.evaluate((ItemInfo) item.getTag(), item)) {
return item;
public static View mapOverCellLayouts(CellLayout[] layouts, ItemOperator op) {
for (CellLayout layout : layouts) {
// TODO(b/128460496) Potential race condition where layout is not yet loaded
if (layout == null) continue;
ShortcutAndWidgetContainer container = layout.getShortcutsAndWidgets();
// map over all the shortcuts on the layout
final int itemCount = container.getChildCount();
for (int itemIdx = 0; itemIdx < itemCount; itemIdx++) {
View item = container.getChildAt(itemIdx);
if (op.evaluate((ItemInfo) item.getTag(), item)) {
return item;
}
}
}
return null;