diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-20 12:33:21 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-20 12:56:58 -0700 |
commit | 756cd26592dee6b956becdc24d60995c64de9153 (patch) | |
tree | 3d415a7820c619e6c85f78000016f4403c346f2b /src/com/android/launcher3/ItemInfo.java | |
parent | 7b7d6d09eec6b9f65273f597b2d93fc53a9069ff (diff) | |
download | android_packages_apps_Trebuchet-756cd26592dee6b956becdc24d60995c64de9153.tar.gz android_packages_apps_Trebuchet-756cd26592dee6b956becdc24d60995c64de9153.tar.bz2 android_packages_apps_Trebuchet-756cd26592dee6b956becdc24d60995c64de9153.zip |
General code refactoring
> Removing utility method for isAttachedToWindow
> Moving logic to calculate cell size from workspace to DeviceProfile
> Replacing some constants with xml resource variables
> Saving the item info using content values for better compatibility with other methods
Change-Id: Idd612633d97a6241cb31148df9466031374bd5a0
Diffstat (limited to 'src/com/android/launcher3/ItemInfo.java')
-rw-r--r-- | src/com/android/launcher3/ItemInfo.java | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java index 956bb8c75..6d5bbab33 100644 --- a/src/com/android/launcher3/ItemInfo.java +++ b/src/com/android/launcher3/ItemInfo.java @@ -137,15 +137,8 @@ public class ItemInfo { return null; } - /** - * Write the fields of this item to the DB - * - * @param context A context object to use for getting UserManagerCompat - * @param values - */ - - void onAddToDatabase(Context context, ContentValues values) { - values.put(LauncherSettings.BaseLauncherColumns.ITEM_TYPE, itemType); + public void writeToValues(ContentValues values) { + values.put(LauncherSettings.Favorites.ITEM_TYPE, itemType); values.put(LauncherSettings.Favorites.CONTAINER, container); values.put(LauncherSettings.Favorites.SCREEN, screenId); values.put(LauncherSettings.Favorites.CELLX, cellX); @@ -153,6 +146,27 @@ public class ItemInfo { values.put(LauncherSettings.Favorites.SPANX, spanX); values.put(LauncherSettings.Favorites.SPANY, spanY); values.put(LauncherSettings.Favorites.RANK, rank); + } + + public void readFromValues(ContentValues values) { + itemType = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + container = values.getAsLong(LauncherSettings.Favorites.CONTAINER); + screenId = values.getAsLong(LauncherSettings.Favorites.SCREEN); + cellX = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + cellY = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + spanX = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + spanY = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + rank = values.getAsInteger(LauncherSettings.Favorites.ITEM_TYPE); + } + + /** + * Write the fields of this item to the DB + * + * @param context A context object to use for getting UserManagerCompat + * @param values + */ + void onAddToDatabase(Context context, ContentValues values) { + writeToValues(values); long serialNumber = UserManagerCompat.getInstance(context).getSerialNumberForUser(user); values.put(LauncherSettings.Favorites.PROFILE_ID, serialNumber); |