Updates touch calibration API and plumbs through the native touch calibration method

extensions/common/api/system_display.idl

Index: extensions/common/api/system_display.idl
diff --git a/extensions/common/api/system_display.idl b/extensions/common/api/system_display.idl
index 97d2c3c995aba90f22325625febda68dfaf5ba2c..33bcce737b38a6ac8e0c0dc9b57b4ae439f083ce 100644
--- a/extensions/common/api/system_display.idl
+++ b/extensions/common/api/system_display.idl
@@ -276,27 +276,33 @@ namespace system.display {
     // |id|: The display's unique identifier.
     static void overscanCalibrationComplete(DOMString id);
 
-    // Starts touch calibration for a display. This will show an overlay on the
-    // screen and initialize the UX for touch calibration. If touch calibration
-    // for display |id| is already in progress this will throw an error.
+    // Starts native touch calibration for a display. This will show an overlay
+    // on the screen and initialize the UX for touch calibration. If another
+    // native touch calibration is already in progress this will throw an error.
     // |id|: The display's unique identifier.
-    static void touchCalibrationStart(DOMString id);
+    static void startNativeTouchCalibration(DOMString id);

[stevenjb, 2017/01/18 21:58:05]

If startNativeTouchCalibration doesn't require a complete() call, we should name
this something like showNativeTouchCalibration() and clarify the comment.

It would also be helpful to provide a completion callback when the native UI is
dismissed, is that possible?

[malaykeshav, 2017/01/19 01:30:51]

Renamed to showNativeTouchCalibration() and added a callback when the native UI
is dismissed.

 
-    // Sets the touch calibration pairs for a display. These |pairs| would be
-    // used to calibrate the touch screen for display |id|. If touch calibration
-    // for display |id| is in progress this will do nothing.
+    // Starts custom touch calibration for a display. This should be called when
+    // using a custom UX for collecting calibration data. If another touch
+    // calibration is already in progress this will throw an error.
     // |id|: The display's unique identifier.
+    static void startCustomTouchCalibration(DOMString id);

[stevenjb, 2017/01/18 21:01:35]

I find having multiple 'start' methods confusing. It is unclear what happens if
both are called.

Also, what is the expected flow with startNativeTouchCalibration? There is no
equivalent 'complete'. What triggers removal of the overlay?

Does it make sense to make 'native/custom' a parameter to startTouchCalibarion?

[malaykeshav, 2017/01/19 01:30:51]

Acknowledged.

+
+    // Sets the touch calibration pairs for a display. These |pairs| would be
+    // used to calibrate the touch screen for display with |id| called in
+    // startCustomTouchCalibration(). Always call |startCustomTouchCalibration|
+    // before calling this method. If another touch calibration is already in
+    // progress this will throw an error.
     // |pairs|: The pairs of point used to calibrate the display.
     // |bounds|: Bounds of the display when the touch calibration was performed.
     //     |bounds.left| and |bounds.top| values are ignored.
-    static void touchCalibrationSet(DOMString id,
-                                    TouchCalibrationPairQuad pairs,
-                                    Bounds bounds);
+    static void completeCustomTouchCalibration(TouchCalibrationPairQuad pairs,
+                                               Bounds bounds);
 
     // Resets the touch calibration for the display and removes the saved
     // calibration data.
     // |id|: The display's unique identifier.
-    static void touchCalibrationReset(DOMString id);
+    static void resetTouchCalibration(DOMString id);

[stevenjb, 2017/01/18 21:58:05]

resetCustomTouchCalibration?

[malaykeshav, 2017/01/19 01:30:51]

This resets any stored touch calibration data and has nothing to do with the UX.

[stevenjb, 2017/01/19 17:19:01]

Hmm. Unfortunately this is different behavior from overscanCalibrationReset,
which resets to the last saved value during calibration. That one should
probably be named 'cancel', but changing that is risky.

Maybe name this 'clearTouchCalibration' since it is removing all saved
calibration data?

[malaykeshav, 2017/01/19 23:49:06]

Done

   };
 
   interface Events {