aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplifying Launcher binding callbacks

Browse Source 
> Making all methods as default
> Removing obsolete logic around synchronous binding
> Removing some UI dependencies from bind callbacks

Bug: 187353581
Test: Manual
Change-Id: I0d2bbb060af2cab7c64541d7695055629dfaf0b8
This commit is contained in:
Sunny Goyal
2021-06-17 15:15:46 -07:00
parent ab4fb243b7
commit 4a48a988c8
8 changed files with 99 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
robolectric_tests/src/com/android/launcher3/model/ModelMultiCallbacksTest.java
View File

@@ -35,7 +35,7 @@ import com.android.launcher3.util.IntSet;
import com.android.launcher3.util.LauncherLayoutBuilder;
import com.android.launcher3.util.LauncherModelHelper;
import com.android.launcher3.util.LooperExecutor;
import com.android.launcher3.util.ViewOnDrawExecutor;
import com.android.launcher3.util.RunnableList;
import org.junit.Before;
import org.junit.Test;
@@ -106,14 +106,14 @@ public class ModelMultiCallbacksTest {
// No effect on callbacks when removing an callback
mModelHelper.getModel().removeCallbacks(cb2);
waitForLoaderAndTempMainThread();
assertNull(cb1.mDeferredExecutor);
assertNull(cb2.mDeferredExecutor);
assertNull(cb1.mPendingTasks);
assertNull(cb2.mPendingTasks);
// Reloading only loads registered callbacks
mModelHelper.getModel().startLoader();
waitForLoaderAndTempMainThread();
cb1.verifySynchronouslyBound(3);
assertNull(cb2.mDeferredExecutor);
assertNull(cb2.mPendingTasks);
}
@Test
@@ -180,19 +180,15 @@ public class ModelMultiCallbacksTest {
final List<ItemInfo> mItems = new ArrayList<>();
IntSet mPageToBindSync = IntSet.wrap(0);
IntSet mPageBoundSync = new IntSet();
ViewOnDrawExecutor mDeferredExecutor;
RunnableList mPendingTasks;
AppInfo[] mAppInfos;
MyCallbacks() { }
@Override
public void onPagesBoundSynchronously(IntSet pages) {
mPageBoundSync = pages;
}
@Override
public void executeOnNextDraw(ViewOnDrawExecutor executor) {
mDeferredExecutor = executor;
public void onInitialBindComplete(IntSet boundPages, RunnableList pendingTasks) {
mPageBoundSync = boundPages;
mPendingTasks = pendingTasks;
}
@Override
@@ -213,19 +209,19 @@ public class ModelMultiCallbacksTest {
public void reset() {
mItems.clear();
mPageBoundSync = new IntSet();
mDeferredExecutor = null;
mPendingTasks = null;
mAppInfos = null;
}
public void verifySynchronouslyBound(int totalItems) {
// Verify that the requested page is bound synchronously
assertEquals(mPageBoundSync, mPageToBindSync);
assertEquals(mPageToBindSync, mPageBoundSync);
assertEquals(mItems.size(), 1);
assertEquals(mItems.get(0).screenId, mPageBoundSync);
assertNotNull(mDeferredExecutor);
assertEquals(IntSet.wrap(mItems.get(0).screenId), mPageBoundSync);
assertNotNull(mPendingTasks);
// Verify that all other pages are bound properly
mDeferredExecutor.runAllTasks();
mPendingTasks.executeAllAndDestroy();
assertEquals(mItems.size(), totalItems);
}