Compile against renamed condition field.
Change-Id: I6a4a28987902551ebf7b775705bed5a6e91f9dca
This commit is contained in:
@@ -131,7 +131,7 @@ public class ZenModeAutomaticConditionSelection extends LinearLayout {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (v != null) {
|
if (v != null) {
|
||||||
v.setText(c.caption);
|
v.setText(c.summary);
|
||||||
v.setEnabled(c.state != Condition.STATE_ERROR);
|
v.setEnabled(c.state != Condition.STATE_ERROR);
|
||||||
v.setChecked(mSelectedConditions.contains(c.id));
|
v.setChecked(mSelectedConditions.contains(c.id));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ public class ZenModeConditionSelection extends RadioGroup {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (v != null) {
|
if (v != null) {
|
||||||
v.setText(c.caption);
|
v.setText(c.summary);
|
||||||
v.setEnabled(c.state == Condition.STATE_TRUE);
|
v.setEnabled(c.state == Condition.STATE_TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -309,7 +309,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index
|
|||||||
final StringBuilder sb = new StringBuilder();
|
final StringBuilder sb = new StringBuilder();
|
||||||
for (int i = 0; i < automatic.length; i++) {
|
for (int i = 0; i < automatic.length; i++) {
|
||||||
if (i > 0) sb.append(divider);
|
if (i > 0) sb.append(divider);
|
||||||
sb.append(automatic[i].caption);
|
sb.append(automatic[i].summary);
|
||||||
}
|
}
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user