diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-04-03 01:12:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-03 01:12:58 -0700 |
| commit | 66b506113e7fced226d4da588e7f53b6f1246b6d (patch) | |
| tree | a754761b30c5dead45d803e562b7b5af0ea4fa5e /src | |
| parent | 66d4db20d26335d26baea284234b3298a1f5463a (diff) | |
| parent | 27614d22a159cf376605ebf68b51a5c45964abd9 (diff) | |
| download | android_packages_apps_Trebuchet-66b506113e7fced226d4da588e7f53b6f1246b6d.tar.gz android_packages_apps_Trebuchet-66b506113e7fced226d4da588e7f53b6f1246b6d.tar.bz2 android_packages_apps_Trebuchet-66b506113e7fced226d4da588e7f53b6f1246b6d.zip | |
Merge "Fix issue where workspace was not shown after screen off/on"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index ee540f82c..b3ce96884 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -524,6 +524,10 @@ public final class Launcher extends Activity // We just wanted the activity result here so we can clear mWaitingForResult break; } + // Before adding this resetAddInfo(), after a shortcut was added to a workspace screen, + // if you turned the screen off and then back while in All Apps, Launcher would not + // return to the workspace. Clearing mAddInfo.container here fixes this issue + resetAddInfo(); return result; } |