[Android] Split personalized_signin_promo_view_impl.xml in two files

This CL splits the xml file used to implement the promo view in 2
different files: one contains the header of the promo (the image and the
dismiss button) and the other contains the description and the signin
buttons. This change is necessary in order to provide custom paddings
and margins for the header of the promo.

Bug: 737743
Change-Id: I76532407444ca62d808dddbd874642fb1aa788e5
Reviewed-on: https://chromium-review.googlesource.com/691659Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Iulia Harasim <iuliah@google.com>
Cr-Commit-Position: refs/heads/master@{#505406}

chrome/android/java/res/layout/personalized_signin_promo_view_impl.xml → chrome/android/java/res/layout/personalized_signin_promo_view_body.xml

@@ -7,33 +7,6 @@
        xmlns:tools="http://schemas.android.com/tools"
        tools:showIn="@layout/personalized_signin_promo_view_settings">
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:layout_marginEnd="12dp"
-        android:layout_marginStart="12dp">
-
-        <ImageView
-            android:id="@+id/signin_promo_image"
-            android:layout_width="@dimen/signin_promo_account_image_size"
-            android:layout_height="@dimen/signin_promo_account_image_size"
-            android:layout_gravity="center"
-            android:contentDescription="@null"
-            android:scaleType="fitCenter"/>
-
-        <ImageButton
-            android:id="@+id/signin_promo_close_button"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="top|end"
-            android:background="?attr/selectableItemBackground"
-            android:contentDescription="@string/close"
-            android:scaleType="fitCenter"
-            android:src="@drawable/btn_close"
-            android:visibility="gone"/>
-    </FrameLayout>
-
     <TextView
         android:id="@+id/signin_promo_description"
         android:layout_width="wrap_content"

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

@@ -15,6 +15,16 @@
     android:paddingBottom="12dp"
     android:paddingTop="14dp">
 
-    <include layout="@layout/personalized_signin_promo_view_impl"/>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp">
+
+        <include layout="@layout/personalized_signin_promo_view_header"/>
+    </FrameLayout>
+
+    <include layout="@layout/personalized_signin_promo_view_body"/>
 
 </org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
\ No newline at end of file

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

+<?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. -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools"
+       tools:showIn="@layout/personalized_signin_promo_view_settings">
+
+    <ImageView
+        android:id="@+id/signin_promo_image"
+        android:layout_width="@dimen/signin_promo_account_image_size"
+        android:layout_height="@dimen/signin_promo_account_image_size"
+        android:layout_gravity="center"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter"/>
+
+    <ImageButton
+        android:id="@+id/signin_promo_close_button"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="top|end"
+        android:background="?attr/selectableItemBackground"
+        android:contentDescription="@string/close"
+        android:scaleType="fitCenter"
+        android:src="@drawable/btn_close"
+        android:visibility="gone"/>
+</merge>
\ No newline at end of file

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

@@ -16,6 +16,16 @@
     android:paddingStart="16dp"
     android:paddingTop="12dp">
 
-    <include layout="@layout/personalized_signin_promo_view_impl"/>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp">
+
+        <include layout="@layout/personalized_signin_promo_view_header"/>
+    </FrameLayout>
+
+    <include layout="@layout/personalized_signin_promo_view_body"/>
 
 </org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
\ No newline at end of file

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

@@ -15,6 +15,16 @@
     android:paddingStart="16dp"
     android:paddingTop="12dp">
 
-    <include layout="@layout/personalized_signin_promo_view_impl"/>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp">
+
+        <include layout="@layout/personalized_signin_promo_view_header"/>
+    </FrameLayout>
+
+    <include layout="@layout/personalized_signin_promo_view_body"/>
 
 </org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>
\ No newline at end of file

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

@@ -16,6 +16,16 @@
     android:paddingStart="16dp"
     android:paddingTop="28dp">
 
-    <include layout="@layout/personalized_signin_promo_view_impl"/>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp">
+
+        <include layout="@layout/personalized_signin_promo_view_header"/>
+    </FrameLayout>
+
+    <include layout="@layout/personalized_signin_promo_view_body"/>
 
 </org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>

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

@@ -14,6 +14,16 @@
     android:paddingBottom="12dp"
     android:paddingTop="12dp">
 
-    <include layout="@layout/personalized_signin_promo_view_impl"/>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp">
+
+        <include layout="@layout/personalized_signin_promo_view_header"/>
+    </FrameLayout>
+
+    <include layout="@layout/personalized_signin_promo_view_body"/>
 
 </org.chromium.chrome.browser.signin.PersonalizedSigninPromoView>