am 88ec0990: Fix 2274291 - back key doesn\'t go from all apps to workspace

Merge commit '88ec0990c66702158d3c7f2f6ef5c03531978247' into eclair-mr2

* commit '88ec0990c66702158d3c7f2f6ef5c03531978247':
  Fix 2274291 - back key doesn't go from all apps to workspace
This commit is contained in:
Joe Onorato
2009-11-19 14:57:13 -08:00
committed by Android Git Automerger
+11 -14
View File
@@ -1323,8 +1323,6 @@ public final class Launcher extends Activity
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getAction() == KeyEvent.ACTION_DOWN) {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK:
return true;
case KeyEvent.KEYCODE_HOME:
return true;
case KeyEvent.KEYCODE_VOLUME_DOWN:
@@ -1336,18 +1334,6 @@ public final class Launcher extends Activity
}
} else if (event.getAction() == KeyEvent.ACTION_UP) {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_BACK:
if (event.isTracking() && !event.isCanceled()) {
mWorkspace.dispatchKeyEvent(event);
if (isAllAppsVisible()) {
closeAllApps(true);
} else {
closeFolder();
}
dismissPreview(mPreviousView);
dismissPreview(mNextView);
}
return true;
case KeyEvent.KEYCODE_HOME:
return true;
}
@@ -1356,6 +1342,17 @@ public final class Launcher extends Activity
return super.dispatchKeyEvent(event);
}
@Override
public void onBackPressed() {
if (isAllAppsVisible()) {
closeAllApps(true);
} else {
closeFolder();
}
dismissPreview(mPreviousView);
dismissPreview(mNextView);
}
private void closeFolder() {
Folder folder = mWorkspace.getOpenFolder();
if (folder != null) {