[Payments] Add UI elements to secure branding for payments

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

Index: chrome/android/java/res/layout/payment_request.xml
diff --git a/chrome/android/java/res/layout/payment_request.xml b/chrome/android/java/res/layout/payment_request.xml
index 5860eb923ae5f5c6579d07b2158ca491a1b6b685..bce696bf3922fb3e5f5f3e566405e40c47c44d3f 100644
--- a/chrome/android/java/res/layout/payment_request.xml
+++ b/chrome/android/java/res/layout/payment_request.xml
@@ -32,12 +32,47 @@
 
     </org.chromium.chrome.browser.payments.ui.FadingEdgeScrollView>
 
-    <org.chromium.chrome.browser.widget.DualControlLayout
-        android:id="@+id/button_bar"
+    <LinearLayout

[gone, 2017/02/16 19:18:56]

Doing this means that the buttons will never stack on top of each other on small
screens.  Is that really intended?  Your screenshot doesn't show anything except
English; can you provide one in Greek?

[gogerald1, 2017/02/17 00:44:45]

Yes, to avoid another level of viewgroup. We have done this for "Sign in" and
"cancel" buttons in the sign in page without seeing problem
(https://cs.chromium.org/chromium/src/chrome/android/java/res/layout/account_s...).
These two simple buttons must be able to fit in a single row for all devices.
Tested on smallest emulated device. Refer the comments in the bug for details  

+        android:id="@+id/bottom_bar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:padding="@dimen/payments_section_large_spacing"
         android:background="@android:color/white"
-        android:visibility="gone" />
+        android:visibility="gone" >
+
+        <ImageView
+            android:layout_width="72dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:src="@drawable/product_logo_name"
+            android:contentDescription="@null" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:visibility="invisible"/>

[gone, 2017/02/16 19:18:56]

1) Might as well just keep this visible.  It doesn't draw anything either way.

2) Insert a space before />, to match the rest of the file.

[gogerald1, 2017/02/17 00:44:45]

Done.

+
+        <Button
+            android:id="@+id/edit_button"
+            style="@style/ButtonCompatBorderless"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:text="@string/payments_edit_button"
+            android:textAllCaps="true"
+            android:textColor="@color/light_active_color"
+            android:textSize="14sp" />
+
+        <org.chromium.ui.widget.ButtonCompat
+            android:id="@+id/pay_button"
+            android:layout_width="wrap_content"
+            android:layout_height="36dp"
+            android:text="@string/payments_pay_button"
+            android:textAllCaps="true"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            chrome:buttonColor="@color/light_active_color"
+            chrome:buttonRaised="false"/>
+    </LinearLayout>
 
 </org.chromium.chrome.browser.widget.BoundedLinearLayout>