commit f07c154c39f45dc6242f0ec3c41a566054d4c7aa
author Xin Li <delphij@google.com> Fri Jun 18 12:24:38 2021 -0700
committer Xin Li <delphij@google.com> Fri Jun 18 12:24:38 2021 -0700
tree b119493fdce56cac570f7cee8fd2a63348728a8d
parent 33b67da51384597d58194201c9084d771e276a5d
parent 366eb82f620c61fecb0a8276e9057b384db71c5d

DO NOT MERGE - Merge RQ3A.210605.005

Bug: 190855093
Merged-In: I0876bc9fbf0c1ee4aa4d6321aab8f5a05124415e
Change-Id: I3221075f98bf2d19a5a81c9ab584399f79c86009

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e836991..0196935 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,7 @@
     package="com.android.car.hvac">
     <uses-sdk
         android:minSdkVersion="22"
-        android:targetSdkVersion="23"/>
+        android:targetSdkVersion="29"/>
 
     <uses-permission android:name="android.car.permission.CONTROL_CAR_CLIMATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

src/com/android/car/hvac/HvacUiService.java

diff --git a/src/com/android/car/hvac/HvacUiService.java b/src/com/android/car/hvac/HvacUiService.java
index 273375e..b4cd8be 100644
--- a/src/com/android/car/hvac/HvacUiService.java
+++ b/src/com/android/car/hvac/HvacUiService.java
@@ -139,6 +139,7 @@
         addViewToWindowManagerAndTrack(windowSizeTest, testparams);
         IntentFilter filter = new IntentFilter();
         filter.addAction(CAR_INTENT_ACTION_TOGGLE_HVAC_CONTROLS);
+        filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
         // Register receiver such that any user with climate control permission can call it.
         registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, filter,
                 Car.PERMISSION_CONTROL_CAR_CLIMATE, null);
@@ -233,8 +234,10 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            if(action.equals(CAR_INTENT_ACTION_TOGGLE_HVAC_CONTROLS)){
+            if (action.equals(CAR_INTENT_ACTION_TOGGLE_HVAC_CONTROLS)){
                 mHvacPanelController.toggleHvacUi();
+            } else if (action.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {
+                mHvacPanelController.collapseHvacUi();
             }
         }
     };

src/com/android/car/hvac/controllers/HvacPanelController.java

diff --git a/src/com/android/car/hvac/controllers/HvacPanelController.java b/src/com/android/car/hvac/controllers/HvacPanelController.java
index dbc4cac..2be664a 100644
--- a/src/com/android/car/hvac/controllers/HvacPanelController.java
+++ b/src/com/android/car/hvac/controllers/HvacPanelController.java
@@ -511,13 +511,19 @@
      };
 
     public void toggleHvacUi() {
-        if(mCurrentState != STATE_COLLAPSED) {
+        if (mCurrentState != STATE_COLLAPSED) {
             mCollapseHvac.onClick(null);
         } else {
             mExpandHvac.onClick(null);
         }
     }
 
+    public void collapseHvacUi() {
+        if (mCurrentState != STATE_COLLAPSED) {
+            mCollapseHvac.onClick(null);
+        }
+    }
+
     public View.OnClickListener mExpandHvac = new View.OnClickListener() {
         @Override
         public void onClick(View v) {