diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-05-14 22:02:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 22:02:06 +0000 |
| commit | 02adbb15069dbfb777cce0613d2f2b506259d65f (patch) | |
| tree | 399c1791822f2c35112920d9bdd48de0b0f74ec8 /core | |
| parent | f8f018ba5c0fd8b93be8faa86ad7514fa4137b8a (diff) | |
| parent | 43f8a057545f274965ad5247daf0782e34a7c99f (diff) | |
| download | frameworks_base-02adbb15069dbfb777cce0613d2f2b506259d65f.zip frameworks_base-02adbb15069dbfb777cce0613d2f2b506259d65f.tar.gz frameworks_base-02adbb15069dbfb777cce0613d2f2b506259d65f.tar.bz2 | |
Merge "Add a new resource for HDMI-CEC logical device type definition"
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 13 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f5117b2..463dda2 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -462,6 +462,19 @@ provide full support for multiple displays. --> <integer name="config_undockedHdmiRotation">-1</integer> + <!-- HDMI-CEC logical device types allowed on the system. Logical device types + are defined in HDMI-CEC standard 1.4 as follows: + 0 TV + 1 Recording Device + 2 Reserved + 3 Tuner + 4 Playback + 5 Audio System + 6 Pure CEC Switch + 7 Video Processor --> + <integer-array name="config_hdmiCecLogicalDeviceType"> + </integer-array> + <!-- Control the default UI mode type to use when there is no other type override happening. One of the following values (See Configuration.java): 1 UI_MODE_TYPE_NORMAL diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a14f241..84c9023 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1303,6 +1303,7 @@ <java-symbol type="anim" name="dock_right_enter" /> <java-symbol type="anim" name="dock_right_exit" /> + <java-symbol type="array" name="config_hdmiCecLogicalDeviceType" /> <java-symbol type="array" name="config_keyboardTapVibePattern" /> <java-symbol type="array" name="config_longPressVibePattern" /> <java-symbol type="array" name="config_safeModeDisabledVibePattern" /> |