From 70a4b0929d8223ef0dc55b0f1b3790a892bb9043 Mon Sep 17 00:00:00 2001
From: calderwoodra <calderwoodra@google.com>
Date: Wed, 17 Jan 2018 13:17:27 -0800
Subject: Updated toolbar and dialpad interactions in NUI.

Toolbar, Dialpad, Bottom Nav, FAB and Search now all show
and hide properly according to the state of the application.

Follow up CLs will include:
 - saving/restoring state
 - sending query to search fragment to display results

Bug: 181512198
Test: MainActivityIntegrationTest
PiperOrigin-RevId: 182259200
Change-Id: I1309d8df2a5425bf051e52a459a1f78e1157fe08
---
 java/com/android/dialer/main/impl/toolbar/SearchBarView.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'java/com/android/dialer/main/impl/toolbar/SearchBarView.java')

diff --git a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
index 35c3cee16..306a5bb4e 100644
--- a/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
+++ b/java/com/android/dialer/main/impl/toolbar/SearchBarView.java
@@ -66,7 +66,7 @@ final class SearchBarView extends FrameLayout {
     searchBoxCollapsed = findViewById(R.id.search_box_collapsed);
     searchBoxExpanded = findViewById(R.id.search_box_expanded);
 
-    setOnClickListener(v -> expand(true, Optional.absent()));
+    setOnClickListener(v -> listener.onSearchBarClicked());
     findViewById(R.id.voice_search_button).setOnClickListener(v -> voiceSearchClicked());
     findViewById(R.id.search_back_button).setOnClickListener(v -> onSearchBackButtonClicked());
     clearButton.setOnClickListener(v -> onSearchClearButtonClicked());
@@ -92,7 +92,7 @@ final class SearchBarView extends FrameLayout {
   }
 
   /** Expand the search bar and populate it with text if any exists. */
-  private void expand(boolean animate, Optional<String> text) {
+  /* package-private */ void expand(boolean animate, Optional<String> text) {
     if (isExpanded) {
       return;
     }
@@ -126,7 +126,7 @@ final class SearchBarView extends FrameLayout {
   }
 
   /** Collapse the search bar and clear it's text. */
-  private void collapse(boolean animate) {
+  /* package-private */ void collapse(boolean animate) {
     if (!isExpanded) {
       return;
     }
@@ -173,7 +173,7 @@ final class SearchBarView extends FrameLayout {
     requestLayout();
   }
 
-  public void setSearchBarListener(SearchBarListener listener) {
+  /* package-private */ void setSearchBarListener(SearchBarListener listener) {
     this.listener = listener;
   }
 
-- 
cgit v1.2.3