diff options
author | Adam Cohen <adamcohen@google.com> | 2012-06-28 18:12:10 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2012-07-09 14:49:19 -0700 |
commit | 487f7dd3059621527eb439d7d51d34e00293f9b1 (patch) | |
tree | 45c9cd5f452e44eff7bb043318947ab3422012aa /src/com/android/launcher2/ItemInfo.java | |
parent | d51f33a6316c34fc69b8040946ed9a62519bb225 (diff) | |
download | android_packages_apps_Trebuchet-487f7dd3059621527eb439d7d51d34e00293f9b1.tar.gz android_packages_apps_Trebuchet-487f7dd3059621527eb439d7d51d34e00293f9b1.tar.bz2 android_packages_apps_Trebuchet-487f7dd3059621527eb439d7d51d34e00293f9b1.zip |
Trying to track down corrupt database / items disappearing
-> Adding logs for all database transactions
-> Adding sanity checks for items in folders, throwing exceptions
if they are violated
-> Reducing database upates when re-arranging items, only
update if values have changed
-> Removed some dead code from ItemInfo (isGesture?)
Change-Id: Ia5cd57d92082f633dbf4aa5d64612cbae2d82bb4
Diffstat (limited to 'src/com/android/launcher2/ItemInfo.java')
-rw-r--r-- | src/com/android/launcher2/ItemInfo.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java index dedc0f4f3..f9ae3686e 100644 --- a/src/com/android/launcher2/ItemInfo.java +++ b/src/com/android/launcher2/ItemInfo.java @@ -86,10 +86,16 @@ class ItemInfo { * Indicates the minimum Y cell span. */ int minSpanY = 1; + + /** + * Indicates that this item needs to be updated in the db + */ + boolean requiresDbUpdate = false; + /** - * Indicates whether the item is a gesture. + * Title of the item */ - boolean isGesture = false; + CharSequence title; /** * The position of the item in a drag-and-drop operation. @@ -132,14 +138,12 @@ class ItemInfo { */ void onAddToDatabase(ContentValues values) { values.put(LauncherSettings.BaseLauncherColumns.ITEM_TYPE, itemType); - if (!isGesture) { - values.put(LauncherSettings.Favorites.CONTAINER, container); - values.put(LauncherSettings.Favorites.SCREEN, screen); - values.put(LauncherSettings.Favorites.CELLX, cellX); - values.put(LauncherSettings.Favorites.CELLY, cellY); - values.put(LauncherSettings.Favorites.SPANX, spanX); - values.put(LauncherSettings.Favorites.SPANY, spanY); - } + values.put(LauncherSettings.Favorites.CONTAINER, container); + values.put(LauncherSettings.Favorites.SCREEN, screen); + values.put(LauncherSettings.Favorites.CELLX, cellX); + values.put(LauncherSettings.Favorites.CELLY, cellY); + values.put(LauncherSettings.Favorites.SPANX, spanX); + values.put(LauncherSettings.Favorites.SPANY, spanY); } void updateValuesWithCoordinates(ContentValues values, int cellX, int cellY) { @@ -183,6 +187,6 @@ class ItemInfo { public String toString() { return "Item(id=" + this.id + " type=" + this.itemType + " container=" + this.container + " screen=" + screen + " cellX=" + cellX + " cellY=" + cellY + " spanX=" + spanX - + " spanY=" + spanY + " isGesture=" + isGesture + " dropPos=" + dropPos + ")"; + + " spanY=" + spanY + " dropPos=" + dropPos + ")"; } } |