diff options
| author | Adam Cohen <adamcohen@google.com> | 2011-09-28 20:45:37 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2011-09-29 11:53:57 -0700 |
| commit | ac56cff1860b71d3f164aedd268703936e08fdc0 (patch) | |
| tree | f92d07dce2afd7f2e2743e58935eac12c24bb04b /src/com/android/launcher2/Launcher.java | |
| parent | ae0432fec3d9d614e8cdbf3d1b4187fdd7411f87 (diff) | |
| download | android_packages_apps_Trebuchet-ac56cff1860b71d3f164aedd268703936e08fdc0.tar.gz android_packages_apps_Trebuchet-ac56cff1860b71d3f164aedd268703936e08fdc0.tar.bz2 android_packages_apps_Trebuchet-ac56cff1860b71d3f164aedd268703936e08fdc0.zip | |
Adding keyboard support to folders and fixing renaming rough edges
Change-Id: I62e1a5699e4c7e8d53f5f7d6331a854270a83aa1
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 2997d6876..02fccc590 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1147,16 +1147,18 @@ public final class Launcher extends Activity // also will cancel mWaitingForResult. closeSystemDialogs(); - closeFolder(); - boolean alreadyOnHome = ((intent.getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); + Folder openFolder = mWorkspace.getOpenFolder(); // In all these cases, only animate if we're already on home mWorkspace.exitWidgetResizeMode(); - if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive()) { + if (alreadyOnHome && mState == State.WORKSPACE && !mWorkspace.isTouchActive() && + openFolder == null) { mWorkspace.moveToDefaultScreen(true); } + + closeFolder(); exitSpringLoadedDragMode(); showWorkspace(alreadyOnHome); @@ -1876,6 +1878,9 @@ public final class Launcher extends Activity public void closeFolder() { Folder folder = mWorkspace.getOpenFolder(); if (folder != null) { + if (folder.isEditingName()) { + folder.dismissEditingName(); + } closeFolder(folder); // Dismiss the folder cling |