diff options
| author | The Android Automerger <android-build@android.com> | 2010-06-11 11:47:10 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2010-06-11 11:47:10 -0700 |
| commit | 279302ea0d563fb918c02ac75d8a6c743f91dcb6 (patch) | |
| tree | c59b7b82f3d94632af7c0c3205a273422aff5302 /src/com/android/launcher2/Launcher.java | |
| parent | 8d74cc034c281ae7ef0c0c8c0c0e2a8974d151f7 (diff) | |
| parent | ab66ed2e067cbd1bc415b6cf66f3b5191b166461 (diff) | |
| download | android_packages_apps_Trebuchet-279302ea0d563fb918c02ac75d8a6c743f91dcb6.tar.gz android_packages_apps_Trebuchet-279302ea0d563fb918c02ac75d8a6c743f91dcb6.tar.bz2 android_packages_apps_Trebuchet-279302ea0d563fb918c02ac75d8a6c743f91dcb6.zip | |
Merge branch 'froyo' into froyo-release
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 13a39a3a3..6bd915aa0 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2093,7 +2093,11 @@ public final class Launcher extends Activity * Implementation of the method from LauncherModel.Callbacks. */ public int getCurrentWorkspaceScreen() { - return mWorkspace.getCurrentScreen(); + if (mWorkspace != null) { + return mWorkspace.getCurrentScreen(); + } else { + return SCREEN_COUNT / 2; + } } /** |