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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/res/values-sw600dp/dimens.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.preferences.datareduction.DataReductionPromoView
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:maxChildHeight="@dimen/data_reduction_promo_screen_height"
11 chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width">
12 10
13 <ScrollView 11 <ScrollView
14 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
15 android:layout_width="match_parent" 13 android:layout_width="match_parent"
16 android:layout_gravity="center" 14 android:layout_gravity="center"
17 android:fillViewport="true"> 15 android:fillViewport="true">
18 16
19 <RelativeLayout 17 <RelativeLayout
20 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
21 android:layout_width="match_parent" 19 android:layout_width="match_parent"
22 android:background="#FFFF" > 20 android:background="#FFFF" >
23 21
24 <org.chromium.chrome.browser.widget.TintedImageButton 22 <org.chromium.chrome.browser.widget.TintedImageButton
25 android:id="@+id/close_button" 23 android:id="@+id/close_button"
26 android:layout_height="56dp" 24 android:layout_height="56dp"
27 android:layout_width="56dp" 25 android:layout_width="56dp"
28 android:layout_alignParentEnd="true" 26 android:layout_alignParentEnd="true"
29 android:layout_alignParentTop="true" 27 android:layout_alignParentTop="true"
30 android:background="?android:attr/selectableItemBackground" 28 android:background="?android:attr/selectableItemBackground"
31 android:contentDescription="@string/close" 29 android:contentDescription="@string/close"
32 android:src="@drawable/btn_close" /> 30 android:src="@drawable/btn_close" />
33 31
34 <LinearLayout 32 <LinearLayout
35 android:id="@+id/data_reduction_promo_text" 33 android:id="@+id/data_reduction_promo_content"
36 android:layout_height="wrap_content" 34 android:layout_height="wrap_content"
37 android:layout_width="match_parent" 35 android:layout_width="match_parent"
38 android:layout_below="@+id/close_button" 36 android:layout_below="@+id/close_button"
39 android:layout_marginBottom="30dp"
40 android:layout_marginTop="8dp" 37 android:layout_marginTop="8dp"
41 android:orientation="vertical"
42 android:paddingEnd="24dp" 38 android:paddingEnd="24dp"
43 android:paddingStart="24dp" > 39 android:paddingStart="24dp" >
44 40
45 <ImageView 41 <ImageView
42 android:id="@+id/data_reduction_illustration"
46 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
47 android:layout_width="wrap_content" 44 android:layout_width="wrap_content"
48 android:layout_gravity="center_horizontal" 45 android:layout_gravity="center"
49 android:layout_marginBottom="@dimen/data_reduction_promo_ill ustration_margin_bottom"
50 android:adjustViewBounds="true" 46 android:adjustViewBounds="true"
51 android:contentDescription="@null" 47 android:contentDescription="@null"
52 android:src="@drawable/data_reduction_illustration" /> 48 android:src="@drawable/data_reduction_illustration" />
49
50 <LinearLayout
51 android:id="@+id/text_wrapper"
52 android:layout_height="wrap_content"
53 android:layout_width="wrap_content"
54 android:orientation="vertical" >
53 55
54 <TextView 56 <TextView
55 android:layout_height="wrap_content" 57 android:layout_height="wrap_content"
56 android:layout_width="match_parent" 58 android:layout_width="match_parent"
57 android:layout_marginBottom="8dp" 59 android:layout_marginBottom="8dp"
58 android:text="@string/data_reduction_promo_title" 60 android:text="@string/data_reduction_promo_title"
59 android:textColor="@color/default_text_color" 61 android:textColor="@color/default_text_color"
60 android:textSize="@dimen/data_reduction_promo_title_text_siz e" /> 62 android:textSize="@dimen/data_reduction_promo_title_text _size" />
61 63
62 <TextView 64 <TextView
63 android:layout_height="wrap_content" 65 android:layout_height="wrap_content"
64 android:layout_width="match_parent" 66 android:layout_width="match_parent"
65 android:lineSpacingMultiplier="1.3" 67 android:layout_marginBottom="30dp"
66 android:text="@string/data_reduction_promo_summary" 68 android:lineSpacingMultiplier="1.3"
67 android:textColor="#646464" 69 android:text="@string/data_reduction_promo_summary"
68 android:textSize="@dimen/data_reduction_promo_normal_text_si ze" /> 70 android:textColor="#646464"
71 android:textSize="@dimen/data_reduction_promo_normal_tex t_size" />
72 </LinearLayout>
69 </LinearLayout> 73 </LinearLayout>
70 74
71 <LinearLayout 75 <LinearLayout
72 android:layout_height="wrap_content" 76 android:layout_height="wrap_content"
73 android:layout_width="match_parent" 77 android:layout_width="match_parent"
74 android:layout_below="@id/data_reduction_promo_text" 78 android:layout_below="@id/data_reduction_promo_content"
75 android:layout_gravity="bottom" 79 android:layout_gravity="bottom"
76 android:orientation="horizontal" 80 android:orientation="horizontal"
77 android:clipToPadding="false" 81 android:clipToPadding="false"
78 android:padding="16dp" 82 android:padding="16dp"
79 android:gravity="end" > 83 android:gravity="end" >
80 84
81 <Button 85 <Button
82 android:id="@+id/no_thanks_button" 86 android:id="@+id/no_thanks_button"
83 android:layout_height="match_parent" 87 android:layout_height="match_parent"
84 android:layout_width="wrap_content" 88 android:layout_width="wrap_content"
(...skipping 10 matching lines...) Expand all
95 android:layout_width="wrap_content" 99 android:layout_width="wrap_content"
96 android:elevation="0dp" 100 android:elevation="0dp"
97 android:minHeight="40dp" 101 android:minHeight="40dp"
98 android:text="@string/data_reduction_enable_button" 102 android:text="@string/data_reduction_enable_button"
99 android:textColor="#FFFFFF" 103 android:textColor="#FFFFFF"
100 android:textSize="@dimen/data_reduction_promo_button_text_si ze" 104 android:textSize="@dimen/data_reduction_promo_button_text_si ze"
101 chrome:buttonColor="@color/light_active_color" /> 105 chrome:buttonColor="@color/light_active_color" />
102 </LinearLayout> 106 </LinearLayout>
103 </RelativeLayout> 107 </RelativeLayout>
104 </ScrollView> 108 </ScrollView>
105 </org.chromium.chrome.browser.widget.PaddedFrameLayout> 109 </org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoView>
OLDNEW
« 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