Merge "Removing some obsolete features" into tm-qpr-dev

This commit is contained in:
Sunny Goyal
2022-08-22 20:27:45 +00:00
committed by Android (Google) Code Review
24 changed files with 51 additions and 278 deletions

View File

@@ -152,10 +152,6 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
public static final int DEFAULT_PAGE = 0;
private static final int DEFAULT_SMARTSPACE_HEIGHT = 1;
private static final int EXPANDED_SMARTSPACE_HEIGHT = 2;
private LayoutTransition mLayoutTransition;
@Thunk final WallpaperManager mWallpaperManager;
@@ -562,10 +558,8 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
.inflate(R.layout.search_container_workspace, firstPage, false);
}
int cellVSpan = FeatureFlags.EXPANDED_SMARTSPACE.get()
? EXPANDED_SMARTSPACE_HEIGHT : DEFAULT_SMARTSPACE_HEIGHT;
int cellHSpan = mLauncher.getDeviceProfile().inv.numSearchContainerColumns;
CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, cellHSpan, cellVSpan);
CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, cellHSpan, 1);
lp.canReorder = false;
if (!firstPage.addViewToCellLayout(mQsb, 0, R.id.search_container_workspace, lp, true)) {
Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout");