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

Unified Diff: ui/views/animation/ink_drop_state.h

Issue 1298513003: Implemented prototype for new ink drop specs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Working prototype. Created 5 years, 4 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
Index: ui/views/animation/ink_drop_state.h
diff --git a/ui/views/animation/ink_drop_state.h b/ui/views/animation/ink_drop_state.h
index d88f022fbe0c60ce466e3fb676129e1ea51f54ee..4ab36df3354bee3cb33b9cce34d6633e4d751777 100644
--- a/ui/views/animation/ink_drop_state.h
+++ b/ui/views/animation/ink_drop_state.h
@@ -8,6 +8,9 @@
namespace views {
// The different states that the ink drop animation can be animated to.
+//
+// Note: The order of this matters for some constant look up arrays. (e.g.
+// kAnimationDurationsMs in ink_drop_animation.cc)
enum class InkDropState {
// The ink drop is not visible.
HIDDEN,
@@ -17,12 +20,20 @@ enum class InkDropState {
// The quick action for the view has been triggered. e.g. A tap gesture to
// click a button.
QUICK_ACTION,
- // The slow action for the view has been triggered. e.g. A long press to bring
- // up a menu.
+ // A view is being interacted with and the pending action will be a 'slow'
+ // action. e.g. A long press that is still active before releasing.
+ SLOW_ACTION_PENDING,
+ // The slow action for the view has been triggered. e.g. A long press release
+ // to bring up a menu.
SLOW_ACTION,
- // An active state for a view that is no longer being interacted with. e.g. A
- // pressed button that is showing a menu.
- ACTIVATED
+ // An active state for a view that is not currently being interacted with.
+ // e.g. A pressed button that is showing a menu.
+ ACTIVATED,
+ // A previously active state has been toggled to inactive. e.g. A drop down
+ // menu is closed.
+ DEACTIVATED,
+ // Number of ink drop states. NOT an actual ink drop state.
+ COUNT,
};
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698