diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-02-26 21:53:56 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 10:09:02 +0000 |
| commit | c6f8c8c92e73efb0aa675a89ca4eded9ebd77615 (patch) | |
| tree | 0c43ecb0d6d61a200404de1d541b03b81e607d0d /src/com/cyanogenmod/trebuchet/LauncherModel.java | |
| parent | 8ef4f37b141f5e48bb5a63fc401d6ea9fbd9a8b1 (diff) | |
| download | android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.gz android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.bz2 android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.zip | |
Hotseat: Multiple Pages
Conflicts:
res/layout-land/hotseat.xml
res/layout-port/hotseat.xml
res/values/strings.xml
res/xml/default_workspace.xml
res/xml/preferences.xml
src/com/beansoft/launcher/preference/PreferencesProvider.java
src/com/cyanogenmod/trebuchet/Hotseat.java
src/com/cyanogenmod/trebuchet/PagedView.java
src/com/cyanogenmod/trebuchet/Workspace.java
Change-Id: I958b105451160841d5d7d345164dcb2dec4f9404
Diffstat (limited to 'src/com/cyanogenmod/trebuchet/LauncherModel.java')
| -rw-r--r-- | src/com/cyanogenmod/trebuchet/LauncherModel.java | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/com/cyanogenmod/trebuchet/LauncherModel.java b/src/com/cyanogenmod/trebuchet/LauncherModel.java index abdb484fd..36a80433a 100644 --- a/src/com/cyanogenmod/trebuchet/LauncherModel.java +++ b/src/com/cyanogenmod/trebuchet/LauncherModel.java @@ -385,14 +385,7 @@ public class LauncherModel extends BroadcastReceiver { item.cellX = cellX; item.cellY = cellY; - // We store hotseat items in canonical form which is this orientation invariant position - // in the hotseat - if (context instanceof Launcher && screen < 0 && - container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { - item.screen = ((Launcher) context).getHotseat().getOrderInHotseat(cellX, cellY); - } else { - item.screen = screen; - } + item.screen = screen; final ContentValues values = new ContentValues(); values.put(LauncherSettings.Favorites.CONTAINER, item.container); @@ -559,14 +552,8 @@ public class LauncherModel extends BroadcastReceiver { item.container = container; item.cellX = cellX; item.cellY = cellY; - // We store hotseat items in canonical form which is this orientation invariant position - // in the hotseat - if (context instanceof Launcher && screen < 0 && - container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { - item.screen = ((Launcher) context).getHotseat().getOrderInHotseat(cellX, cellY); - } else { - item.screen = screen; - } + + item.screen = screen; final ContentValues values = new ContentValues(); final ContentResolver cr = context.getContentResolver(); @@ -1175,13 +1162,13 @@ public class LauncherModel extends BroadcastReceiver { if (item.container == LauncherSettings.Favorites.CONTAINER_HOTSEAT) { // We use the last index to refer to the hotseat and the screen as the rank, so // test and update the occupied state accordingly - if (occupied[Launcher.MAX_SCREEN_COUNT][item.screen][0] != null) { + if (occupied[Launcher.MAX_SCREEN_COUNT][item.cellX][0] != null) { Log.e(TAG, "Error loading shortcut into hotseat " + item + " into position (" + item.screen + ":" + item.cellX + "," + item.cellY + ") occupied by " + occupied[Launcher.MAX_SCREEN_COUNT][item.screen][0]); return false; } else { - occupied[Launcher.MAX_SCREEN_COUNT][item.screen][0] = item; + occupied[Launcher.MAX_SCREEN_COUNT][item.cellX][0] = item; return true; } } else if (item.container != LauncherSettings.Favorites.CONTAINER_DESKTOP) { |