Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <org.chromium.chrome.browser.widget.PaddedFrameLayout | 6 <org.chromium.chrome.browser.widget.PaddedFrameLayout |
| 7 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
| 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" | 8 xmlns:chrome="http://schemas.android.com/apk/res-auto" |
| 9 android:background="#c000" | 9 android:background="#c000" |
| 10 chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width" | 10 chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width" |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 38 android:layout_width="wrap_content" | 38 android:layout_width="wrap_content" |
| 39 android:src="@drawable/product_logo_name" | 39 android:src="@drawable/product_logo_name" |
| 40 android:contentDescription="@null" /> | 40 android:contentDescription="@null" /> |
| 41 <LinearLayout | 41 <LinearLayout |
| 42 android:id="@+id/data_reduction_invitation_text" | 42 android:id="@+id/data_reduction_invitation_text" |
| 43 android:layout_below="@+id/google_icon" | 43 android:layout_below="@+id/google_icon" |
| 44 android:layout_height="wrap_content" | 44 android:layout_height="wrap_content" |
| 45 android:layout_marginTop="35dp" | 45 android:layout_marginTop="35dp" |
| 46 android:layout_width="match_parent" | 46 android:layout_width="match_parent" |
| 47 android:orientation="vertical" | 47 android:orientation="vertical" |
| 48 android:paddingStart="40dp" | 48 android:paddingStart="20dp" |
| 49 android:paddingEnd="40dp"> | 49 android:paddingEnd="20dp"> |
| 50 <TextView | 50 <TextView |
| 51 android:gravity="center" | 51 android:gravity="center" |
| 52 android:layout_height="wrap_content" | 52 android:layout_height="wrap_content" |
| 53 android:layout_width="match_parent" | 53 android:layout_width="match_parent" |
| 54 android:text="@string/data_reduction_title_1" | 54 android:text="@string/data_reduction_title_1" |
| 55 android:textColor="#000" | 55 android:textColor="#000" |
| 56 android:textSize="30sp" /> | 56 android:textSize="28sp" /> |
| 57 <org.chromium.ui.widget.TextViewWithClickableSpans | |
| 58 android:id="@+id/data_reduction_title_2_link" | |
| 59 android:gravity="center" | |
| 60 android:layout_height="wrap_content" | |
| 61 android:layout_marginTop="20dp" | |
| 62 android:layout_width="match_parent" | |
| 63 android:lineSpacingExtra="20dp" | |
|
newt (away)
2015/03/24 21:08:26
use sp instead of dp so this scales when the user
megjablon
2015/03/24 21:23:11
Done.
| |
| 64 android:lineSpacingMultiplier="0" | |
| 65 android:textColor="#333" | |
| 66 android:textSize="16sp" /> | |
| 57 <TextView | 67 <TextView |
| 58 android:gravity="center" | 68 android:gravity="center" |
| 59 android:layout_height="wrap_content" | 69 android:layout_height="wrap_content" |
| 60 android:layout_marginTop="20dp" | 70 android:layout_marginTop="20dp" |
| 61 android:layout_width="match_parent" | 71 android:layout_width="match_parent" |
| 62 android:lineSpacingExtra="20dp" | 72 android:lineSpacingExtra="20dp" |
| 63 android:lineSpacingMultiplier="0" | 73 android:lineSpacingMultiplier="0" |
| 64 android:paddingStart="20dp" | 74 android:text="@string/data_reduction_title_3" |
| 65 android:paddingEnd="20dp" | 75 android:textColor="#333" |
| 66 android:text="@string/data_reduction_title_2" | |
| 67 android:textColor="#969696" | |
| 68 android:textSize="16sp" /> | 76 android:textSize="16sp" /> |
| 69 <TextView | |
| 70 android:gravity="center" | |
| 71 android:layout_height="wrap_content" | |
| 72 android:layout_marginTop="20dp" | |
| 73 android:layout_width="match_parent" | |
| 74 android:lineSpacingExtra="25dp" | |
| 75 android:lineSpacingMultiplier="0" | |
| 76 android:text="@string/data_reduction_title_3" | |
| 77 android:textColor="#000" | |
| 78 android:textSize="20sp" /> | |
| 79 </LinearLayout> | 77 </LinearLayout> |
| 80 <ImageView | 78 <ImageView |
| 81 android:layout_alignParentBottom="true" | 79 android:layout_alignParentBottom="true" |
| 82 android:layout_height="198dp" | 80 android:layout_height="198dp" |
| 83 android:layout_width="@dimen/data_reduction_promo_screen_width" | 81 android:layout_width="@dimen/data_reduction_promo_screen_width" |
| 84 android:scaleType="matrix" | 82 android:scaleType="matrix" |
| 85 android:adjustViewBounds="true" | 83 android:adjustViewBounds="true" |
| 86 android:src="@drawable/graph_illustration" | 84 android:src="@drawable/graph_illustration" |
| 87 android:contentDescription="@null" /> | 85 android:contentDescription="@null" /> |
| 88 <LinearLayout | 86 <LinearLayout |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 109 android:layout_height="wrap_content" | 107 android:layout_height="wrap_content" |
| 110 android:layout_marginTop="10dp" | 108 android:layout_marginTop="10dp" |
| 111 android:minHeight="48dp" | 109 android:minHeight="48dp" |
| 112 android:text="@string/no_thanks" | 110 android:text="@string/no_thanks" |
| 113 android:textColor="#666" | 111 android:textColor="#666" |
| 114 chrome:buttonColor="@color/default_primary_color" /> | 112 chrome:buttonColor="@color/default_primary_color" /> |
| 115 </LinearLayout> | 113 </LinearLayout> |
| 116 </RelativeLayout> | 114 </RelativeLayout> |
| 117 </ScrollView> | 115 </ScrollView> |
| 118 </org.chromium.chrome.browser.widget.PaddedFrameLayout> | 116 </org.chromium.chrome.browser.widget.PaddedFrameLayout> |
| OLD | NEW |