Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Unified Diff: chrome/android/java/res/layout/data_reduction_promo_screen.xml

Issue 1343433002: Add landscape specs for Data Reduction Proxy promo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and add dynamic maxHeight Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/res/values-sw600dp/dimens.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f93ce5b7a4d2926831d6cfc066f7ed342497e53c..ae338c2f11cfc835bb15e3dbff1d2bf43b9ab484 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="wrap_content"
@@ -32,46 +30,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_marginBottom="30dp"
android:layout_marginTop="8dp"
- 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:layout_gravity="center"
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:layout_marginBottom="30dp"
+ 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>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_below="@id/data_reduction_promo_text"
+ android:layout_below="@id/data_reduction_promo_content"
android:layout_gravity="bottom"
android:orientation="horizontal"
android:clipToPadding="false"
@@ -102,4 +106,4 @@
</LinearLayout>
</RelativeLayout>
</ScrollView>
-</org.chromium.chrome.browser.widget.PaddedFrameLayout>
+</org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView>
« no previous file with comments | « no previous file | chrome/android/java/res/values-sw600dp/dimens.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698