am 6430ac5c: Merge "ZenSettings: Hide the settings-specific condition picker." into lmp-preview-dev

* commit '6430ac5c1eeca8c67e99b820bcfa641e002e537f':
  ZenSettings: Hide the settings-specific condition picker.
This commit is contained in:
John Spurlock
2014-06-04 21:31:54 +00:00
committed by Android Git Automerger

View File

@@ -70,6 +70,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
SwitchBar.OnSwitchChangeListener {
private static final String TAG = "ZenModeSettings";
private static final boolean DEBUG = true;
private static final boolean SHOW_CONDITION_DIALOG = false;
private static final String KEY_GENERAL = "general";
private static final String KEY_CALLS = "phone_calls";
@@ -136,7 +137,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
final int v = isChecked ? Global.ZEN_MODE_ON : Global.ZEN_MODE_OFF;
putZenModeSetting(v);
final int n = ConditionProviderSettings.getEnabledProviderCount(mContext);
if (n > 0) {
if (SHOW_CONDITION_DIALOG && n > 0) {
mHandler.post(isChecked ? mShowDialog : mHideDialog);
}
}