| Index: chrome/android/java/res/layout/promo_dialog_layout.xml
|
| diff --git a/chrome/android/java/res/layout/promo_dialog_layout.xml b/chrome/android/java/res/layout/promo_dialog_layout.xml
|
| index a6aff72061c25c374eb534ceec5d2f57b4c47592..6081a8232c709b172cc37836d1a32c352c509e54 100644
|
| --- a/chrome/android/java/res/layout/promo_dialog_layout.xml
|
| +++ b/chrome/android/java/res/layout/promo_dialog_layout.xml
|
| @@ -25,11 +25,12 @@
|
| android:id="@+id/promo_container"
|
| android:layout_width="wrap_content"
|
| android:layout_height="0dp"
|
| - android:layout_weight="1" >
|
| + android:layout_weight="1"
|
| + android:fadeScrollbars="false" >
|
|
|
| <!-- This layout pivots when the dialog is wider than it is tall. -->
|
| <LinearLayout
|
| - android:id="@+id/promo_content"
|
| + android:id="@+id/full_promo_content"
|
| android:layout_width="wrap_content"
|
| android:layout_height="wrap_content"
|
| android:padding="@dimen/promo_dialog_padding"
|
| @@ -41,11 +42,14 @@
|
| android:layout_width="@dimen/promo_dialog_illustration_width"
|
| android:layout_height="wrap_content"
|
| android:layout_gravity="center"
|
| - android:layout_margin="@dimen/promo_dialog_illustration_margin"
|
| + android:layout_marginTop="@dimen/promo_dialog_illustration_margin"
|
| + android:layout_marginStart="@dimen/promo_dialog_illustration_margin"
|
| + android:layout_marginEnd="@dimen/promo_dialog_illustration_margin"
|
| android:scaleType="fitCenter"
|
| android:contentDescription="@null" />
|
|
|
| <org.chromium.chrome.browser.widget.BoundedLinearLayout
|
| + android:id="@+id/scrollable_promo_content"
|
| android:layout_width="wrap_content"
|
| android:layout_height="wrap_content"
|
| android:orientation="vertical"
|
| @@ -55,7 +59,8 @@
|
| android:id="@+id/header"
|
| android:layout_width="wrap_content"
|
| android:layout_height="wrap_content"
|
| - android:layout_marginBottom="14dp"
|
| + android:layout_marginTop="@dimen/dialog_header_margin"
|
| + android:layout_marginBottom="@dimen/dialog_header_margin"
|
| android:textColor="@color/default_text_color"
|
| android:textSize="@dimen/promo_dialog_title_text_size" />
|
|
|
| @@ -71,6 +76,14 @@
|
|
|
| </org.chromium.chrome.browser.widget.FadingEdgeScrollView>
|
|
|
| + <ViewStub
|
| + android:id="@+id/footer_stub"
|
| + android:layout="@layout/infobar_control_description"
|
| + android:inflatedId="@+id/footer"
|
| + android:layout_margin="@dimen/promo_dialog_padding"
|
| + android:layout_width="wrap_content"
|
| + android:layout_height="wrap_content" />
|
| +
|
| <org.chromium.chrome.browser.widget.DualControlLayout
|
| android:id="@+id/button_bar"
|
| android:layout_width="wrap_content"
|
|
|