diff options
| author | Luis Hector Chavez <lhchavez@google.com> | 2016-05-31 23:41:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-31 23:41:41 +0000 |
| commit | d77dfa0b5a854a80a586b89f13f602ee5a523d06 (patch) | |
| tree | dd9041de1b74c6133fb3a07fcaa321de989b9668 /tests_schema/daemon/testdevice/standard_traits.h | |
| parent | f91e999fb2dc8a70365471277e846e7b8e7b3284 (diff) | |
| parent | abfe7a063bbaebdca8703d27137c8c9aed826dac (diff) | |
| download | libweave-d77dfa0b5a854a80a586b89f13f602ee5a523d06.tar.gz | |
Revert "Merge remote-tracking branch \'weave/master\' into \'weave/aosp-master\'"
am: abfe7a063b
* commit 'abfe7a063bbaebdca8703d27137c8c9aed826dac':
Revert "Merge remote-tracking branch 'weave/master' into 'weave/aosp-master'"
Change-Id: Id85d181a0a73598c6c4a3f397bd8085dd2c398e5
Diffstat (limited to 'tests_schema/daemon/testdevice/standard_traits.h')
| -rw-r--r-- | tests_schema/daemon/testdevice/standard_traits.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/tests_schema/daemon/testdevice/standard_traits.h b/tests_schema/daemon/testdevice/standard_traits.h index 27586f8..c63c5fe 100644 --- a/tests_schema/daemon/testdevice/standard_traits.h +++ b/tests_schema/daemon/testdevice/standard_traits.h @@ -196,35 +196,6 @@ 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" - } - } } })"; @@ -232,7 +203,6 @@ 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}, |