diff options
| author | Gaurav Bhola <gauravbhola@google.com> | 2021-10-28 22:49:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-28 22:49:45 +0000 |
| commit | 8f71a556400e429e8a696946682807085f7b0d1d (patch) | |
| tree | 8052c33c0d07a9ed40d9fd0d6c6a96860df8f8bb | |
| parent | 48dae795a839dff709e47e4e5717146fa83bbbe3 (diff) | |
| parent | 7614827d56f161d7ab6c6ef28b0661bf2287d688 (diff) | |
| download | Cluster-8f71a556400e429e8a696946682807085f7b0d1d.tar.gz | |
Refactor register and unregister methods for cluster home callbacks. am: 7614827d56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/Cluster/+/16091132
Change-Id: I3439b8cfbd7fa301c3f88e36cb422a4b6e3e393e
| -rw-r--r-- | ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java index 4f89c88..3f0b924 100644 --- a/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java +++ b/ClusterHomeSample/src/com/android/car/cluster/home/ClusterHomeApplication.java @@ -19,7 +19,7 @@ package com.android.car.cluster.home; import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.car.CarOccupantZoneManager.DISPLAY_TYPE_INSTRUMENT_CLUSTER; -import static android.car.cluster.ClusterHomeManager.ClusterHomeCallback; +import static android.car.cluster.ClusterHomeManager.ClusterStateListener; import static android.car.cluster.ClusterHomeManager.UI_TYPE_CLUSTER_HOME; import static android.car.cluster.ClusterHomeManager.UI_TYPE_CLUSTER_NONE; import static android.car.user.CarUserManager.USER_LIFECYCLE_EVENT_TYPE_STARTING; @@ -114,14 +114,14 @@ public final class ClusterHomeApplication extends Application { } private void initClusterHome() { - mHomeManager.registerClusterHomeCallback(getMainExecutor(),mClusterHomeCalback); + mHomeManager.registerClusterStateListener(getMainExecutor(), mClusterHomeListener); mClusterState = mHomeManager.getClusterState(); if (!mClusterState.on) { mHomeManager.requestDisplay(UI_TYPE_HOME); } mUiAvailability = buildUiAvailability(); mHomeManager.reportState(mClusterState.uiType, UI_TYPE_CLUSTER_NONE, mUiAvailability); - mHomeManager.registerClusterHomeCallback(getMainExecutor(), mClusterHomeCalback); + mHomeManager.registerClusterStateListener(getMainExecutor(), mClusterHomeListener); mUserManager.addListener(getMainExecutor(), mUserLifecycleListener); @@ -143,7 +143,7 @@ public final class ClusterHomeApplication extends Application { public void onTerminate() { mCarInputManager.releaseInputEventCapture(DISPLAY_TYPE_INSTRUMENT_CLUSTER); mUserManager.removeListener(mUserLifecycleListener); - mHomeManager.unregisterClusterHomeCallback(mClusterHomeCalback); + mHomeManager.unregisterClusterStateListener(mClusterHomeListener); try { mAtm.unregisterTaskStackListener(mTaskStackListener); } catch (RemoteException e) { @@ -189,7 +189,7 @@ public final class ClusterHomeApplication extends Application { }; } - private final ClusterHomeCallback mClusterHomeCalback = new ClusterHomeCallback() { + private final ClusterStateListener mClusterHomeListener = new ClusterStateListener() { @Override public void onClusterStateChanged( ClusterState state, @ClusterHomeManager.Config int changes) { @@ -203,10 +203,6 @@ public final class ClusterHomeApplication extends Application { startClusterActivity(state.uiType); } } - @Override - public void onNavigationState(byte[] navigationState) { - // TODO(b/173454430): handle onNavigationState - } }; private final TaskStackListener mTaskStackListener = new TaskStackListener() { |