Skip to content

Commit bddc839

Browse files
Jim MillerAndroid Git Automerger
authored andcommitted
am 098f457: am b42bf69: am 28dc64b: Merge "Disable loading widgets in single-stage keyguard" into jb-mr1-dev
* commit '098f45784d86b14c8e65fdcade3045a2ea2e7cb1': Disable loading widgets in single-stage keyguard
2 parents 1c3f8af + 098f457 commit bddc839

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ void setLockPatternUtils(LockPatternUtils utils) {
195195
protected void onAttachedToWindow() {
196196
super.onAttachedToWindow();
197197
mAppWidgetHost.startListening();
198-
maybePopulateWidgets();
198+
// TODO: Re-enable when we have layouts that can support a better variety of widgets.
199+
// maybePopulateWidgets();
199200
disableStatusViewInteraction();
200201
post(mSwitchPageRunnable);
201202
}
@@ -643,11 +644,7 @@ private void showSecurityScreen(SecurityMode securityMode) {
643644
if (securityMode == SecurityMode.None) {
644645
// Discard current runnable if we're switching back to the selector view
645646
setOnDismissRunnable(null);
646-
setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
647-
} else {
648-
setSystemUiVisibility(getSystemUiVisibility() & (~View.STATUS_BAR_DISABLE_BACK));
649-
}
650-
647+
}
651648
mCurrentSecuritySelection = securityMode;
652649
}
653650

0 commit comments

Comments
 (0)