Merge commit '3035b5c7be5543c77f6a90d647c5e2da78077d1b' into eclair-mr2-plus-aosp * commit '3035b5c7be5543c77f6a90d647c5e2da78077d1b': Fix 2274291 - back key doesn't go from all apps to workspace
This commit is contained in:
@@ -1323,8 +1323,6 @@ public final class Launcher extends Activity
|
|||||||
public boolean dispatchKeyEvent(KeyEvent event) {
|
public boolean dispatchKeyEvent(KeyEvent event) {
|
||||||
if (event.getAction() == KeyEvent.ACTION_DOWN) {
|
if (event.getAction() == KeyEvent.ACTION_DOWN) {
|
||||||
switch (event.getKeyCode()) {
|
switch (event.getKeyCode()) {
|
||||||
case KeyEvent.KEYCODE_BACK:
|
|
||||||
return true;
|
|
||||||
case KeyEvent.KEYCODE_HOME:
|
case KeyEvent.KEYCODE_HOME:
|
||||||
return true;
|
return true;
|
||||||
case KeyEvent.KEYCODE_VOLUME_DOWN:
|
case KeyEvent.KEYCODE_VOLUME_DOWN:
|
||||||
@@ -1336,18 +1334,6 @@ public final class Launcher extends Activity
|
|||||||
}
|
}
|
||||||
} else if (event.getAction() == KeyEvent.ACTION_UP) {
|
} else if (event.getAction() == KeyEvent.ACTION_UP) {
|
||||||
switch (event.getKeyCode()) {
|
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:
|
case KeyEvent.KEYCODE_HOME:
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1356,6 +1342,17 @@ public final class Launcher extends Activity
|
|||||||
return super.dispatchKeyEvent(event);
|
return super.dispatchKeyEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
if (isAllAppsVisible()) {
|
||||||
|
closeAllApps(true);
|
||||||
|
} else {
|
||||||
|
closeFolder();
|
||||||
|
}
|
||||||
|
dismissPreview(mPreviousView);
|
||||||
|
dismissPreview(mNextView);
|
||||||
|
}
|
||||||
|
|
||||||
private void closeFolder() {
|
private void closeFolder() {
|
||||||
Folder folder = mWorkspace.getOpenFolder();
|
Folder folder = mWorkspace.getOpenFolder();
|
||||||
if (folder != null) {
|
if (folder != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user