diff options
| author | Steve Paik <spaik@google.com> | 2018-05-16 09:29:49 -0700 |
|---|---|---|
| committer | Steve Paik <spaik@google.com> | 2018-05-16 09:49:31 -0700 |
| commit | f0603e1ad33076fb4baa7d1743a245d780b68f19 (patch) | |
| tree | 78e09c503717c798b106138bab080c636870012c /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac | |
| parent | fc8a2be1e2b18fac9d4f755f4be4230740d213b2 (diff) | |
| download | Car-f0603e1ad33076fb4baa7d1743a245d780b68f19.tar.gz | |
Update DefaultConfig.h to use new areaIDs
Bug: 79752968
Test: EmbeddedKitchenSink
Change-Id: Iff2261e320b0934ce50e261f91c1d8b876f657e3
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 | 16 |
1 files changed, 9 insertions, 7 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 b7d06e232c..a1f8e1dece 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 @@ -128,17 +128,17 @@ public class HvacTestFragment extends Fragment { mTbRecirc.setChecked((boolean)value.getValue()); break; case CarHvacManager.ID_ZONED_FAN_SPEED_SETPOINT: - if ((zones & mZoneForFanSpeed) != 0) { + if ((zones & mZoneForFanSpeed) == mZoneForFanSpeed) { mCurFanSpeed = (int)value.getValue(); mTvFanSpeed.setText(String.valueOf(mCurFanSpeed)); } break; case CarHvacManager.ID_ZONED_TEMP_SETPOINT: - if ((zones & mZoneForSetTempD) != 0) { + if ((zones & mZoneForSetTempD) == mZoneForSetTempD) { mCurDTemp = (float)value.getValue(); mTvDTemp.setText(String.valueOf(mCurDTemp)); } - if ((zones & mZoneForSetTempP) != 0) { + if ((zones & mZoneForSetTempP) == mZoneForSetTempP) { mCurPTemp = (float)value.getValue(); mTvPTemp.setText(String.valueOf(mCurPTemp)); } @@ -415,12 +415,14 @@ public class HvacTestFragment extends Fragment { mTempStep = 0.5f; } mZoneForSetTempD = 0; - if (prop.hasArea(VehicleAreaSeat.ROW_1_LEFT)) { - mZoneForSetTempD = VehicleAreaSeat.ROW_1_LEFT; + if (prop.hasArea(VehicleAreaSeat.ROW_1_LEFT | VehicleAreaSeat.ROW_2_LEFT + | VehicleAreaSeat.ROW_2_CENTER)) { + mZoneForSetTempD = VehicleAreaSeat.ROW_1_LEFT | VehicleAreaSeat.ROW_2_LEFT + | VehicleAreaSeat.ROW_2_CENTER; } mZoneForSetTempP = 0; - if (prop.hasArea(VehicleAreaSeat.ROW_1_RIGHT)) { - mZoneForSetTempP = VehicleAreaSeat.ROW_1_RIGHT; + if (prop.hasArea(VehicleAreaSeat.ROW_1_RIGHT | VehicleAreaSeat.ROW_2_RIGHT)) { + mZoneForSetTempP = VehicleAreaSeat.ROW_1_RIGHT | VehicleAreaSeat.ROW_2_RIGHT; } int[] areas = prop.getAreaIds(); if (mZoneForSetTempD == 0 && areas.length > 1) { |