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

Side by Side Diff: chrome/android/java/res/layout/fre_data_reduction_proxy.xml

Issue 1745563002: Revert of Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 years, 10 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
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 3
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <org.chromium.chrome.browser.firstrun.DataReductionProxyView 7 <org.chromium.chrome.browser.firstrun.DataReductionProxyView
8 xmlns:android="http://schemas.android.com/apk/res/android" 8 xmlns:android="http://schemas.android.com/apk/res/android"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" > 10 android:layout_height="match_parent" >
(...skipping 23 matching lines...) Expand all
34 34
35 <LinearLayout 35 <LinearLayout
36 android:id="@+id/fre_content" 36 android:id="@+id/fre_content"
37 android:layout_width="match_parent" 37 android:layout_width="match_parent"
38 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
39 android:layout_marginTop="@dimen/fre_margin" 39 android:layout_marginTop="@dimen/fre_margin"
40 android:gravity="center_horizontal" > 40 android:gravity="center_horizontal" >
41 41
42 <ImageView 42 <ImageView
43 android:layout_width="wrap_content" 43 android:layout_width="wrap_content"
44 android:layout_height="@dimen/fre_image_height" 44 android:layout_height="@dimen/fre_image_carousel_height"
45 android:layout_marginBottom="@dimen/fre_margin" 45 android:layout_marginBottom="@dimen/fre_margin"
46 android:contentDescription="@null" 46 android:contentDescription="@null"
47 android:src="@drawable/data_reduction_illustration" /> 47 android:src="@drawable/data_reduction_illustration" />
48 48
49 <LinearLayout 49 <LinearLayout
50 android:layout_width="match_parent" 50 android:layout_width="match_parent"
51 android:layout_height="wrap_content" 51 android:layout_height="wrap_content"
52 android:layout_marginBottom="@dimen/fre_margin" 52 android:layout_marginBottom="@dimen/fre_margin"
53 android:orientation="vertical" 53 android:orientation="vertical"
54 android:gravity="center_horizontal" 54 android:gravity="center_horizontal"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 android:layout_height="56dp" 91 android:layout_height="56dp"
92 android:layout_gravity="bottom" 92 android:layout_gravity="bottom"
93 android:background="?attr/listChoiceBackgroundIndicator" 93 android:background="?attr/listChoiceBackgroundIndicator"
94 android:padding="16dp" 94 android:padding="16dp"
95 android:text="@string/next" 95 android:text="@string/next"
96 android:textAllCaps="true" 96 android:textAllCaps="true"
97 android:textColor="@color/light_active_color" 97 android:textColor="@color/light_active_color"
98 android:textSize="@dimen/fre_button_text_size" /> 98 android:textSize="@dimen/fre_button_text_size" />
99 99
100 </org.chromium.chrome.browser.firstrun.DataReductionProxyView> 100 </org.chromium.chrome.browser.firstrun.DataReductionProxyView>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/fre_choose_account.xml ('k') | chrome/android/java/res/layout/fre_tosanduma.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698