diff options
| author | Steve Paik <spaik@google.com> | 2018-01-29 16:56:17 -0800 |
|---|---|---|
| committer | Steve Paik <spaik@google.com> | 2018-01-30 10:56:44 -0800 |
| commit | 8976fb28d509b54aea11850f83b537a1579af31e (patch) | |
| tree | 32701307428e8a20d6a600979218f251b1561b8a /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac | |
| parent | d1a303e018b3bade736dde795178e3a206786a1e (diff) | |
| download | Car-8976fb28d509b54aea11850f83b537a1579af31e.tar.gz | |
Rename HVAC_FAN_POSITION to HVAC_FAN_DIRECTION
Rename the properties to be consistent with VHAL namings.
Also remove FAN_DIRECTION_FACE_AND_FLOOR and
FAN_DIRECTION_DEFROST_AND_FLOOR.
Bug: 72221544
Test: Unit tests pass
Change-Id: Ie26525a2b0e5f6e74678ee33274ee44faa570a4a
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac')
| -rw-r--r-- | tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java index 756ac0b63b..0181d84c2d 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java @@ -95,21 +95,23 @@ public class HvacTestFragment extends Fragment { case CarHvacManager.ID_ZONED_AUTOMATIC_MODE_ON: mTbAuto.setChecked((boolean)value.getValue()); break; - case CarHvacManager.ID_ZONED_FAN_POSITION: + case CarHvacManager.ID_ZONED_FAN_DIRECTION: switch((int)value.getValue()) { - case CarHvacManager.FAN_POSITION_FACE: + case CarHvacManager.FAN_DIRECTION_FACE: mRbFanPositionFace.setChecked(true); break; - case CarHvacManager.FAN_POSITION_FLOOR: + case CarHvacManager.FAN_DIRECTION_FLOOR: mRbFanPositionFloor.setChecked(true); break; - case CarHvacManager.FAN_POSITION_FACE_AND_FLOOR: + case (CarHvacManager.FAN_DIRECTION_FACE | + CarHvacManager.FAN_DIRECTION_FLOOR): mRbFanPositionFaceAndFloor.setChecked(true); break; - case CarHvacManager.FAN_POSITION_DEFROST: + case CarHvacManager.FAN_DIRECTION_DEFROST: mRbFanPositionDefrost.setChecked(true); break; - case CarHvacManager.FAN_POSITION_DEFROST_AND_FLOOR: + case (CarHvacManager.FAN_DIRECTION_DEFROST | + CarHvacManager.FAN_DIRECTION_FLOOR): mRbFanPositionDefrostAndFloor.setChecked(true); break; default: @@ -213,7 +215,7 @@ public class HvacTestFragment extends Fragment { case CarHvacManager.ID_ZONED_AC_ON: configureAcOn(v, prop); break; - case CarHvacManager.ID_ZONED_FAN_POSITION: + case CarHvacManager.ID_ZONED_FAN_DIRECTION: configureFanPosition(v, prop); break; case CarHvacManager.ID_ZONED_FAN_SPEED_SETPOINT: @@ -318,25 +320,27 @@ public class HvacTestFragment extends Fragment { int position; switch(checkedId) { case R.id.rbPositionFace: - position = CarHvacManager.FAN_POSITION_FACE; + position = CarHvacManager.FAN_DIRECTION_FACE; break; case R.id.rbPositionFloor: - position = CarHvacManager.FAN_POSITION_FLOOR; + position = CarHvacManager.FAN_DIRECTION_FLOOR; break; case R.id.rbPositionFaceAndFloor: - position = CarHvacManager.FAN_POSITION_FACE_AND_FLOOR; + position = (CarHvacManager.FAN_DIRECTION_FACE | + CarHvacManager.FAN_DIRECTION_FLOOR); break; case R.id.rbPositionDefrost: - position = CarHvacManager.FAN_POSITION_DEFROST; + position = CarHvacManager.FAN_DIRECTION_DEFROST; break; case R.id.rbPositionDefrostAndFloor: - position = CarHvacManager.FAN_POSITION_DEFROST_AND_FLOOR; + position = (CarHvacManager.FAN_DIRECTION_DEFROST | + CarHvacManager.FAN_DIRECTION_FLOOR); break; default: throw new IllegalStateException("Unexpected fan position: " + checkedId); } try { - mCarHvacManager.setIntProperty(CarHvacManager.ID_ZONED_FAN_POSITION, + mCarHvacManager.setIntProperty(CarHvacManager.ID_ZONED_FAN_DIRECTION, mZoneForFanPosition, position); } catch (CarNotConnectedException e) { |