diff options
| author | Bryce Lee <brycelee@google.com> | 2015-01-28 17:15:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 17:15:11 +0000 |
| commit | f2d5253bce5ef69cb6cb4da7697a228a47b55904 (patch) | |
| tree | f5a569a7efcf9d05fda0946f1fe8307480c38623 | |
| parent | da029217c891e989a569f327487b3db7ea7b0d81 (diff) | |
| parent | fdb8dff54cf9327089e5ee4d5bf461ef42020fcd (diff) | |
| download | frameworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.zip frameworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.tar.gz frameworks_base-f2d5253bce5ef69cb6cb4da7697a228a47b55904.tar.bz2 | |
am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev
* commit 'fdb8dff54cf9327089e5ee4d5bf461ef42020fcd':
Make THEATER_MODE_ON setting a system api.
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 56edc72..0fff00d 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -26872,6 +26872,7 @@ package android.provider { field public static final java.lang.String SHOW_PROCESSES = "show_processes"; field public static final java.lang.String STAY_ON_WHILE_PLUGGED_IN = "stay_on_while_plugged_in"; field public static final java.lang.String SYS_PROP_SETTING_VERSION = "sys.settings_global_version"; + field public static final java.lang.String THEATER_MODE_ON = "theater_mode_on"; field public static final java.lang.String TRANSITION_ANIMATION_SCALE = "transition_animation_scale"; field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled"; field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail"; diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 3e75460..ef0f72f 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5101,6 +5101,7 @@ public final class Settings { * Whether Theater Mode is on. * {@hide} */ + @SystemApi public static final String THEATER_MODE_ON = "theater_mode_on"; /** |