diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-02-02 13:52:53 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2017-02-16 13:50:14 -0800 |
commit | 43bf11d9c95f76c2dfeb625b23cb458df81252b3 (patch) | |
tree | ec2bbed88795b3c02621cd964be56f20d797c263 /src/com/android/launcher3/Launcher.java | |
parent | 5a2edd65f2ca3d83b1672835831e2f5b2f16ab82 (diff) | |
download | android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.tar.gz android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.tar.bz2 android_packages_apps_Trebuchet-43bf11d9c95f76c2dfeb625b23cb458df81252b3.zip |
Separating methods for updating the model to a sepatate class.
Removing static access to model update methods, to allow for better
access control and testing
Change-Id: I9afe004dbf1b2fe50df422fd28bceea9230a4704
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 11db9a0eb..1c077c2e5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -85,6 +85,7 @@ import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.allapps.DefaultAppSearchController; import com.android.launcher3.anim.AnimationLayerSet; +import com.android.launcher3.model.ModelWriter; import com.android.launcher3.notification.NotificationListener; import com.android.launcher3.popup.PopupDataProvider; import com.android.launcher3.compat.AppWidgetManagerCompat; @@ -256,6 +257,7 @@ public class Launcher extends BaseActivity private ViewOnDrawExecutor mPendingExecutor; private LauncherModel mModel; + private ModelWriter mModelWriter; private IconCache mIconCache; private ExtractedColors mExtractedColors; private LauncherAccessibilityDelegate mAccessibilityDelegate; @@ -373,6 +375,7 @@ public class Launcher extends BaseActivity mSharedPrefs = Utilities.getPrefs(this); mIsSafeModeEnabled = getPackageManager().isSafeMode(); mModel = app.setLauncher(this); + mModelWriter = mModel.getWriter(mDeviceProfile.isVerticalBarLayout()); mIconCache = app.getIconCache(); mAccessibilityDelegate = new LauncherAccessibilityDelegate(this); @@ -1500,7 +1503,7 @@ public class Launcher extends BaseActivity return; } - LauncherModel.addItemToDatabase(this, info, container, screenId, cellXY[0], cellXY[1]); + getModelWriter().addItemToDatabase(info, container, screenId, cellXY[0], cellXY[1]); mWorkspace.addInScreen(view, info); } @@ -1528,7 +1531,7 @@ public class Launcher extends BaseActivity launcherInfo.minSpanY = itemInfo.minSpanY; launcherInfo.user = appWidgetInfo.getUser(); - LauncherModel.addItemToDatabase(this, launcherInfo, + getModelWriter().addItemToDatabase(launcherInfo, itemInfo.container, itemInfo.screenId, itemInfo.cellX, itemInfo.cellY); if (hostView == null) { @@ -1688,6 +1691,10 @@ public class Launcher extends BaseActivity return mModel; } + public ModelWriter getModelWriter() { + return mModelWriter; + } + public SharedPreferences getSharedPrefs() { return mSharedPrefs; } @@ -2129,8 +2136,7 @@ public class Launcher extends BaseActivity folderInfo.title = getText(R.string.folder_name); // Update the model - LauncherModel.addItemToDatabase(Launcher.this, folderInfo, container, screenId, - cellX, cellY); + getModelWriter().addItemToDatabase(folderInfo, container, screenId, cellX, cellY); // Create the view FolderIcon newFolder = FolderIcon.fromXml(R.layout.folder_icon, this, layout, folderInfo); @@ -2158,7 +2164,7 @@ public class Launcher extends BaseActivity mWorkspace.removeWorkspaceItem(v); } if (deleteFromDb) { - LauncherModel.deleteItemFromDatabase(this, itemInfo); + getModelWriter().deleteItemFromDatabase(itemInfo); } } else if (itemInfo instanceof FolderInfo) { final FolderInfo folderInfo = (FolderInfo) itemInfo; @@ -2167,7 +2173,7 @@ public class Launcher extends BaseActivity } mWorkspace.removeWorkspaceItem(v); if (deleteFromDb) { - LauncherModel.deleteFolderAndContentsFromDatabase(this, folderInfo); + getModelWriter().deleteFolderAndContentsFromDatabase(folderInfo); } } else if (itemInfo instanceof LauncherAppWidgetInfo) { final LauncherAppWidgetInfo widgetInfo = (LauncherAppWidgetInfo) itemInfo; @@ -2196,7 +2202,7 @@ public class Launcher extends BaseActivity } }.executeOnExecutor(Utilities.THREAD_POOL_EXECUTOR); } - LauncherModel.deleteItemFromDatabase(this, widgetInfo); + getModelWriter().deleteItemFromDatabase(widgetInfo); } @Override @@ -3389,7 +3395,7 @@ public class Launcher extends BaseActivity throw (new RuntimeException(desc)); } else { Log.d(TAG, desc); - LauncherModel.deleteItemFromDatabase(this, item); + getModelWriter().deleteItemFromDatabase(item); continue; } } @@ -3486,7 +3492,7 @@ public class Launcher extends BaseActivity + " belongs to component " + item.providerName + ", as the provider is null"); } - LauncherModel.deleteItemFromDatabase(this, item); + getModelWriter().deleteItemFromDatabase(item); return; } @@ -3533,14 +3539,14 @@ public class Launcher extends BaseActivity : LauncherAppWidgetInfo.FLAG_UI_NOT_READY; } - LauncherModel.updateItemInDatabase(this, item); + getModelWriter().updateItemInDatabase(item); } } else if (item.hasRestoreFlag(LauncherAppWidgetInfo.FLAG_UI_NOT_READY) && (appWidgetInfo.configure == null)) { // The widget was marked as UI not ready, but there is no configure activity to // update the UI. item.restoreStatus = LauncherAppWidgetInfo.RESTORE_COMPLETED; - LauncherModel.updateItemInDatabase(this, item); + getModelWriter().updateItemInDatabase(item); } } @@ -3590,7 +3596,7 @@ public class Launcher extends BaseActivity info.restoreStatus = finalRestoreFlag; mWorkspace.reinflateWidgetsIfNecessary(); - LauncherModel.updateItemInDatabase(this, info); + getModelWriter().updateItemInDatabase(info); return info; } |