Merge "Suppress location tile in QS on lock screen" into lmp-dev

This commit is contained in:
Tom O'Neill
2014-09-05 16:37:43 +00:00
committed by Android (Google) Code Review

View File

@@ -60,7 +60,11 @@ public class LocationTile extends QSTile<QSTile.BooleanState> {
@Override
protected void handleUpdateState(BooleanState state, Object arg) {
final boolean locationEnabled = mController.isLocationEnabled();
state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing());
// Work around for bug 15916487: don't show location tile on top of lock screen. After the
// bug is fixed, this should be reverted to only hiding it on secure lock screens:
// state.visible = !(mKeyguard.isSecure() && mKeyguard.isShowing());
state.visible = !mKeyguard.isShowing();
state.value = locationEnabled;
if (locationEnabled) {
state.iconId = R.drawable.ic_qs_location_on;