diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-06-01 21:57:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 21:57:05 +0000 |
commit | b20409af35ba1a15cd260567decb8ce9dca1d091 (patch) | |
tree | 7f57ba7623a0cbf9621452f92e900095242090d5 /tests_schema/daemon/testdevice/standard_traits.h | |
parent | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (diff) | |
parent | 83db8f75afbb37010450a6a5607764dedf20db6b (diff) | |
download | libweave-nougat-mr1-wear-release.tar.gz |
Reland "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
am: 83db8f75af
* commit '83db8f75afbb37010450a6a5607764dedf20db6b':
Reland "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Idac2caa8eb2921e7ee9954a3896f936b793c99a7
Diffstat (limited to 'tests_schema/daemon/testdevice/standard_traits.h')
-rw-r--r-- | tests_schema/daemon/testdevice/standard_traits.h | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/tests_schema/daemon/testdevice/standard_traits.h b/tests_schema/daemon/testdevice/standard_traits.h index c63c5fe..27586f8 100644 --- a/tests_schema/daemon/testdevice/standard_traits.h +++ b/tests_schema/daemon/testdevice/standard_traits.h @@ -196,6 +196,35 @@ const char kTraits[] = R"({ } } } + }, + "volume": { + "commands": { + "setConfig": { + "minimalRole": "user", + "parameters": { + "volume": { + "type": "integer", + "minimum": 0, + "maximum": 100 + }, + "isMuted": { + "type": "boolean" + } + } + } + }, + "state": { + "volume": { + "isRequired": true, + "type": "integer", + "minimum": 0, + "maximum": 100 + }, + "isMuted": { + "isRequired": true, + "type": "boolean" + } + } } })"; @@ -203,6 +232,7 @@ const char kDefaultState[] = R"({ "lock":{"isLockingSupported": true}, "onOff":{"state": "on"}, "brightness":{"brightness": 0.0}, + "volume":{"isMuted": true}, "colorTemp":{"colorTemp": 0}, "colorXy": { "colorSetting": {"colorX": 0.0, "colorY": 0.0}, |