Adds background fade in animation and exit label to touch calibrator view

chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H_
 
 #include "base/macros.h"
 #include "ui/display/display.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/view.h"
 
 namespace views {
+class Label;
 class Widget;
 }
 
+namespace gfx {
+class Animation;
+class LinearAnimation;
+}
+
 namespace chromeos {
 
 // An overlay view used during touch calibration. This view is responsible for
 // all animations and UX during touch calibration on all displays currently
 // active on the device. The view on the display being calibrated is the primary
 // touch calibration view.
 // |TouchCalibratorView| acts as a state machine and has an API to toggle its
 // state or get the current state.
 class TouchCalibratorView : public views::View, public gfx::AnimationDelegate {
  public:
@@ skipping 38 matching lines @@
 
   // Skips to the final state. Should be used to cancel calibration and hide all
   // views from the screen with a smooth transition out animation.
   void SkipToFinalState();
 
   // Returns true if |location| is set by the end of this function call. If set,
   // |location| will point to the center of the circle that the user sees during
   // the touch calibration UX.
   bool GetDisplayPointLocation(gfx::Point* location);
 
+  // Skips/Cancels any current ongoing animation to the end. This is used during
+  // testing.
+  void SkipCurrentAnimation();

[stevenjb, 2016/12/22 22:03:33]

If this is only used for testing, just name it SkipCurrentAnimationForTest().

[malaykeshav, 2016/12/23 00:09:06]

Done

+
   // Returns the current state of the view.
   State state() { return state_; }
 
  private:
+  void InitViewContents();
+
   // The target display on which this view is rendered on.
   const display::Display display_;
 
   // True if this view is on the display that is being calibrated.
   bool is_primary_view_ = false;
 
   std::unique_ptr<views::Widget> widget_;
 
+  SkPaint paint_;
+
+  // Defines the bounds for the background animation.
+  gfx::RectF background_rect_;
+
+  // Text label indicating how to exit the touch calibration.
+  views::Label* exit_label_;
+
+  // Start and end opacity values used during the fade animation. This is set
+  // before the animation begins.
+  float start_opacity_value_;
+  float end_opacity_value_;
+
+  // Linear animation used for various aniations including fade-in, fade out,
+  // and view translation.
+  std::unique_ptr<gfx::LinearAnimation> animator_;
+
   State state_ = UNKNOWN;
 
   DISALLOW_COPY_AND_ASSIGN(TouchCalibratorView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_DISPLAY_TOUCH_CALIBRATOR_TOUCH_CALIBRATOR_VIEW_H_