diff options
| author | Wonsik Kim <wonsik@google.com> | 2014-07-21 12:56:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:11:29 +0000 |
| commit | 34902f46c1ffba991bdd095f19f28e09a3a26bea (patch) | |
| tree | 6c42966dad61dbeaf4cd6ec9b1e9223f133f48f9 | |
| parent | edad7b24c17fa501f59af3c159e94e7b590e4145 (diff) | |
| parent | 11145e52be5aacc2154c58fced5fcf76271e9674 (diff) | |
| download | frameworks_base-34902f46c1ffba991bdd095f19f28e09a3a26bea.zip frameworks_base-34902f46c1ffba991bdd095f19f28e09a3a26bea.tar.gz frameworks_base-34902f46c1ffba991bdd095f19f28e09a3a26bea.tar.bz2 | |
Merge "TIF: fix tvInputType attribute to match with TvInputInfo" into lmp-dev
| -rw-r--r-- | core/res/res/values/attrs.xml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index f57d61d..2c5cfe1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -7197,12 +7197,17 @@ <!-- Virtual input (default) --> <enum name="virtual" value="0" /> - <!-- HDMI --> - <enum name="hdmi" value="1" /> - <!-- Built-in tuner --> + + <enum name="otherHardware" value="1" /> <enum name="tuner" value="2" /> - <!-- Pass-through --> - <enum name="passthrough" value="3" /> + <enum name="composite" value="3" /> + <enum name="svideo" value="4" /> + <enum name="scart" value="5" /> + <enum name="component" value="6" /> + <enum name="vga" value="7" /> + <enum name="dvi" value="8" /> + <enum name="hdmi" value="9" /> + <enum name="displayPort" value="10" /> </attr> </declare-styleable> |