chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java - Issue 1698043006: Created the dialog offering the user to merge their account data or keep it

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java

Issue 1698043006: 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 side-by-side diff with in-line comments

Download patch

« chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunFragment.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/firstrun/ImageCarousel.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsPromoView.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/signin/AccountSigninActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java

index 3c8ec646ae56b446f0187c1d5c414178575bd09b..8a92be540ed10bda9573b2cf9e9b71e601f428cb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.java

@@ -31,7 +31,7 @@ public class TosAndUmaView extends FrameLayout {

LinearLayout wrapper = (LinearLayout) findViewById(R.id.text_wrapper);

MarginLayoutParams params = (MarginLayoutParams) wrapper.getLayoutParams();

int paddingStart = 0;

- if (width >= 2 * getResources().getDimension(R.dimen.fre_image_carousel_width)

+ if (width >= 2 * getResources().getDimension(R.dimen.signin_image_carousel_width)

&& width > height) {

content.setOrientation(LinearLayout.HORIZONTAL);

paddingStart = getResources().getDimensionPixelSize(R.dimen.fre_margin);