Photo Picker dialog: Make toolbar behave more like mocks.

chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java
index afdac9057fd7d53dd6f719d3639553185066ceac..f3540732e58736d6804854397d8c32e7fe111b35 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/photo_picker/PhotoPickerToolbar.java
@@ -5,17 +5,57 @@
 package org.chromium.chrome.browser.photo_picker;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.widget.selection.SelectableListToolbar;
 
+import java.util.List;
+
 /**
  * Handles toolbar functionality for the Photo Picker class.
  */
 public class PhotoPickerToolbar extends SelectableListToolbar<PickerBitmap> {
     public PhotoPickerToolbar(Context context, AttributeSet attrs) {
         super(context, attrs);
-        inflateMenu(R.menu.photo_picker_menu);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        setNavigationButton(NAVIGATION_BUTTON_CLOSE);
+    }
+
+    public void setBackButtonClickListener(View.OnClickListener listener) {
+        setNavigationOnClickListener(listener);

[Theresa, 2017/05/15 16:17:04]

Since setNavigationOnClickListener is a public method, I think it's a bit
simpler to call that directly from PickerCategoryView.

[Finnur, 2017/05/16 11:40:20]

Ah, right. Done.

+    }
+
+    @Override
+    protected void setNavigationButton(int navigationButton) {
+        setNavigationIcon(R.drawable.btn_close);
+        setNavigationContentDescription(R.string.close);
+        updateDisplayStyleIfNecessary();

[Theresa, 2017/05/15 16:17:04]

Instead of setting these each time, can they be set once in onFinishInflate()?
Then this method would intentionally do nothing.

[Finnur, 2017/05/16 11:40:20]

Done.

+    }
+
+    @Override
+    protected void showSelectionView(
+            List<PickerBitmap> selectedItems, boolean wasSelectionEnabled) {
+        switchToNumberRollView(selectedItems, wasSelectionEnabled);
+        TextView up = (TextView) mNumberRollView.findViewById(R.id.up);
+        TextView down = (TextView) mNumberRollView.findViewById(R.id.down);
+        up.setTextColor(Color.BLACK);
+        down.setTextColor(Color.BLACK);

[Theresa, 2017/05/15 16:17:04]

Can the text color be set once in onFinishInflate()? I don't believe that
SelectableListToolbar ever programatically changes the number roll text color.

[Finnur, 2017/05/16 11:40:20]

Sure! Done.

+    }
+
+    @Override
+    public void onSelectionStateChange(List<PickerBitmap> selectedItems) {
+        super.onSelectionStateChange(selectedItems);
+
+        Button done = (Button) findViewById(R.id.done);
+        done.setEnabled(selectedItems.size() > 0);
     }
 }