drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a3e3c4dd: am 17f9fe13: Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1

Browse Source 
* commit 'a3e3c4dd37139615adb88a38e6a99402e0cfcd2b':
  Fix 5705837: Dismiss keyguard when launching Settings from Statusbar
This commit is contained in:
Jim Miller
2011-12-06 08:49:51 -08:00
committed by Android Git Automerger
parent 419204c8fb a3e3c4dd37
commit 63b244433f
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@ -2188,6 +2188,11 @@ public class PhoneStatusBar extends StatusBar {
private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() { private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
try {
// Dismiss the lock screen when Settings starts.
ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity();
} catch (RemoteException e) {
}
v.getContext().startActivity(new Intent(Settings.ACTION_SETTINGS) v.getContext().startActivity(new Intent(Settings.ACTION_SETTINGS)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)); .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
animateCollapse(); animateCollapse();