[Unity][Android] Update margins in sign-in and consent bump screens

This CL updates the layout of the streamlined sign-in screen and the
consent bump screen to accommodate last changes to mocks.

Bug: 814728
Change-Id: If8f2cdaf39ba175ca60584f9015a4b2ccaf23217
Reviewed-on: https://chromium-review.googlesource.com/1171226Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582388}

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

@@ -39,7 +39,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/signin_margin_start"
-                android:layout_marginTop="26dp"
+                android:layout_marginTop="15dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:text="@string/consent_bump_title"
                 android:textAppearance="@style/BlackHeadline1"/>

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

@@ -9,6 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+
     <org.chromium.chrome.browser.signin.SigninScrollView
         android:id="@+id/signin_scroll_view"
         android:layout_width="match_parent"
@@ -17,10 +18,11 @@
         android:fadingEdgeLength="48dp"
         android:requiresFadingEdge="vertical"
         android:scrollbars="none">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
-            <!-- TODO(https://crbug.com/814728): Add asset for this image when UI is confirmed. -->
+
             <ImageView
                 android:id="@+id/signin_header_image"
                 android:layout_width="match_parent"
@@ -37,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/signin_header_image"
                 android:layout_marginStart="@dimen/signin_margin_start"
-                android:layout_marginTop="26dp"
+                android:layout_marginTop="15dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:textAppearance="@style/BlackHeadline1"
                 tools:text="@string/signin_title"/>
@@ -47,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/signin_title"
                 android:layout_marginStart="@dimen/signin_margin_start"
-                android:layout_marginTop="26dp"
+                android:layout_marginTop="16dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:background="@drawable/account_picker_background"
                 android:orientation="horizontal"
@@ -114,7 +116,7 @@
                 android:layout_below="@id/signin_account_picker"
                 android:layout_alignParentEnd="true"
                 android:layout_marginStart="@dimen/signin_drawable_padding"
-                android:layout_marginTop="@dimen/signin_description_blocks_margin"
+                android:layout_marginTop="20dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:layout_toEndOf="@id/signin_sync_icon"
                 android:textAppearance="@style/BlackBody"
@@ -137,7 +139,7 @@
                 android:layout_below="@id/signin_sync_description"
                 android:layout_alignParentEnd="true"
                 android:layout_marginStart="@dimen/signin_drawable_padding"
-                android:layout_marginTop="@dimen/signin_description_blocks_margin"
+                android:layout_marginTop="24dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:layout_toEndOf="@id/signin_sync_icon"
                 android:textAppearance="@style/BlackBody"
@@ -159,7 +161,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/signin_personalization_description"
                 android:layout_marginStart="@dimen/signin_drawable_padding"
-                android:layout_marginTop="@dimen/signin_description_blocks_margin"
+                android:layout_marginTop="24dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:layout_toEndOf="@id/signin_google_services_icon"
                 android:textAppearance="@style/BlackBody"
@@ -169,9 +171,8 @@
                 style="@style/Divider"
                 android:layout_below="@id/signin_google_services_description"
                 android:layout_marginStart="@dimen/signin_divider_margin_start"
-                android:layout_marginTop="32dp"
-                android:layout_marginEnd="@dimen/signin_margin_end"
-                android:layout_marginBottom="22dp"/>
+                android:layout_marginTop="20dp"
+                android:layout_marginEnd="@dimen/signin_margin_end"/>
             <ImageView
                 android:id="@+id/signin_details_icon"
                 android:layout_width="16dp"
@@ -188,7 +189,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/signin_divider"
                 android:layout_marginStart="@dimen/signin_drawable_padding"
-                android:layout_marginTop="@dimen/signin_description_blocks_margin"
+                android:layout_marginTop="20dp"
                 android:layout_marginEnd="@dimen/signin_margin_end"
                 android:layout_toEndOf="@id/signin_details_icon"
                 android:textAppearance="@style/BlackBody"

chrome/android/java/res/values/dimens.xml

@@ -194,7 +194,6 @@
     <dimen name="signin_margin_end">16dp</dimen>
     <dimen name="signin_divider_margin_start">48dp</dimen>
     <dimen name="signin_drawable_padding">16dp</dimen>
-    <dimen name="signin_description_blocks_margin">16dp</dimen>
 
     <!-- Signin promo dimensions -->
     <dimen name="signin_promo_account_image_size">48dp</dimen>