diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-26 17:44:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-26 17:44:16 +0000 |
| commit | 1dd9c53a40b7c147767c63e10a47eb5cb6f8e197 (patch) | |
| tree | 6e339851e73f92aa0ad56831d94bf3a8ce9b1907 /core/java | |
| parent | 62828dfca2b009d42a414b60117d7f34034841f8 (diff) | |
| parent | eeb397b77f249045b02fe3014479a9c1bf001d0d (diff) | |
| download | frameworks_base-1dd9c53a40b7c147767c63e10a47eb5cb6f8e197.zip frameworks_base-1dd9c53a40b7c147767c63e10a47eb5cb6f8e197.tar.gz frameworks_base-1dd9c53a40b7c147767c63e10a47eb5cb6f8e197.tar.bz2 | |
Merge "Zen mode updates."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7777334..7062933 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6098,21 +6098,18 @@ public final class Settings { "lock_screen_show_notifications"; /** - * Defines global zen mode. One of ZEN_MODE_OFF, ZEN_MODE_LIMITED, ZEN_MODE_FULL. + * Defines global zen mode. ZEN_MODE_OFF or ZEN_MODE_ON. * * @hide */ public static final String ZEN_MODE = "zen_mode"; /** @hide */ public static final int ZEN_MODE_OFF = 0; - /** @hide */ public static final int ZEN_MODE_LIMITED = 1; - /** @hide */ public static final int ZEN_MODE_FULL = 2; + /** @hide */ public static final int ZEN_MODE_ON = 1; /** @hide */ public static String zenModeToString(int mode) { if (mode == ZEN_MODE_OFF) return "ZEN_MODE_OFF"; - if (mode == ZEN_MODE_LIMITED) return "ZEN_MODE_LIMITED"; - if (mode == ZEN_MODE_FULL) return "ZEN_MODE_FULL"; - throw new IllegalArgumentException("Invalid zen mode: " + mode); + return "ZEN_MODE_ON"; } /** |