[Switch Access] Add padding to layer and fix animation speed

Add padding to point scan layer so that both lines in range scanning
have same line width. Adjust scanning speed so that range scanning has
faster speed than line scanning.
Signed-off-by: Shannon Chen <shannc@chromium.org>
Bug: 1061537
Change-Id: I90d8623bcdac226488804682ede16447f18270a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2596021
Commit-Queue: Shannon Chen <shannc@google.com>
Reviewed-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837960}

ash/accessibility/point_scan_controller.cc

@@ -11,10 +11,10 @@
 namespace {
 // Scanning time in seconds from the start of the screen (offset_start) to the
 // end of the screen (offset_bound).
-constexpr float kHorizontalScanTimeSecs = 20;
-constexpr float kVerticalScanTimeSecs = 20;
+constexpr float kHorizontalScanTimeSecs = 90;
+constexpr float kVerticalScanTimeSecs = 60;
 constexpr float kHorizontalRangeScanTimeSecs = 30;
-constexpr float kVerticalRangeScanTimeSecs = 20;
+constexpr float kVerticalRangeScanTimeSecs = 25;
 constexpr int kDefaultRangeWidthDips = 150;
 constexpr float kDefaultRangeHeightDips = 120;
 

ash/accessibility/point_scan_layer.cc

@@ -22,6 +22,7 @@ namespace {
 const int kDefaultStrokeWidth = 6;
 constexpr int kDefaultRangeWidthDips = 150;
 constexpr int kDefaultRangeHeightDips = 120;
+constexpr int kDefaultPaddingDips = 4;
 
 display::Display GetPrimaryDisplay() {
   DCHECK(display::Screen::GetScreen());
@@ -42,8 +43,10 @@ PointScanLayer::PointScanLayer(AccessibilityLayerDelegate* delegate)
 
 void PointScanLayer::StartHorizontalRangeScanning() {
   is_range_scan_ = true;
-  gfx::Point end = bounds_.bottom_left();
-  bounds_.set_origin(line_.start);
+  gfx::Point start(kDefaultPaddingDips, 0);
+  gfx::Point end(bounds_.bottom_left().x() + kDefaultPaddingDips,
+                 bounds_.bottom_left().y());
+  line_.start = start;
   line_.end = end;
   is_moving_ = true;
   is_horizontal_range_ = true;
@@ -60,8 +63,10 @@ void PointScanLayer::StartHorizontalScanning() {
 
 void PointScanLayer::StartVerticalRangeScanning() {
   is_range_scan_ = true;
-  gfx::Point end = bounds_.top_right();
-  bounds_.set_origin(line_.start);
+  gfx::Point start(0, kDefaultPaddingDips);
+  gfx::Point end(bounds_.top_right().x(),
+                 bounds_.top_right().y() + kDefaultPaddingDips);
+  line_.start = start;
   line_.end = end;
   is_moving_ = true;
 }