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

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

@ -136,7 +136,7 @@ public class PhoneStatusBar extends StatusBar {
BatteryController mBatteryController;
LocationController mLocationController;
NetworkController mNetworkController;
int mNaturalBarHeight = -1;
int mIconSize = -1;
int mIconHPadding = -1;
@ -168,7 +168,7 @@ public class PhoneStatusBar extends StatusBar {
// drag bar
CloseDragHandle mCloseView;
// all notifications
NotificationData mNotificationData = new NotificationData();
NotificationRowLayout mPile;
@ -298,7 +298,7 @@ public class PhoneStatusBar extends StatusBar {
try {
boolean showNav = mWindowManager.hasNavigationBar();
if (showNav) {
mNavigationBarView =
mNavigationBarView =
(NavigationBarView) View.inflate(context, R.layout.navigation_bar, null);
mNavigationBarView.setDisabledFlags(mDisabled);
@ -352,11 +352,11 @@ public class PhoneStatusBar extends StatusBar {
mBatteryController = new BatteryController(mContext);
mBatteryController.addIconView((ImageView)sb.findViewById(R.id.battery));
mNetworkController = new NetworkController(mContext);
final SignalClusterView signalCluster =
final SignalClusterView signalCluster =
(SignalClusterView)sb.findViewById(R.id.signal_cluster);
mNetworkController.addSignalCluster(signalCluster);
signalCluster.setNetworkController(mNetworkController);
// final ImageView wimaxRSSI =
// final ImageView wimaxRSSI =
// (ImageView)sb.findViewById(R.id.wimax_signal);
// if (wimaxRSSI != null) {
// mNetworkController.addWimaxIconView(wimaxRSSI);
@ -1085,8 +1085,8 @@ public class PhoneStatusBar extends StatusBar {
}
}
if ((diff & (StatusBarManager.DISABLE_HOME
| StatusBarManager.DISABLE_RECENT
if ((diff & (StatusBarManager.DISABLE_HOME
| StatusBarManager.DISABLE_RECENT
| StatusBarManager.DISABLE_BACK)) != 0) {
// the nav bar will take care of these
if (mNavigationBarView != null) mNavigationBarView.setDisabledFlags(state);
@ -1204,7 +1204,7 @@ public class PhoneStatusBar extends StatusBar {
public void animateCollapse(boolean excludeRecents) {
animateCollapse(excludeRecents, 1.0f);
}
public void animateCollapse(boolean excludeRecents, float velocityMultiplier) {
if (SPEW) {
Slog.d(TAG, "animateCollapse(): mExpanded=" + mExpanded
@ -1516,8 +1516,8 @@ public class PhoneStatusBar extends StatusBar {
}
if (CHATTY) {
Slog.d(TAG, String.format("gesture: vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f",
mVelocityTracker.getXVelocity(),
Slog.d(TAG, String.format("gesture: vraw=(%f,%f) vnorm=(%f,%f) vlinear=%f",
mVelocityTracker.getXVelocity(),
mVelocityTracker.getYVelocity(),
xVel, yVel,
vel));
@ -1795,7 +1795,7 @@ public class PhoneStatusBar extends StatusBar {
StatusBarIconView ic = (StatusBarIconView) mStatusIcons.getChildAt(i);
pw.println(" [" + i + "] icon=" + ic);
}
if (false) {
pw.println("see the logcat for a dump of the views we have created.");
// must happen on ui thread
@ -1970,10 +1970,10 @@ public class PhoneStatusBar extends StatusBar {
- (mTrackingParams.height-closePos) - contentsBottom;
if (SPEW) {
Slog.d(PhoneStatusBar.TAG,
Slog.d(PhoneStatusBar.TAG,
"pos=" + pos +
" trackingHeight=" + mTrackingView.getHeight() +
" (trackingParams.height - closePos)=" +
" (trackingParams.height - closePos)=" +
(mTrackingParams.height - closePos) +
" contentsBottom=" + contentsBottom);
}
@ -2048,7 +2048,7 @@ public class PhoneStatusBar extends StatusBar {
mExpandedDialog.getWindow().setAttributes(mExpandedParams);
}
if (DEBUG) {
Slog.d(TAG, "updateExpandedSize: height=" + mExpandedParams.height + " " +
Slog.d(TAG, "updateExpandedSize: height=" + mExpandedParams.height + " " +
(mExpandedVisible ? "VISIBLE":"INVISIBLE"));
}
}
@ -2188,6 +2188,11 @@ public class PhoneStatusBar extends StatusBar {
private View.OnClickListener mSettingsButtonListener = new View.OnClickListener() {
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)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
animateCollapse();
@ -2237,7 +2242,7 @@ public class PhoneStatusBar extends StatusBar {
loadDimens();
}
protected void loadDimens() {
final Resources res = mContext.getResources();