Adjust the incognito interstitial view.

This CL does the following changes:

a) Aligns the buttons more towards the right with 24dp spacing in the
end as per the UX mocks.

b) Adds a 20dp bottom spacing under the buttons as per the UX mocks.

Screenshot: crbug.com/1129357#c2
Bug: 1129357, 1116419
Change-Id: I391be1ff726e6645a58252d31f0b97c49afe2202
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2420610Reviewed-by: Alice Wang <aliceywang@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810174}

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

@@ -7,31 +7,29 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
+    android:paddingBottom="20dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
     android:orientation="vertical">
 
     <TextView
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginBottom="16dp"
         android:gravity="center_vertical"
         android:textAppearance="@style/TextAppearance.TextMedium.Secondary"
-        android:text="@string/incognito_interstitial_message"/>
+        android:text="@string/incognito_interstitial_message" />
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="end"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/incognito_interstitial_learn_more"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="112dp"
-            android:layout_marginEnd="24dp"
-            android:layout_gravity="center_vertical"
             android:text="@string/learn_more"
             android:textAppearance="@style/TextAppearance.TextMediumThick.Blue" />
 
@@ -40,8 +38,8 @@
             style="@style/FilledButton.Flat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="24dp"
-            android:text="@string/continue_button"/>
+            android:layout_marginStart="24dp"
+            android:text="@string/continue_button" />
 
     </LinearLayout>
 

chrome/android/javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetRenderTest.java

@@ -277,6 +277,20 @@ public class AccountPickerBottomSheetRenderTest {
                 mCoordinator.getBottomSheetViewForTesting(), "collapsed_sheet_with_account");
     }
 
+    @Test
+    @MediumTest
+    @Feature("RenderTest")
+    @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
+    public void testIncognitoInterstitialView(boolean nightModeEnabled) throws IOException {
+        mAccountManagerTestRule.addAccount(PROFILE_DATA1);
+        mAccountManagerTestRule.addAccount(PROFILE_DATA2);
+        buildAndShowCollapsedBottomSheet();
+        expandBottomSheet();
+        openIncognitoInterstitialOnExpandedSheet();
+        mRenderTestRule.render(
+                mCoordinator.getBottomSheetViewForTesting(), "signin_incognito_interstitial_view");
+    }
+
     private void openIncognitoInterstitialOnExpandedSheet() {
         // RecyclerView: PROFILE_DATA1, PROFILE_DATA2, |Add account to device|, |Sign in
         // temporarily|