Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 288cdf82: Various fixes for back key handling.

Browse Source 
Merge commit '288cdf822559af1b3ba22d6271d5fae8ae98b077'

* commit '288cdf822559af1b3ba22d6271d5fae8ae98b077':
  Various fixes for back key handling.
This commit is contained in:
Dianne Hackborn
2009-09-16 18:23:15 -07:00
committed by Android Git Automerger
parent 2db3aa6662 fed9cb5610
commit 5722789eb4
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
policy/com/android/internal/policy/impl/PhoneWindow.java
View File

@@ -1195,19 +1195,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
}
case KeyEvent.KEYCODE_BACK: {
// Currently don't do anything with long presses.
if (event.getRepeatCount() > 0) break;
if (featureId < 0) break;
if (featureId == FEATURE_OPTIONS_PANEL) {
PanelFeatureState st = getPanelState(featureId, false);
if (st != null && st.isInExpandedMode) {
// If the user is in an expanded menu and hits back, it
// should go back to the icon menu
reopenMenu(true);
return true;
}
}
closePanel(featureId);
// Currently don't do anything with long press.
dispatcher.startTracking(event, this);
return true;
}
@@ -1321,17 +1312,20 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
case KeyEvent.KEYCODE_BACK: {
if (featureId < 0) break;
if (featureId == FEATURE_OPTIONS_PANEL) {
PanelFeatureState st = getPanelState(featureId, false);
if (st != null && st.isInExpandedMode) {
// If the user is in an expanded menu and hits back, it
// should go back to the icon menu
reopenMenu(true);
return true;
if (event.isTracking() && !event.isCanceled()) {
if (featureId == FEATURE_OPTIONS_PANEL) {
PanelFeatureState st = getPanelState(featureId, false);
if (st != null && st.isInExpandedMode) {
// If the user is in an expanded menu and hits back, it
// should go back to the icon menu
reopenMenu(true);
return true;
}
}
closePanel(featureId);
return true;
}
closePanel(featureId);
return true;
break;
}
case KeyEvent.KEYCODE_HEADSETHOOK: