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

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

Browse Source
This commit is contained in:
Jim Miller
2011-12-05 22:12:54 -08:00
committed by Android (Google) Code Review
parent 3e7b412d7d 5e6af44804
commit 17f9fe13c7
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();