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

Unified Diff: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h

Issue 2603463002: Adds background fade in animation and exit label to touch calibrator view (Closed)
Patch Set: Resolving comments Created 4 years 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
Index: chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h
diff --git a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h
index aeaf20fd86684433e81664e8d1928cca47619958..dec47afe4c74d06aca133b08a5aff69261a62ce9 100644
--- a/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h
+++ b/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.h
@@ -11,9 +11,15 @@
#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
@@ -72,10 +78,15 @@ class TouchCalibratorView : public views::View, public gfx::AnimationDelegate {
// the touch calibration UX.
bool GetDisplayPointLocation(gfx::Point* location);
+ // Skips/cancels any ongoing animation to its end.
+ void SkipCurrentAnimationForTest();
+
// 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_;
@@ -84,6 +95,23 @@ class TouchCalibratorView : public views::View, public gfx::AnimationDelegate {
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);

Powered by Google App Engine
This is Rietveld 408576698