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

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

Merge "Zen: Be more defensive against old time conditions."

parents 722d9d9e bc5858f4

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+4 −2
Original line number Diff line number Diff line
@@ -215,10 +215,12 @@ public class ZenModePanel extends LinearLayout { 
    }



    private void refreshExitConditionText() {

        final String forever = mContext.getString(R.string.zen_mode_forever);

        if (mExitConditionId == null) {

            mExitConditionText = mContext.getString(R.string.zen_mode_forever);

            mExitConditionText = forever;

        } else if (ZenModeConfig.isValidCountdownConditionId(mExitConditionId)) {

            mExitConditionText = parseExistingTimeCondition(mExitConditionId).summary;

            final Condition condition = parseExistingTimeCondition(mExitConditionId);

            mExitConditionText = condition != null ? condition.summary : forever;

        } else {

            mExitConditionText = "(until condition ends)";  // TODO persist current description

        }