diff options
| author | Bryce Lee <brycelee@google.com> | 2014-10-22 16:56:08 -0700 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2014-10-22 16:56:08 -0700 |
| commit | fb1cf36aa739da5dbebc64e61900e9ff96134e26 (patch) | |
| tree | 8679163a6017516b9b9ae2e12eeebbc1a59ab208 /core/java/android/provider | |
| parent | 1eb6a2f075bfc0b65f0accf0f03661d7a5152593 (diff) | |
| parent | f03ba4f13ba835c670d7c471f91a3083846ab082 (diff) | |
| download | frameworks_base-fb1cf36aa739da5dbebc64e61900e9ff96134e26.zip frameworks_base-fb1cf36aa739da5dbebc64e61900e9ff96134e26.tar.gz frameworks_base-fb1cf36aa739da5dbebc64e61900e9ff96134e26.tar.bz2 | |
resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev
Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 75c435e..80d33f4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5095,6 +5095,12 @@ public final class Settings { public static final String AIRPLANE_MODE_ON = "airplane_mode_on"; /** + * Whether Theater Mode is on. + * {@hide} + */ + public static final String THEATER_MODE_ON = "theater_mode_on"; + + /** * Constant for use in AIRPLANE_MODE_RADIOS to specify Bluetooth radio. */ public static final String RADIO_BLUETOOTH = "bluetooth"; |