diff options
| author | John Spurlock <jspurlock@google.com> | 2014-05-02 00:09:43 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-05-02 00:09:43 -0400 |
| commit | 0e0122a9999eb1a603c99be12846acad29ed0593 (patch) | |
| tree | d30051beb05e80715609ffd0f57e38693c097ebd | |
| parent | 04a73fe3c0810075b6bf7ec6105baaa9bff4e667 (diff) | |
| download | packages_apps_Settings-0e0122a9999eb1a603c99be12846acad29ed0593.zip packages_apps_Settings-0e0122a9999eb1a603c99be12846acad29ed0593.tar.gz packages_apps_Settings-0e0122a9999eb1a603c99be12846acad29ed0593.tar.bz2 | |
Compile against renamed condition field.
Change-Id: I6a4a28987902551ebf7b775705bed5a6e91f9dca
3 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java b/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java index 7661f6f..0e77632 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java +++ b/src/com/android/settings/notification/ZenModeAutomaticConditionSelection.java @@ -131,7 +131,7 @@ public class ZenModeAutomaticConditionSelection extends LinearLayout { } } if (v != null) { - v.setText(c.caption); + v.setText(c.summary); v.setEnabled(c.state != Condition.STATE_ERROR); v.setChecked(mSelectedConditions.contains(c.id)); } diff --git a/src/com/android/settings/notification/ZenModeConditionSelection.java b/src/com/android/settings/notification/ZenModeConditionSelection.java index 134fb61..4b1c229 100644 --- a/src/com/android/settings/notification/ZenModeConditionSelection.java +++ b/src/com/android/settings/notification/ZenModeConditionSelection.java @@ -99,7 +99,7 @@ public class ZenModeConditionSelection extends RadioGroup { } } if (v != null) { - v.setText(c.caption); + v.setText(c.summary); v.setEnabled(c.state == Condition.STATE_TRUE); } } diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 0954481..ff1a5ab 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -309,7 +309,7 @@ public class ZenModeSettings extends SettingsPreferenceFragment implements Index final StringBuilder sb = new StringBuilder(); for (int i = 0; i < automatic.length; i++) { if (i > 0) sb.append(divider); - sb.append(automatic[i].caption); + sb.append(automatic[i].summary); } return sb.toString(); } catch (Exception e) { |