Fix Sensor test fragment

- Convert sensor test fragment to use car-lib instead of car-support-lib
- Remove accelerometer, gyro, compass, gps from sensor test fragment
(they are not supported in car-lib)

Bug: 80371235
Bug: 79614473
Bug: 79613345
Test: Embedded Kitchen Sink
Change-Id: Ideeb4bfcf32bfa1d1e92000c5315ee54748adedb
Merged-In: Iffd7c82e3adcde6522d51a562885cc2abb8f11e4

1 files changed, 8 insertions, 17 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 0a00c66015..7837f2e775 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -17,6 +17,7 @@
 package com.google.android.car.kitchensink;
 
 
+import android.car.hardware.CarSensorManager;
 import android.car.hardware.hvac.CarHvacManager;
 import android.car.hardware.power.CarPowerManager;
 import android.car.hardware.property.CarPropertyManager;
@@ -27,7 +28,6 @@ import android.support.car.Car;
 import android.support.car.CarAppFocusManager;
 import android.support.car.CarConnectionCallback;
 import android.support.car.CarNotConnectedException;
-import android.support.car.hardware.CarSensorManager;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 
@@ -181,17 +181,9 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     private CarHvacManager mHvacManager;
     private CarPowerManager mPowerManager;
     private CarPropertyManager mPropertyManager;
-    private CarSensorManager mCarSensorManager;
+    private CarSensorManager mSensorManager;
     private CarAppFocusManager mCarAppFocusManager;
 
-    private final CarSensorManager.OnSensorChangedListener mListener = (manager, event) -> {
-        switch (event.sensorType) {
-            case CarSensorManager.SENSOR_TYPE_DRIVING_STATUS:
-                Log.d(TAG, "driving status:" + event.intValues[0]);
-                break;
-        }
-    };
-
     public CarHvacManager getHvacManager() {
         return mHvacManager;
     }
@@ -209,6 +201,10 @@ public class KitchenSinkActivity extends CarDrawerActivity {
         return new DrawerAdapter();
     }
 
+    public CarSensorManager getSensorManager() {
+        return mSensorManager;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -255,9 +251,6 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mCarSensorManager != null) {
-            mCarSensorManager.removeListener(mListener);
-        }
         if (mCarApi != null) {
             mCarApi.disconnect();
         }
@@ -281,10 +274,8 @@ public class KitchenSinkActivity extends CarDrawerActivity {
                     android.car.Car.POWER_SERVICE);
                 mPropertyManager = (CarPropertyManager) mCarApi.getCarManager(
                     android.car.Car.PROPERTY_SERVICE);
-                mCarSensorManager = (CarSensorManager) mCarApi.getCarManager(Car.SENSOR_SERVICE);
-                mCarSensorManager.addListener(mListener,
-                        CarSensorManager.SENSOR_TYPE_DRIVING_STATUS,
-                        CarSensorManager.SENSOR_RATE_NORMAL);
+                mSensorManager = (CarSensorManager) mCarApi.getCarManager(
+                    android.car.Car.SENSOR_SERVICE);
                 mCarAppFocusManager =
                         (CarAppFocusManager) mCarApi.getCarManager(Car.APP_FOCUS_SERVICE);
             } catch (CarNotConnectedException e) {