| Index: ui/chromeos/touch_exploration_controller.h
|
| diff --git a/ui/chromeos/touch_exploration_controller.h b/ui/chromeos/touch_exploration_controller.h
|
| index 59ff11444f54a4cf7bbd0b1a057e8de65ebfe23e..abb31f65dd5ccd5d44b6894a1ff4eec080440f27 100644
|
| --- a/ui/chromeos/touch_exploration_controller.h
|
| +++ b/ui/chromeos/touch_exploration_controller.h
|
| @@ -40,6 +40,9 @@ class TouchExplorationControllerDelegate {
|
| // Takes an int from 0.0 to 100.0 that indicates the percent the volume
|
| // should be set to.
|
| virtual void SetOutputLevel(int volume) = 0;
|
| +
|
| + // Silences spoken feedback.
|
| + virtual void SilenceSpokenFeedback() = 0;
|
| };
|
|
|
| // TouchExplorationController is used in tandem with "Spoken Feedback" to
|
| @@ -60,9 +63,10 @@ class TouchExplorationControllerDelegate {
|
| // down with two fingers, the running app will see a one-finger swipe. Slide
|
| // gestures performed on the edge of the screen can change settings
|
| // continuously. For example, sliding a finger along the right side of the
|
| -// screen will change the volume.
|
| -// When a user double taps and holds with one finger, the finger is passed
|
| -// through as if accessibility was turned off.
|
| +// screen will change the volume. When a user double taps and holds with one
|
| +// finger, the finger is passed through as if accessibility was turned off. If
|
| +// the user taps the screen with two fingers, the user can silence spoken
|
| +// feedback if it is playing.
|
| //
|
| // ** Long version **
|
| //
|
| @@ -134,6 +138,9 @@ class TouchExplorationControllerDelegate {
|
| // automatically sets the volume to 100% and the bottome right corner of the
|
| // screen automatically sets the volume to 0% once the user has moved past slop.
|
| //
|
| +// If the user taps the screen with two fingers and lifts both fingers before
|
| +// the grace period has passed, spoken feedback is silenced.
|
| +//
|
| // Once touch exploration mode has been activated,
|
| // it remains in that mode until all fingers have been released.
|
| //
|
| @@ -183,6 +190,8 @@ class UI_CHROMEOS_EXPORT TouchExplorationController
|
| const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
|
| ui::EventRewriteStatus InSlideGesture(
|
| const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
|
| + ui::EventRewriteStatus InTwoFingerTap(
|
| + const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event);
|
|
|
| // Returns the current time of the tick clock.
|
| base::TimeDelta Now();
|
| @@ -314,6 +323,10 @@ class UI_CHROMEOS_EXPORT TouchExplorationController
|
| // including corners, then the resulting movements will be interpreted as
|
| // slide gestures.
|
| SLIDE_GESTURE,
|
| +
|
| + // If the user taps the screen with two fingers and releases both fingers
|
| + // before the grace period has passed, spoken feedback will be silenced.
|
| + TWO_FINGER_TAP,
|
| };
|
|
|
| enum ScreenLocation {
|
|
|