Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90674e53 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

Merge "Settings: Follow update to common conditions call." into lmp-mr1-dev

parents 9f0bab9b 24791aba

src/com/android/settings/notification/ZenModeConditionSelection.java

+4 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.ServiceManager; 
import android.service.notification.Condition;

import android.service.notification.IConditionListener;

import android.service.notification.ZenModeConfig;

import android.text.TextUtils;

import android.util.Log;

import android.widget.CompoundButton;

import android.widget.RadioButton;
@@ -59,7 +60,8 @@ public class ZenModeConditionSelection extends RadioGroup { 
        b.setText(mContext.getString(com.android.internal.R.string.zen_mode_forever));

        b.setChecked(true);

        for (int i = ZenModeConfig.MINUTE_BUCKETS.length - 1; i >= 0; --i) {

            handleCondition(ZenModeConfig.toTimeCondition(ZenModeConfig.MINUTE_BUCKETS[i]));

            handleCondition(ZenModeConfig.toTimeCondition(mContext,

                    ZenModeConfig.MINUTE_BUCKETS[i]));

        }

    }
@@ -114,7 +116,7 @@ public class ZenModeConditionSelection extends RadioGroup { 
            }

        }

        if (v != null) {

            v.setText(c.summary);

            v.setText(!TextUtils.isEmpty(c.line1) ? c.line1 : c.summary);

            v.setEnabled(c.state == Condition.STATE_TRUE);

        }

        mConditions.add(c);