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

Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2012-10-13 00:29:15 -07:00
committed by Android (Google) Code Review
parent 308b1a66b2 ea06c3ed6f
commit 28dc64b86b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
View File

@@ -195,7 +195,8 @@ public class KeyguardHostView extends KeyguardViewBase {
protected void onAttachedToWindow() {
super.onAttachedToWindow();
mAppWidgetHost.startListening();
maybePopulateWidgets();
// TODO: Re-enable when we have layouts that can support a better variety of widgets.
// maybePopulateWidgets();
disableStatusViewInteraction();
post(mSwitchPageRunnable);
}
@@ -643,11 +644,7 @@ public class KeyguardHostView extends KeyguardViewBase {
if (securityMode == SecurityMode.None) {
// Discard current runnable if we're switching back to the selector view
setOnDismissRunnable(null);
setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
} else {
setSystemUiVisibility(getSystemUiVisibility() & (~View.STATUS_BAR_DISABLE_BACK));
}
}
mCurrentSecuritySelection = securityMode;
}