Implement the new Photo picker, part two.

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

Index: chrome/android/java/res/layout/picker_bitmap_view.xml
diff --git a/chrome/android/java/res/layout/picker_bitmap_view.xml b/chrome/android/java/res/layout/picker_bitmap_view.xml
new file mode 100644
index 0000000000000000000000000000000000000000..69ef09e652a41c787c7513bbc0ddb2c01a3057e2
--- /dev/null
+++ b/chrome/android/java/res/layout/picker_bitmap_view.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2017 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
+<!-- Represents a single item in the Photo Picker. -->
+
+<view class="org.chromium.chrome.browser.photo_picker.PickerBitmapView"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:chrome="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:layout_gravity="center">

[Theresa, 2017/04/05 15:48:24]

I think that this RelativeLayout probably isn't necessary since none of the
relative layout specific things are used on the child views. Can you please try
moving the android:layout_gravity param to PickerBitmapView and removing this
RelativeLayout?

[Finnur, 2017/04/06 13:22:04]

Done. Moved layout_gravity to the two items that need it, instead of doing it in
code. Seemed simpler that way.

+
+        <FrameLayout
+            android:id="@+id/border"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/bitmap_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@null" />
+        </FrameLayout>
+
+        <!-- Special tiles, that give access to the camera and gallery  -->
+        <TextView
+            android:id="@+id/special_tile"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/file_picker_label_gap"
+            android:drawablePadding="10dp"
+            android:fontFamily="sans-serif-medium"
+            android:textStyle="bold"
+            android:textSize="14sp"
+            android:textAllCaps="true"
+            android:textColor="@color/file_picker_special_tile_color"
+            android:gravity="center" />
+
+    </RelativeLayout>
+</view>