Index: chrome/android/java/res/layout/data_reduction_promo_screen.xml |
diff --git a/chrome/android/java/res/layout/data_reduction_promo_screen.xml b/chrome/android/java/res/layout/data_reduction_promo_screen.xml |
index 47df076208f9b0806e96daa52a4b9a92b49f6853..36ae6ea9bcf91edf3354b4187082581d49ce9bae 100644 |
--- a/chrome/android/java/res/layout/data_reduction_promo_screen.xml |
+++ b/chrome/android/java/res/layout/data_reduction_promo_screen.xml |
@@ -3,12 +3,10 @@ |
Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. --> |
-<org.chromium.chrome.browser.widget.PaddedFrameLayout |
+<org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView |
xmlns:android="http://schemas.android.com/apk/res/android" |
xmlns:chrome="http://schemas.android.com/apk/res-auto" |
- android:background="#c000" |
- chrome:maxChildHeight="@dimen/data_reduction_promo_screen_height" |
- chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width"> |
+ android:background="#c000" > |
<ScrollView |
android:layout_height="match_parent" |
@@ -31,46 +29,52 @@ |
android:src="@drawable/btn_close" /> |
<LinearLayout |
- android:id="@+id/data_reduction_promo_text" |
+ android:id="@+id/data_reduction_promo_content" |
android:layout_height="wrap_content" |
android:layout_width="match_parent" |
android:layout_below="@+id/close_button" |
android:layout_marginTop="16dp" |
- android:orientation="vertical" |
android:paddingEnd="24dp" |
android:paddingStart="24dp" > |
<ImageView |
+ android:id="@+id/data_reduction_illustration" |
android:layout_height="wrap_content" |
android:layout_width="wrap_content" |
android:layout_gravity="center_horizontal" |
- android:layout_marginBottom="@dimen/data_reduction_promo_illustration_margin_bottom" |
android:adjustViewBounds="true" |
android:contentDescription="@null" |
android:src="@drawable/data_reduction_illustration" /> |
- |
- <TextView |
+ |
+ <LinearLayout |
+ android:id="@+id/text_wrapper" |
android:layout_height="wrap_content" |
- android:layout_width="match_parent" |
- android:layout_marginBottom="8dp" |
- android:text="@string/data_reduction_promo_title" |
- android:textColor="@color/default_text_color" |
- android:textSize="@dimen/data_reduction_promo_title_text_size" /> |
+ android:layout_width="wrap_content" |
+ android:orientation="vertical" > |
- <TextView |
- android:layout_height="wrap_content" |
- android:layout_width="match_parent" |
- android:lineSpacingMultiplier="1.3" |
- android:text="@string/data_reduction_promo_summary" |
- android:textColor="#646464" |
- android:textSize="@dimen/data_reduction_promo_normal_text_size" /> |
+ <TextView |
+ android:layout_height="wrap_content" |
+ android:layout_width="match_parent" |
+ android:layout_marginBottom="8dp" |
+ android:text="@string/data_reduction_promo_title" |
+ android:textColor="@color/default_text_color" |
+ android:textSize="@dimen/data_reduction_promo_title_text_size" /> |
+ |
+ <TextView |
+ android:layout_height="wrap_content" |
+ android:layout_width="match_parent" |
+ android:lineSpacingMultiplier="1.3" |
+ android:text="@string/data_reduction_promo_summary" |
+ android:textColor="#646464" |
+ android:textSize="@dimen/data_reduction_promo_normal_text_size" /> |
+ </LinearLayout> |
</LinearLayout> |
<FrameLayout |
android:layout_height="wrap_content" |
android:layout_width="match_parent" |
android:layout_alignParentBottom="true" |
- android:layout_below="@id/data_reduction_promo_text" > |
+ android:layout_below="@id/data_reduction_promo_content" > |
<!-- The FrameLayout must have layout_below so that the buttons don't |
overlap the text. This causes the FrameLayout to extend from |
@@ -113,4 +117,4 @@ |
</FrameLayout> |
</RelativeLayout> |
</ScrollView> |
-</org.chromium.chrome.browser.widget.PaddedFrameLayout> |
+</org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView> |