Fixed some bugs in NUI search.

 - Nearby places promo now displays properly
 - Dialpad now properly handles dial intents
 - placing calls from search now closes search
 - placing calls from search now closes the keyboard
 - toolbar shadow is now visible when search is started
   from the dialpad.

Bug: 72525324
Test: MainActivityOldPeerSearchIntegrationTest
PiperOrigin-RevId: 186390952
Change-Id: I7e10ef0499c787da2d1820cae915f2d42645303b

1 files changed, 21 insertions, 13 deletions

diff --git a/java/com/android/dialer/main/impl/OldMainActivityPeer.java b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
index 7d9216c3f..69d8032f2 100644
--- a/java/com/android/dialer/main/impl/OldMainActivityPeer.java
+++ b/java/com/android/dialer/main/impl/OldMainActivityPeer.java
@@ -226,34 +226,34 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
       searchController.onRestoreInstanceState(savedInstanceState);
       bottomNav.selectTab(savedInstanceState.getInt(KEY_CURRENT_TAB));
     } else {
-      showTabOnIntent(mainActivity.getIntent());
+      onHandleIntent(mainActivity.getIntent());
     }
   }
 
   @Override
   public void onNewIntent(Intent intent) {
     LogUtil.enterBlock("OldMainActivityPeer.onNewIntent");
-    showTabOnIntent(intent);
+    onHandleIntent(intent);
   }
 
-  private void showTabOnIntent(Intent intent) {
+  private void onHandleIntent(Intent intent) {
+    // Two important implementation notes:
+    //  1) If the intent contains extra data to open to a specific screen (e.g. DIAL intent), when
+    //     the user leaves that screen, they will return here and add see a blank screen unless we
+    //     select a tab here.
+    //  2) Don't return early here in case the intent does contain extra data.
     if (isShowTabIntent(intent)) {
       bottomNav.selectTab(getTabFromIntent(intent));
-      return;
+    } else if (lastTabController.isEnabled) {
+      lastTabController.selectLastTab();
+    } else {
+      bottomNav.selectTab(TabIndex.SPEED_DIAL);
     }
 
     if (isDialIntent(intent)) {
-      searchController.showDialpadFromNewIntent(false);
       // Dialpad will grab the intent and populate the number
-      return;
-    }
-
-    if (lastTabController.isEnabled) {
-      lastTabController.selectLastTab();
-      return;
+      searchController.showDialpadFromNewIntent();
     }
-
-    bottomNav.selectTab(TabIndex.SPEED_DIAL);
   }
 
   /** Returns true if the given intent contains a phone number to populate the dialer with */
@@ -296,6 +296,11 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
   }
 
   @Override
+  public void onUserLeaveHint() {
+    searchController.onUserLeaveHint();
+  }
+
+  @Override
   public void onActivityStop() {
     lastTabController.onActivityStop();
     callLogFragmentListener.onActivityStop(
@@ -344,6 +349,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
 
   @Override
   public boolean onBackPressed() {
+    LogUtil.enterBlock("OldMainActivityPeer.onBackPressed");
     if (searchController.onBackPressed()) {
       return true;
     }
@@ -460,6 +466,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
     @Override
     public void onCallPlacedFromDialpad() {
       // TODO(calderwoodra): logging
+      searchController.onCallPlacedFromSearch();
     }
   }
 
@@ -480,6 +487,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
     @Override
     public void onCallPlacedFromSearch() {
       // TODO(calderwoodra): logging
+      searchController.onCallPlacedFromSearch();
     }
   }