chrome/android/java/src/org/chromium/chrome/browser/firstrun/ImageCarousel.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/ImageCarousel.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/DataReductionProxyView.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/TosAndUmaView.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/ImageCarousel.java

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

index 499bac28b4c96a459c76b4de479442ada3172857..c4d17b2562ffcf2f45a9671383b60c7334c0ceba 100644

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

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

@@ -258,7 +258,7 @@ public class ImageCarousel extends FrameLayout implements GestureDetector.OnGest

public void onFinishInflate() {

super.onFinishInflate();

- mImageWidth = getResources().getDimensionPixelSize(R.dimen.fre_image_carousel_height);

+ mImageWidth = getResources().getDimensionPixelSize(R.dimen.fre_image_height);

for (int i = 0; i < VIEW_COUNT; ++i) {

ImageView view = new ImageView(getContext());

FrameLayout.LayoutParams params =

@@ -269,7 +269,7 @@ public class ImageCarousel extends FrameLayout implements GestureDetector.OnGest

addView(view);

}

- mCarouselWidth = getResources().getDimensionPixelSize(R.dimen.fre_image_carousel_width);

+ mCarouselWidth = getResources().getDimensionPixelSize(R.dimen.signin_image_carousel_width);

mScrollScalingFactor = SCROLL_FACTOR * mCarouselWidth;

mFlingScalingFactor = FLING_FACTOR * mCarouselWidth;

mTranslationFactor = TRANSLATION_FACTOR * mImageWidth;

@@ -426,7 +426,7 @@ public class ImageCarousel extends FrameLayout implements GestureDetector.OnGest

}

private void setLayoutParamsForCheckmark(View view) {

- int size = getResources().getDimensionPixelSize(R.dimen.fre_checkmark_size);

+ int size = getResources().getDimensionPixelSize(R.dimen.signin_checkmark_size);

FrameLayout.LayoutParams params =

new FrameLayout.LayoutParams(size, size);

params.gravity = Gravity.CENTER;