summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java')
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java21
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
index abc2c10b..1440ff05 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
@@ -99,17 +99,19 @@ public class SensorsTestFragment extends Fragment {
99 99
100 View view = inflater.inflate(R.layout.sensors, container, false); 100 View view = inflater.inflate(R.layout.sensors, container, false);
101 mActivity = (KitchenSinkActivity) getHost(); 101 mActivity = (KitchenSinkActivity) getHost();
102
103 mSensorInfo = (TextView) view.findViewById(R.id.sensor_info); 102 mSensorInfo = (TextView) view.findViewById(R.id.sensor_info);
104 mNaString = getContext().getString(R.string.sensor_na); 103 mNaString = getContext().getString(R.string.sensor_na);
105
106 return view; 104 return view;
107 } 105 }
108 106
109 @Override 107 @Override
110 public void onResume() { 108 public void onResume() {
111 super.onResume(); 109 super.onResume();
112 initPermissions(); 110 final Runnable r = () -> {
111 initPermissions();
112 };
113 ((KitchenSinkActivity) getActivity()).requestRefreshManager(r,
114 new Handler(getContext().getMainLooper()));
113 } 115 }
114 116
115 @Override 117 @Override
@@ -207,6 +209,12 @@ public class SensorsTestFragment extends Fragment {
207 case CarSensorManager.SENSOR_TYPE_FUEL_DOOR_OPEN: 209 case CarSensorManager.SENSOR_TYPE_FUEL_DOOR_OPEN:
208 summary.add(getFuelDoorOpen(event)); 210 summary.add(getFuelDoorOpen(event));
209 break; 211 break;
212 case CarSensorManager.SENSOR_TYPE_IGNITION_STATE:
213 summary.add(getContext().getString(R.string.sensor_ignition_status,
214 getTimestamp(event),
215 event == null ? mNaString :
216 event.getIgnitionStateData(null).ignitionState));
217 break;
210 case CarSensorManager.SENSOR_TYPE_PARKING_BRAKE: 218 case CarSensorManager.SENSOR_TYPE_PARKING_BRAKE:
211 summary.add(getContext().getString(R.string.sensor_parking_brake, 219 summary.add(getContext().getString(R.string.sensor_parking_brake,
212 getTimestamp(event), 220 getTimestamp(event),
@@ -223,18 +231,15 @@ public class SensorsTestFragment extends Fragment {
223 getTimestamp(event), 231 getTimestamp(event),
224 event == null ? mNaString : event.getNightData(null).isNightMode)); 232 event == null ? mNaString : event.getNightData(null).isNightMode));
225 break; 233 break;
226 case CarSensorManager.SENSOR_TYPE_ENVIRONMENT: 234 case CarSensorManager.SENSOR_TYPE_ENV_OUTSIDE_TEMPERATURE:
227 String temperature = mNaString; 235 String temperature = mNaString;
228 String pressure = mNaString;
229 if (event != null) { 236 if (event != null) {
230 CarSensorEvent.EnvironmentData env = event.getEnvironmentData(null); 237 CarSensorEvent.EnvironmentData env = event.getEnvironmentData(null);
231 temperature = Float.isNaN(env.temperature) ? temperature : 238 temperature = Float.isNaN(env.temperature) ? temperature :
232 String.valueOf(env.temperature); 239 String.valueOf(env.temperature);
233 pressure = Float.isNaN(env.pressure) ? pressure :
234 String.valueOf(env.pressure);
235 } 240 }
236 summary.add(getContext().getString(R.string.sensor_environment, 241 summary.add(getContext().getString(R.string.sensor_environment,
237 getTimestamp(event), temperature, pressure)); 242 getTimestamp(event), temperature));
238 break; 243 break;
239 case CarSensorManager.SENSOR_TYPE_WHEEL_TICK_DISTANCE: 244 case CarSensorManager.SENSOR_TYPE_WHEEL_TICK_DISTANCE:
240 if(event != null) { 245 if(event != null) {