fix merge from 16-dev to qpr1 problem

build.gradle

@@ -376,7 +376,6 @@ dependencies {
     implementation projects.viewcapturelib
     implementation projects.displaylib
     implementation projects.mechanics
-    implementation projects.mechanics.compose
 
     // Recents lib dependency
     withQuickstepCompileOnly projects.hiddenApi

lawnchair/src/app/lawnchair/ui/preferences/destinations/SelectAppsForDrawerFolder.kt

@@ -101,7 +101,6 @@ fun SelectAppsForDrawerFolder(
             preferenceGroupItems(
                 count = 20,
                 isFirstChild = true,
-                        dividerStartIndent = 40.dp,
             ) {
                 AppItemPlaceholder()
             }
@@ -169,7 +168,6 @@ fun SelectAppsForDrawerFolder(
                     null
                 },
                 isFirstChild = selectedAppsInFolder.isEmpty(),
-                dividerStartIndent = 40.dp,
             ) { _, app ->
                 AppItem(
                     app = app,

modules/widgetpicker/src/com/android/launcher3/widgetpicker/ui/ViewModel.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.delay
  * An interface defining general structure of a view model in widget picker.
  */
 // TODO(b/419844646): Once stable, introduce a reusable library.
-internal interface ViewModel {
+interface ViewModel {
     /**
      * Implement this function to initialize the state of viewmodel by binding to the flows from the
      * interactors.

settings.gradle

@@ -72,9 +72,6 @@ project(':displaylib').projectDir = new File(rootDir, 'platform_frameworks_libs_
 include ':mechanics'
 project(':mechanics').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/mechanics')
 
-include ':mechanics:compose'
-project(':mechanics:compose').projectDir = new File(rootDir, 'platform_frameworks_libs_systemui/mechanics/compose')
-
 include ':hidden-api'
 
 include ':shared'

src/com/android/launcher3/model/BaseLauncherBinder.java

@@ -95,7 +95,7 @@ public class BaseLauncherBinder {
             StringCache stringCache;
 
             synchronized (mBgDataModel) {
-                itemsIdMap = mBgDataModel.itemsIdMap.copy(mContext);
+                itemsIdMap = mBgDataModel.itemsIdMap.copy();
                 mBgDataModel.extraItems.forEach(extraItems::add);
                 if (incrementBindId) {
                     mBgDataModel.lastBindId++;