Unify and Improve the Sign-In and Sync Confirmation Screens on Clank.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.firstrun;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ skipping 202 matching lines @@
             default:
                 // Enable scrolling only if no account has already been selected.
                 mScrollingDisabled = mAccountSelected;
                 mImages = Arrays.copyOf(images, images.length);
                 break;
         }
 
         updateImageViews();
     }
 
+    ImageView mCheckmark;
     /**
-     * Sets the ImageCarousel to signed in mode that disables scrolling, animates away the
-     * background images, and displays a checkmark next to the account image that was chosen.
+     * Sets whether the ImageCarousel is in signed in mode. This mode disables scrolling, animates
+     * away the background images, and displays a checkmark next to the chosen account image.
+     * @param isSignedIn Whether the ImageCarousel should in signed in mode or not.
      */
-    public void setSignedInMode() {
-        mScrollingDisabled = true;
-        mAccountSelected = true;
+    public void setSignedInMode(boolean isSignedIn) {
+        mScrollingDisabled = isSignedIn;
+        mAccountSelected = isSignedIn;
         setPosition(getCenterPosition());
 
-        ImageView checkmark = new ImageView(getContext());
-        checkmark.setImageResource(R.drawable.verify_checkmark);
-        setLayoutParamsForCheckmark(checkmark);
-        addView(checkmark);
+        if (mCheckmark == null) {
+            // If the checkmark hasn't been created and we don't want to show it, exit early.
+            if (!isSignedIn) {
+                return;
+            }
+
+            mCheckmark = new ImageView(getContext());
+            mCheckmark.setImageResource(R.drawable.verify_checkmark);
+            setLayoutParamsForCheckmark(mCheckmark);
+            addView(mCheckmark);
+        }
 
         if (mFadeInOutAnimator != null) mFadeInOutAnimator.cancel();
         AnimatorSet animatorSet = new AnimatorSet();
-        animatorSet.playTogether(
-                ObjectAnimator.ofFloat(this, BACKGROUND_IMAGE_ALPHA, 0),
-                ObjectAnimator.ofFloat(checkmark, View.ALPHA, 0.0f, 1.0f));
+        if (isSignedIn) {
+            animatorSet.playTogether(ObjectAnimator.ofFloat(this, BACKGROUND_IMAGE_ALPHA, 0),
+                    ObjectAnimator.ofFloat(mCheckmark, View.ALPHA, 0.0f, 1.0f));
+        } else {
+            animatorSet.playTogether(ObjectAnimator.ofFloat(this, BACKGROUND_IMAGE_ALPHA, 1),
+                    ObjectAnimator.ofFloat(mCheckmark, View.ALPHA, 1.0f, 0.0f));
+        }
         mFadeInOutAnimator = animatorSet;
         mFadeInOutAnimator.setDuration(ACCOUNT_SIGNED_IN_ANIMATION_DURATION_MS);
         mFadeInOutAnimator.start();
     }
 
     @Override
     public void onFinishInflate() {
         super.onFinishInflate();
 
         mImageWidth = getResources().getDimensionPixelSize(R.dimen.fre_image_carousel_height);
@@ skipping 166 matching lines @@
     private void setLayoutParamsForCheckmark(View view) {
         int size = getResources().getDimensionPixelSize(R.dimen.fre_checkmark_size);
         FrameLayout.LayoutParams params =
                 new FrameLayout.LayoutParams(size, size);
         params.gravity = Gravity.CENTER;
         view.setLayoutParams(params);
         view.setTranslationX((mImageWidth - size) / 2f);
         view.setTranslationY((mImageWidth - size) / 2f);
     }
 }