commit e79f41e274fa813c2a1028b7ef644bc9f94ca643
author Priyank Singh <priyanksingh@google.com> Mon Dec 07 14:16:44 2020 -0800
committer Priyank Singh <priyanksingh@google.com> Tue Dec 08 03:15:32 2020 +0000
tree 1544ad88b4bb0fe88d1ca316e38c9b460c8c92dd
parent 6fdc01eb7d127ef72fa624b23f17cc2573258b4e

Clear junk when closing and reopening the kb

Update widescreen kb contentview as soon as action is received. There is no guarantee that onAppPrivateCommand and onStartupInputView will be called in any order. The views should be updated when the value is received from app.

Fix: 174812208
Bug: 170343703
Test: Manual
Change-Id: I628a87d6394059fc613c8d40960ceddcca5667de

car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/imewidescreen/CarUiImeWideScreenController.java

diff --git a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/imewidescreen/CarUiImeWideScreenController.java b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/imewidescreen/CarUiImeWideScreenController.java
index bf7d2bf..bdead1a 100644
--- a/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/imewidescreen/CarUiImeWideScreenController.java
+++ b/car-ui-lib/car-ui-lib/src/main/java/com/android/car/ui/imewidescreen/CarUiImeWideScreenController.java
@@ -328,6 +328,11 @@
         if (mAllowAppToHideContentArea || (mInputEditorInfo != null && isPackageAuthorized(
                 mInputEditorInfo.packageName))) {
             mImeRendersAllContent = data.getBoolean(REQUEST_RENDER_CONTENT_AREA, true);
+            if (!mImeRendersAllContent) {
+                mContentAreaAutomotive.setVisibility(View.GONE);
+            } else {
+                mContentAreaAutomotive.setVisibility(View.VISIBLE);
+            }
         }
 
         if (data.getParcelable(CONTENT_AREA_SURFACE_PACKAGE) != null
@@ -499,11 +504,6 @@
         } else {
             mFullscreenArea.setVisibility(View.VISIBLE);
         }
-        if (!mImeRendersAllContent) {
-            mContentAreaAutomotive.setVisibility(View.GONE);
-        } else {
-            mContentAreaAutomotive.setVisibility(View.VISIBLE);
-        }
 
         // This view is rendered by the framework when IME is in full screen mode. For more info
         // see {@link #onEvaluateFullscreenMode}
@@ -565,8 +565,8 @@
      * it draw its own content.
      */
     private void sendSurfaceInfo() {
-        if (!mAllowAppToHideContentArea && !(mInputEditorInfo != null
-                && isPackageAuthorized(mInputEditorInfo.packageName))) {
+        if (!mAllowAppToHideContentArea && mContentAreaSurfaceView.getDisplay() == null && !(
+                mInputEditorInfo != null && isPackageAuthorized(mInputEditorInfo.packageName))) {
             return;
         }
         int displayId = mContentAreaSurfaceView.getDisplay().getDisplayId();
@@ -779,7 +779,7 @@
         mImeRendersAllContent = true;
         mIsExtractIconProvidedByApp = false;
         mExtractViewHidden = false;
-        mAutomotiveSearchItems = new ArrayList<>();
+        mAutomotiveSearchItems = null;
     }
 
     /**