diff options
| author | Michael Jurka <mikejurka@google.com> | 2010-09-28 17:09:46 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2010-09-30 10:54:28 -0700 |
| commit | 845ba3b17b83a2b11d79c6fb076cf96ab4a737df (patch) | |
| tree | 29bdf613ff16d23a60e1c4336392322d7b5f506b /src/com/android/launcher2/LauncherModel.java | |
| parent | 343a7c5d6fd1b8ffe696cee5d021b0940f2d524e (diff) | |
| download | android_packages_apps_Trebuchet-845ba3b17b83a2b11d79c6fb076cf96ab4a737df.tar.gz android_packages_apps_Trebuchet-845ba3b17b83a2b11d79c6fb076cf96ab4a737df.tar.bz2 android_packages_apps_Trebuchet-845ba3b17b83a2b11d79c6fb076cf96ab4a737df.zip | |
Fix: crash on portrait/landscape switch due to
duplicate View ids
Change-Id: I69d09823d4825dadd7f3e119f9248140256f91b3
Diffstat (limited to 'src/com/android/launcher2/LauncherModel.java')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 7c1fa2114..5b4ff5a2b 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -300,8 +300,10 @@ public class LauncherModel extends BroadcastReceiver { /** * Creates a new unique child id, for a given cell span across all layouts. */ - static int getCellLayoutChildId(int cellId, int screen, int localCellX, int localCellY, int spanX, int spanY) { - return ((cellId & 0xFF) << 16) | (localCellX & 0xFF) << 8 | (localCellY & 0xFF); + static int getCellLayoutChildId( + int cellId, int screen, int localCellX, int localCellY, int spanX, int spanY) { + return ((cellId & 0xFF) << 24) + | (screen & 0xFF) << 16 | (localCellX & 0xFF) << 8 | (localCellY & 0xFF); } static int getCellCountX() { |