Migrate kitchen sink to car-lib, away from car-support-lib.
car-support-lib will be going away in the future. This is a fairly
straight-forwad migration.
Test: Run kitchen sink on emulator.
Bug: 76168241
Change-Id: Ie710493a7389a9ee604c819897078463b888776f
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 71adf6b..8239f3c 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -50,7 +50,7 @@
vehicle-hal-support-lib \
com.android.car.keventreader-client
-include packages/services/Car/car-support-lib/car-support.mk
+LOCAL_JAVA_LIBRARIES += android.car
include $(BUILD_PACKAGE)
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 105744c..6f58d25 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -16,19 +16,21 @@
package com.google.android.car.kitchensink;
+import android.car.Car;
+import android.car.CarAppFocusManager;
+import android.car.CarNotConnectedException;
import android.car.hardware.CarSensorManager;
import android.car.hardware.hvac.CarHvacManager;
import android.car.hardware.power.CarPowerManager;
import android.car.hardware.property.CarPropertyManager;
+import android.content.ComponentName;
import android.content.Intent;
+import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
-import android.support.car.Car;
-import android.support.car.CarAppFocusManager;
-import android.support.car.CarConnectionCallback;
-import android.support.car.CarNotConnectedException;
+import android.os.IBinder;
import android.util.Log;
import androidx.car.drawer.CarDrawerActivity;
@@ -224,7 +226,7 @@
mCarApi.disconnect();
mCarApi = null;
}
- mCarApi = Car.createCar(this, mCarConnectionCallback);
+ mCarApi = Car.createCar(this, mServiceConnection);
mCarApi.connect();
}
@@ -273,10 +275,9 @@
.commit();
}
- private final CarConnectionCallback mCarConnectionCallback =
- new CarConnectionCallback() {
+ private final ServiceConnection mServiceConnection = new ServiceConnection() {
@Override
- public void onConnected(Car car) {
+ public void onServiceConnected(ComponentName name, IBinder service) {
Log.d(TAG, "Connected to Car Service");
synchronized (mPropertyManagerReady) {
try {
@@ -298,7 +299,7 @@
}
@Override
- public void onDisconnected(Car car) {
+ public void onServiceDisconnected(ComponentName name) {
Log.d(TAG, "Disconnect from Car Service");
}
};
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/FakeClusterNavigationActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/FakeClusterNavigationActivity.java
index 964d812..d50f053 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/FakeClusterNavigationActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/FakeClusterNavigationActivity.java
@@ -17,13 +17,15 @@
package com.google.android.car.kitchensink.cluster;
import android.app.Activity;
+import android.car.Car;
+import android.car.CarNotConnectedException;
import android.car.cluster.CarInstrumentClusterManager;
import android.car.cluster.ClusterActivityState;
+import android.content.ComponentName;
+import android.content.ServiceConnection;
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.car.Car;
-import android.support.car.CarConnectionCallback;
-import android.support.car.CarNotConnectedException;
+import android.os.IBinder;
import android.util.Log;
import android.widget.ImageView;
import android.widget.RelativeLayout;
@@ -50,16 +52,15 @@
setContentView(R.layout.fake_cluster_navigation_activity);
mUnobscuredArea = findViewById(R.id.unobscuredArea);
- mCarApi = Car.createCar(this /* context */, new CarConnectionCallback() {
-
+ mCarApi = Car.createCar(this /* context */, new ServiceConnection() {
@Override
- public void onConnected(Car car) {
- onCarConnected(car);
+ public void onServiceConnected(ComponentName name, IBinder service) {
+ onCarConnected(mCarApi);
}
@Override
- public void onDisconnected(Car car) {
- onCarDisconnected(car);
+ public void onServiceDisconnected(ComponentName name) {
+ onCarDisconnected(mCarApi);
}
});
Log.i(TAG, "Connecting to car api...");
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
index 8e4483e..4f5fc5b 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
@@ -16,15 +16,17 @@
package com.google.android.car.kitchensink.cluster;
import android.app.AlertDialog;
+import android.car.Car;
+import android.car.CarAppFocusManager;
+import android.car.CarNotConnectedException;
import android.car.cluster.CarInstrumentClusterManager;
+import android.car.navigation.CarNavigationStatusManager;
+import android.content.ComponentName;
import android.content.Intent;
+import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.support.car.Car;
-import android.support.car.CarAppFocusManager;
-import android.support.car.CarConnectionCallback;
-import android.support.car.CarNotConnectedException;
-import android.support.car.navigation.CarNavigationStatusManager;
+import android.os.IBinder;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -48,23 +50,25 @@
private CarAppFocusManager mCarAppFocusManager;
private Car mCarApi;
- private final CarConnectionCallback mCarConnectionCallback = new CarConnectionCallback() {
+ private final ServiceConnection mServiceConnection = new ServiceConnection() {
@Override
- public void onConnected(Car car) {
+ public void onServiceConnected(ComponentName name, IBinder service) {
Log.d(TAG, "Connected to Car Service");
try {
mCarNavigationStatusManager =
- mCarApi.getCarManager(CarNavigationStatusManager.class);
- mCarAppFocusManager = mCarApi.getCarManager(CarAppFocusManager.class);
+ (CarNavigationStatusManager) mCarApi.getCarManager(
+ Car.CAR_NAVIGATION_SERVICE);
+ mCarAppFocusManager =
+ (CarAppFocusManager) mCarApi.getCarManager(Car.APP_FOCUS_SERVICE);
} catch (CarNotConnectedException e) {
Log.e(TAG, "Car is not connected!", e);
}
}
@Override
- public void onDisconnected(Car car) {
- Log.d(TAG, "Disconnect from Car Service");
- }
+ public void onServiceDisconnected(ComponentName name) {
+ Log.d(TAG, "Disconnect from Car Service");
+ }
};
private void initCarApi() {
@@ -73,7 +77,7 @@
mCarApi = null;
}
- mCarApi = Car.createCar(getContext(), mCarConnectionCallback);
+ mCarApi = Car.createCar(getContext(), mServiceConnection);
mCarApi.connect();
}
@@ -138,8 +142,7 @@
mCarAppFocusManager
.addFocusListener(new CarAppFocusManager.OnAppFocusChangedListener() {
@Override
- public void onAppFocusChanged(CarAppFocusManager manager, int appType,
- boolean active) {
+ public void onAppFocusChanged(int appType, boolean active) {
Log.d(TAG, "onAppFocusChanged, appType: " + appType + " active: "
+ active);
}
@@ -151,7 +154,7 @@
CarAppFocusManager.OnAppFocusOwnershipCallback
focusCallback = new CarAppFocusManager.OnAppFocusOwnershipCallback() {
@Override
- public void onAppFocusOwnershipLost(CarAppFocusManager manager, int focus) {
+ public void onAppFocusOwnershipLost(int focus) {
Log.w(TAG, "onAppFocusOwnershipLost, focus: " + focus);
new AlertDialog.Builder(getContext())
.setTitle(getContext().getApplicationInfo().name)
@@ -160,7 +163,7 @@
}
@Override
- public void onAppFocusOwnershipGranted(CarAppFocusManager manager, int focus) {
+ public void onAppFocusOwnershipGranted(int focus) {
Log.w(TAG, "onAppFocusOwnershipGranted, focus: " + focus);
}
@@ -174,7 +177,7 @@
try {
boolean ownsFocus = mCarAppFocusManager.isOwningFocus(
- CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION, focusCallback);
+ focusCallback, CarAppFocusManager.APP_FOCUS_TYPE_NAVIGATION);
Log.d(TAG, "Owns APP_FOCUS_TYPE_NAVIGATION: " + ownsFocus);
if (!ownsFocus) {
throw new RuntimeException("Focus was not acquired.");
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java
index 5569848..7f9b4e1 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java
@@ -18,12 +18,13 @@
import android.annotation.Nullable;
import android.car.Car;
+import android.car.CarNotConnectedException;
import android.car.diagnostic.CarDiagnosticEvent;
import android.car.diagnostic.CarDiagnosticManager;
import android.car.diagnostic.CarDiagnosticManager.OnDiagnosticEventListener;
+import android.car.hardware.CarSensorManager;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.car.hardware.CarSensorManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -108,7 +109,7 @@
CarDiagnosticManager.FRAME_TYPE_FREEZE,
CarSensorManager.SENSOR_RATE_NORMAL);
}
- } catch (android.car.CarNotConnectedException|android.support.car.CarNotConnectedException e) {
+ } catch (CarNotConnectedException e) {
Log.e(TAG, "Car not connected or not supported", e);
}
}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/LocationListeners.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/LocationListeners.java
index 55247b0..b99f5da 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/LocationListeners.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/LocationListeners.java
@@ -102,7 +102,7 @@
@Override
public void onLocationChanged(Location location) {
String s = String.format("Location: lat=%10.6f, lon=%10.6f, altitude=%5.0f, "
- + "speed=%5.1, bearing=%3.0f, accuracy=%5.1$s",
+ + "speed=%5.1f, bearing=%3.0f, accuracy=%5.1f",
location.getLatitude(),
location.getLongitude(),
location.getAltitude(),
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java
index bf7af5d..7ab3a6a 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java
@@ -208,8 +208,7 @@
"\nBlock size: " + mStatFs.getBlockSizeLong() + " bytes" +
"\nfor a total free space of: " +
(mStatFs.getBlockSizeLong() * mStatFs.getAvailableBlocksLong() / MEGABYTE) + "MB");
- } catch (android.car.CarNotConnectedException|
- android.support.car.CarNotConnectedException e) {
+ } catch (CarNotConnectedException e) {
Log.e(TAG, "Car not connected or not supported", e);
}
}