mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-03-01 00:06:47 +00:00
Revert "Adding tracing for workspace loading that never finishes"
This reverts commit 80bb8a12da.
Reason for revert: Cleanup after the bug is fixed. Tracing is not necessary anymore.
Change-Id: I1bb2bc59dd5debb51b094f14430cd18a203ed33c
This commit is contained in:
committed by
Android (Google) Code Review
parent
80bb8a12da
commit
d8b470cf2f
@@ -34,7 +34,6 @@ import com.android.launcher3.model.BgDataModel.FixedContainerItems;
|
||||
import com.android.launcher3.model.data.AppInfo;
|
||||
import com.android.launcher3.model.data.ItemInfo;
|
||||
import com.android.launcher3.model.data.LauncherAppWidgetInfo;
|
||||
import com.android.launcher3.testing.shared.TestProtocol;
|
||||
import com.android.launcher3.util.IntArray;
|
||||
import com.android.launcher3.util.IntSet;
|
||||
import com.android.launcher3.util.LooperExecutor;
|
||||
@@ -268,33 +267,18 @@ public abstract class BaseLauncherBinder {
|
||||
sortWorkspaceItemsSpatially(idp, currentWorkspaceItems);
|
||||
sortWorkspaceItemsSpatially(idp, otherWorkspaceItems);
|
||||
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "Before posting startBinding");
|
||||
}
|
||||
// Tell the workspace that we're about to start binding items
|
||||
executeCallbacksTask(c -> {
|
||||
c.clearPendingBinds();
|
||||
c.startBinding();
|
||||
}, mUiExecutor);
|
||||
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "1");
|
||||
}
|
||||
// Bind workspace screens
|
||||
executeCallbacksTask(c -> c.bindScreens(mOrderedScreenIds), mUiExecutor);
|
||||
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "2");
|
||||
}
|
||||
// Load items on the current page.
|
||||
bindWorkspaceItems(currentWorkspaceItems, mUiExecutor);
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "3");
|
||||
}
|
||||
bindAppWidgets(currentAppWidgets, mUiExecutor);
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "4");
|
||||
}
|
||||
if (!FeatureFlags.CHANGE_MODEL_DELEGATE_LOADING_ORDER.get()) {
|
||||
mExtraItems.forEach(item ->
|
||||
executeCallbacksTask(c -> c.bindExtraContainerItems(item), mUiExecutor));
|
||||
@@ -303,18 +287,8 @@ public abstract class BaseLauncherBinder {
|
||||
RunnableList pendingTasks = new RunnableList();
|
||||
Executor pendingExecutor = pendingTasks::add;
|
||||
bindWorkspaceItems(otherWorkspaceItems, pendingExecutor);
|
||||
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "5");
|
||||
}
|
||||
bindAppWidgets(otherAppWidgets, pendingExecutor);
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "6");
|
||||
}
|
||||
executeCallbacksTask(c -> c.finishBindingItems(currentScreenIds), pendingExecutor);
|
||||
if (TestProtocol.sDebugTracing) {
|
||||
Log.d(TestProtocol.WORKSPACE_LOADS_FOREVER, "After posting finishBindingItems");
|
||||
}
|
||||
pendingExecutor.execute(
|
||||
() -> {
|
||||
MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_DEFAULT);
|
||||
|
||||
Reference in New Issue
Block a user