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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1562733003: Make the Data Saver Promo buttons always visible at the bottom of the promo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: whoops Created 4 years, 11 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/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java » ('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 ae338c2f11cfc835bb15e3dbff1d2bf43b9ab484..8370f8e644f0907072262898003f020b5cd10452 100644
--- a/chrome/android/java/res/layout/data_reduction_promo_screen.xml
+++ b/chrome/android/java/res/layout/data_reduction_promo_screen.xml
@@ -8,75 +8,74 @@
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:background="#c000" >
- <ScrollView
+ <RelativeLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="center"
- android:fillViewport="true">
+ android:background="#FFFF" >
- <RelativeLayout
+ <LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:background="#FFFF" >
+ android:layout_alignParentTop="true"
+ android:orientation="vertical" >
- <org.chromium.chrome.browser.widget.TintedImageButton
- android:id="@+id/close_button"
- android:layout_height="56dp"
- android:layout_width="56dp"
- android:layout_alignParentEnd="true"
- android:layout_alignParentTop="true"
- android:background="?android:attr/selectableItemBackground"
- android:contentDescription="@string/close"
- android:src="@drawable/btn_close" />
-
- <LinearLayout
- android:id="@+id/data_reduction_promo_content"
- android:layout_height="wrap_content"
+ <ScrollView
+ android:id="@+id/data_reduction_promo_scroll"
+ android:layout_height="0dp"
android:layout_width="match_parent"
- android:layout_below="@+id/close_button"
- android:layout_marginTop="8dp"
- android:paddingEnd="24dp"
- android:paddingStart="24dp" >
+ android:layout_weight="1"
+ android:fillViewport="true"
+ android:requiresFadingEdge="vertical"
+ android:fadingEdgeLength="20dp" >
- <ImageView
- android:id="@+id/data_reduction_illustration"
- android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:contentDescription="@null"
- android:src="@drawable/data_reduction_illustration" />
-
<LinearLayout
- android:id="@+id/text_wrapper"
+ android:id="@+id/data_reduction_promo_content"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"
- android:orientation="vertical" >
+ android:layout_width="match_parent"
+ android:paddingEnd="24dp"
+ android:paddingStart="24dp"
+ android:paddingTop="64dp" >
- <TextView
+ <ImageView
+ android:id="@+id/data_reduction_illustration"
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: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="30dp"
- android:lineSpacingMultiplier="1.3"
- android:text="@string/data_reduction_promo_summary"
- android:textColor="#646464"
- android:textSize="@dimen/data_reduction_promo_normal_text_size" />
+ android:layout_width="wrap_content"
+ android:orientation="vertical" >
+
+ <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>
+ </ScrollView>
<LinearLayout
+ android:id="@+id/data_reduction_promo_buttons"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_below="@id/data_reduction_promo_content"
- android:layout_gravity="bottom"
android:orientation="horizontal"
android:clipToPadding="false"
android:padding="16dp"
@@ -102,8 +101,19 @@
android:text="@string/data_reduction_enable_button"
android:textColor="#FFFFFF"
android:textSize="@dimen/data_reduction_promo_button_text_size"
- chrome:buttonColor="@color/light_active_color" />
- </LinearLayout>
- </RelativeLayout>
- </ScrollView>
+ chrome:buttonColor="@color/light_active_color" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <org.chromium.chrome.browser.widget.TintedImageButton
+ android:id="@+id/close_button"
+ android:layout_height="56dp"
+ android:layout_width="56dp"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentTop="true"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/close"
+ android:src="@drawable/btn_close" />
+
+ </RelativeLayout>
</org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView>
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698