Refactor Instrument Cluster API

- separate Car Service and Inst Cluster Renderer proccesses
- remove DemoInstrumentClusterRendering (we probably will make reference
  Renderer based on work we did for I/O)
- deprecate instrument cluster listeners in CarNavigationManager

Change-Id: Id24142b5811b22477177b2bbcb4cc0e463023b18
Bug:28719314

2 files changed, 5 insertions, 50 deletions

diff --git a/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/InstrumentClusterRendererFactory.java b/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/InstrumentClusterRendererFactory.java
deleted file mode 100644
index d73ede440e..0000000000
--- a/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/InstrumentClusterRendererFactory.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package android.car.cluster.loggingrenderer;
-
-import android.car.cluster.renderer.InstrumentClusterRenderer;
-
-/**
- * This factory class will be requested by android.car using reflection in order to get an instance
- * of {@link InstrumentClusterRenderer}.
- */
-@SuppressWarnings("unused")  /* Used by reflection. */
-public class InstrumentClusterRendererFactory {
-    public static InstrumentClusterRenderer createRenderer() {
-        return new LoggingInstrumentClusterRenderer();
-    }
-}
diff --git a/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/LoggingInstrumentClusterRenderer.java b/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/LoggingClusterRenderingService.java
index 18757924fe..b2ac999e7b 100644
--- a/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/LoggingInstrumentClusterRenderer.java
+++ b/car-cluster-logging-renderer/src/android/car/cluster/loggingrenderer/LoggingClusterRenderingService.java
@@ -15,37 +15,21 @@
  */
 package android.car.cluster.loggingrenderer;
 
-import android.car.cluster.renderer.InstrumentClusterRenderer;
+import android.car.cluster.renderer.InstrumentClusterRenderingService;
 import android.car.cluster.renderer.NavigationRenderer;
 import android.car.navigation.CarNavigationInstrumentCluster;
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.Log;
 
 /**
- * Dummy implementation of {@code InstrumentClusterRenderer} that just traces all interaction.
+ * Dummy implementation of {@link LoggingClusterRenderingService} to log all interaction.
  */
-public class LoggingInstrumentClusterRenderer extends InstrumentClusterRenderer {
+public class LoggingClusterRenderingService extends InstrumentClusterRenderingService {
 
-    private final static String TAG = LoggingInstrumentClusterRenderer.class.getSimpleName();
+    private static final String TAG = LoggingClusterRenderingService.class.getSimpleName();
 
     @Override
-    public void onCreate(Context context) {
-        Log.i(TAG, "onCreate, context: " + context);
-    }
-
-    @Override
-    public void onStart() {
-        Log.i(TAG, "onStart");
-    }
-
-    @Override
-    public void onStop() {
-        Log.i(TAG, "onStop");
-    }
-
-    @Override
-    protected NavigationRenderer createNavigationRenderer() {
+    protected NavigationRenderer getNavigationRenderer() {
         NavigationRenderer navigationRenderer = new NavigationRenderer() {
             @Override
             public CarNavigationInstrumentCluster getNavigationProperties() {