aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 10:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Updating the scroll calculation from recyclerView to avoid view inflation"

Browse Source 
This reverts commit 20bbe95ddb.

Reason for revert: Causing flake in Ironwood test: b/248295569

Test: ABTD
Before: Flaky, 14/50 PASSED
https://android-build.googleplex.com/builds/abtd/run/L33900000956890639

Revert: 50/50 PASSED
https://android-build.googleplex.com/builds/abtd/run/L49200000956887317

Change-Id: I41f4428c74e581323f90c716a7852b5e553ae27d
This commit is contained in:
Hui Kang
2022-10-17 18:27:18 +00:00
parent 20bbe95ddb
commit cee6ddf3de
12 changed files with 211 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/allapps/AllAppsGridAdapter.java
View File

@@ -26,9 +26,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.core.view.accessibility.AccessibilityRecordCompat;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView.Adapter;
import com.android.launcher3.util.ScrollableLayoutManager;
import com.android.launcher3.views.ActivityContext;
import java.util.List;
@@ -64,10 +62,10 @@ public class AllAppsGridAdapter<T extends Context & ActivityContext> extends
/**
* A subclass of GridLayoutManager that overrides accessibility values during app search.
*/
public class AppsGridLayoutManager extends ScrollableLayoutManager {
public class AppsGridLayoutManager extends GridLayoutManager {
public AppsGridLayoutManager(Context context) {
super(context);
super(context, 1, GridLayoutManager.VERTICAL, false);
}
@Override
@@ -127,15 +125,6 @@ public class AllAppsGridAdapter<T extends Context & ActivityContext> extends
}
return extraRows;
}
@Override
protected int incrementTotalHeight(Adapter adapter, int position, int heightUntilLastPos) {
AllAppsGridAdapter.AdapterItem item = mApps.getAdapterItems().get(position);
// only account for the first icon in the row since they are the same size within a row
return (isIconViewType(item.viewType) && item.rowAppIndex != 0)
? heightUntilLastPos
: (heightUntilLastPos + mCachedSizes.get(item.viewType));
}
}
@Override