New illustrations for the Data Reduction Proxy promo

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

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 d0fe45f7a86f06c1d53a087196f5e997a22f8dc7..bbe9785fd4e3b1d3f9e3cf806d620bd69ac5d361 100644
--- a/chrome/android/java/res/layout/data_reduction_promo_screen.xml
+++ b/chrome/android/java/res/layout/data_reduction_promo_screen.xml
@@ -35,18 +35,18 @@
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 android:layout_below="@+id/close_button"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="16dp"
                 android:orientation="vertical"
                 android:paddingEnd="24dp"
                 android:paddingStart="24dp" >
 
                 <ImageView
                     android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_marginBottom="24dp"
+                    android:layout_width="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="30dp"
                     android:adjustViewBounds="true"
                     android:contentDescription="@null"
-                    android:gravity="center"
                     android:src="@drawable/data_reduction_illustration" />
 
                 <TextView
@@ -73,27 +73,32 @@
                 android:layout_below="@id/data_reduction_promo_text"
                 android:padding="16dp"

[newt (away), 2015/09/03 23:11:23]

move the padding and clipToPadding attributes to the inner LinearLayout so that
the button shadows don't get clipped.

[megjablon, 2015/09/04 00:06:45]

Done.

                 android:clipToPadding="false"
-                android:gravity="end|bottom"
-                android:orientation="horizontal" >
-                <org.chromium.ui.widget.ButtonCompat
-                    android:id="@+id/no_thanks_button"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:minHeight="40dp"
-                    android:text="@string/no_thanks"
-                    android:textColor="@color/light_normal_color"
-                    android:textSize="@dimen/data_reduction_promo_button_text_size"
-                    chrome:buttonColor="#FFFFFF" />
-                <org.chromium.ui.widget.ButtonCompat
-                    android:id="@+id/enable_button"
+                android:gravity="end|bottom" >

[newt (away), 2015/09/03 23:11:23]

remove "end" since it has no effect.

[megjablon, 2015/09/04 00:06:45]

Done.

+                <LinearLayout

[newt (away), 2015/09/03 18:07:44]

Why the nested LinearLayout? You should be able to remove this.

[megjablon, 2015/09/03 18:47:53]

The first linear layout has to have layout_below so that if the content is
larger than the screen height, the buttons don't get pushed over the text. I
tried layout_above on the data_reduction_promo_text layout, but the buttons
still end up floating over the text. That combined with layout_alignParentBottom
causes the layout height to be from the bottom of the text to the bottom of the
RelativeLayout. If I don't have the extra LinearLayout the button height ends up
being this whole space. With the second linear layout, the buttons end up the
appropriate height. 

[newt (away), 2015/09/03 23:11:23]

Ah. Right. I played with this a bit. Seems like what you're doing is the best
option. Add a comment though, to ensure that someone doesn't helpfully delete
the extra parent layout in an attempt to improve this.

[megjablon, 2015/09/04 00:06:45]

Done.

                     android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:minHeight="40dp"
-                    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" />
+                    android:layout_width="match_parent"
+                    android:gravity="end|bottom"

[newt (away), 2015/09/03 23:11:23]

remove "bottom" since it has no effect

[megjablon, 2015/09/04 00:06:45]

Done.

+                    android:orientation="horizontal" >
+                    <org.chromium.ui.widget.ButtonCompat
+                        android:id="@+id/no_thanks_button"
+                        android:layout_height="match_parent"
+                        android:layout_width="wrap_content"
+                        android:layout_marginEnd="8dp"

[newt (away), 2015/09/03 23:43:46]

Also add layout_weight="1" to each of the buttons. This will allow the first
button to be shrunk in case it has overly long text. (Otherwise, if the first
button has long text, it'll take up the almost the entire width, and the second
button will be only a single character wide, and many many lines tall.)

[megjablon, 2015/09/04 00:06:45]

Done.

+                        android:minHeight="40dp"
+                        android:text="@string/no_thanks"
+                        android:textColor="@color/light_normal_color"
+                        android:textSize="@dimen/data_reduction_promo_button_text_size"
+                        chrome:buttonColor="#FFFFFF" />
+                    <org.chromium.ui.widget.ButtonCompat
+                        android:id="@+id/enable_button"
+                        android:layout_height="wrap_content"

[newt (away), 2015/09/03 18:07:44]

This should be match_parent too, in case the first button has longer text.

[megjablon, 2015/09/03 18:47:53]

Done.

+                        android:layout_width="wrap_content"
+                        android:minHeight="40dp"
+                        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>
             </LinearLayout>
         </RelativeLayout>
     </ScrollView>