Contacts Picker: Polish the UI.

Use Back arrow for both Normal and Search mode.
Add padding to the Close button to the right of the search window.

Bug: 988276, 860467
Change-Id: I4eb65d19d685d1b4f19d6b06576c44371c10eedf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1776032Reviewed-by: Theresa  <twellington@chromium.org>
Commit-Queue: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692005}

chrome/android/java/res/layout/contacts_picker_toolbar.xml

@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingStart="0dp"
-    android:paddingEnd="0dp">
+    android:paddingEnd="8dp">
 
     <LinearLayout
         android:layout_width="wrap_content"

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactsPickerToolbar.java

@@ -19,32 +19,45 @@ import java.util.List;
  * Handles toolbar functionality for the {@ContactsPickerDialog}.
  */
 public class ContactsPickerToolbar extends SelectableListToolbar<ContactDetails> {
+    // Our parent dialog.
+    ContactsPickerDialog mDialog;
+
     public ContactsPickerToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
+    /**
+     * Set the parent dialog for this toolbar.
+     */
+    public void setParentDialog(ContactsPickerDialog dialog) {
+        mDialog = dialog;
+    }
+
+    /**
+     * Shows the Back arrow navigation button in the upper left corner.
+     */
+    public void showBackArrow() {
+        setNavigationButton(NAVIGATION_BUTTON_BACK);
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        showCloseButton();
-
         TextView up = (TextView) mNumberRollView.findViewById(R.id.up);
         TextView down = (TextView) mNumberRollView.findViewById(R.id.down);
         ApiCompatibilityUtils.setTextAppearance(up, R.style.TextAppearance_BlackHeadline);
         ApiCompatibilityUtils.setTextAppearance(down, R.style.TextAppearance_BlackHeadline);
     }
 
-    /**
-     * Shows the Close or 'X' navigation button in the upper left corner.
-     */
-    public void showCloseButton() {
-        setNavigationIcon(R.drawable.btn_close);
-        setNavigationContentDescription(R.string.close);
-    }
-
     @Override
-    protected void setNavigationButton(int navigationButton) {}
+    public void onNavigationBack() {
+        if (isSearching()) {
+            super.onNavigationBack();
+        } else {
+            mDialog.cancel();
+        }
+    }
 
     @Override
     protected void showSelectionView(
@@ -58,5 +71,7 @@ public class ContactsPickerToolbar extends SelectableListToolbar<ContactDetails>
 
         Button done = (Button) findViewById(R.id.done);
         done.setEnabled(selectedItems.size() > 0);
+
+        showBackArrow();
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/PickerCategoryView.java

@@ -155,6 +155,7 @@ public class PickerCategoryView extends RelativeLayout
                 false);
         mToolbar.setNavigationOnClickListener(this);
         mToolbar.initializeSearchView(this, R.string.contacts_picker_search, 0);
+        mToolbar.showBackArrow();
 
         mSearchButton = (ImageView) mToolbar.findViewById(R.id.search);
         mSearchButton.setOnClickListener(this);
@@ -182,6 +183,8 @@ public class PickerCategoryView extends RelativeLayout
         mDialog = dialog;
         mListener = listener;
 
+        mToolbar.setParentDialog(mDialog);
+
         mDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
             @Override
             public void onCancel(DialogInterface dialog) {
@@ -210,7 +213,6 @@ public class PickerCategoryView extends RelativeLayout
     public void onEndSearch() {
         mPickerAdapter.setSearchString("");
         mPickerAdapter.setSearchMode(false);
-        mToolbar.showCloseButton();
         mToolbar.setNavigationOnClickListener(this);
         mDoneButton.setVisibility(VISIBLE);
         mSearchButton.setVisibility(VISIBLE);