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

am 1dc1ccaf: Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden

Browse Source 
Merge commit '1dc1ccaf5c8cc136b71537f310a3f13150aaef41'

* commit '1dc1ccaf5c8cc136b71537f310a3f13150aaef41':
  Fix issue #1999179: search -> click result -> press home = search dialog is shown then hidden
This commit is contained in:
Dianne Hackborn
2009-07-29 16:45:08 -07:00
committed by Android Git Automerger
parent 1f651caac5 94a679daba
commit dad563e3f3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,11 +239,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (!mKeycodeCameraTimeoutActive) return;
mKeycodeCameraTimeoutActive = false;
mDecor.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
sendCloseSystemWindows();
// Broadcast an intent that the Camera button was longpressed
Intent intent = new Intent(Intent.ACTION_CAMERA_BUTTON, null);
intent.putExtra(Intent.EXTRA_KEY_EVENT, (KeyEvent) msg.obj);
getContext().sendOrderedBroadcast(intent, null);
sendCloseSystemWindows();
} break;
case MSG_SEARCH_LONG_PRESS_COMPLETE: {
if (getKeyguardManager().inKeyguardRestrictedInputMode() ||

14
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -961,8 +961,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
ActivityManagerNative.getDefault().stopAppSwitches();
} catch (RemoteException e) {
}
mContext.startActivity(mHomeIntent);
sendCloseSystemWindows();
mContext.startActivity(mHomeIntent);
}
}
});
@@ -972,8 +972,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
ActivityManagerNative.getDefault().stopAppSwitches();
} catch (RemoteException e) {
}
mContext.startActivity(mHomeIntent);
sendCloseSystemWindows();
mContext.startActivity(mHomeIntent);
}
}
@@ -1705,11 +1705,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
static void sendCloseSystemWindows(Context context, String reason) {
if (ActivityManagerNative.isSystemReady()) {
Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
if (reason != null) {
intent.putExtra(SYSTEM_DIALOG_REASON_KEY, reason);
try {
ActivityManagerNative.getDefault().closeSystemDialogs(reason);
} catch (RemoteException e) {
}
context.sendBroadcast(intent);
}
}
@@ -1821,12 +1820,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
ActivityManagerNative.getDefault().stopAppSwitches();
} catch (RemoteException e) {
}
sendCloseSystemWindows();
mContext.startActivity(mHomeIntent);
} else {
// This code brings home to the front or, if it is already
// at the front, puts the device to sleep.
try {
ActivityManagerNative.getDefault().stopAppSwitches();
sendCloseSystemWindows();
int result = ActivityManagerNative.getDefault()
.startActivity(null, mHomeIntent,
mHomeIntent.resolveTypeIfNeeded(mContext.getContentResolver()),
@@ -1838,7 +1839,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// bummer, the activity manager, which is in this process, is dead
}
}
sendCloseSystemWindows();
return true;
}