commit fdb8dff54cf9327089e5ee4d5bf461ef42020fcd
author Bryce Lee <brycelee@google.com> Wed Jan 28 17:09:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 28 17:09:21 2015 +0000
tree 8f2e77a55b7d8a0b70f2df3ca46e82be049ee782
parent a4293a9b91a41c80e3af255da3cee22f6cb974d9
parent d8cb404035e8e133e310f5d811d44e3b0ecb8dcf

am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev

* commit 'd8cb404035e8e133e310f5d811d44e3b0ecb8dcf':
  Make THEATER_MODE_ON setting a system api.

api/system-current.txt

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 @@
     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";

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 838686a..92349338 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -5101,6 +5101,7 @@
          * Whether Theater Mode is on.
          * {@hide}
          */
+        @SystemApi
         public static final String THEATER_MODE_ON = "theater_mode_on";
 
         /**