cros: Advance fingerprint progress bar when receive a non-ideal scan.

In case of a non-ideal scan (user puts the same area of their finger
over and over again), the percentage goes up and we should advance
progress bar in UI to match Android's behavior.

Bug: 880105, b:112692311
Change-Id: I031eca6c2b2450f651784866ffb7ffa105a25ef1
Reviewed-on: https://chromium-review.googlesource.com/1217912Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Xiaoyin Hu <xiaoyinh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590373}

chrome/browser/resources/chromeos/login/fingerprint_setup.js

@@ -81,17 +81,9 @@ Polymer({
     // First tap on the sensor to start fingerprint enrollment.
     if (this.getActiveScreen_() === this.$.placeFinger) {
       this.showScreen_('startFingerprintEnroll');
-      return;
     }
 
-    // The fingerprint subsystem has internal limit on the number of attempts
-    // no matter successful or failed.
-    // So it always increases "percentComplete", even if touch attempt was
-    // unsuccessful. We do not want to modify displayed progress on failed
-    // scans, so we only advance on success.
-    if (scanResult === FingerprintResultType.SUCCESS)
-      this.percentComplete_ = percentComplete;
-
+    this.percentComplete_ = percentComplete;
     this.scanResult_ = scanResult;
   },
 

chrome/browser/resources/settings/people_page/setup_fingerprint_dialog.js

@@ -53,6 +53,20 @@ Polymer({
      * @private
      */
     step_: {type: Number, value: settings.FingerprintSetupStep.LOCATE_SCANNER},
+
+    /**
+     * The percentage of completion that has been received during setup.
+     * This is used to approximate the progress of the setup.
+     * The value within [0, 100] represents the percent of enrollment
+     * completion.
+     * @type {number}
+     * @private
+     */
+    percentComplete_: {
+      type: Number,
+      value: 0,
+      observer: 'onProgressChanged_',
+    },
   },
 
   /**
@@ -66,15 +80,6 @@ Polymer({
   /** @private {?settings.FingerprintBrowserProxy}*/
   browserProxy_: null,
 
-  /**
-   * The percentage of completion that has been received during setup.
-   * This is used to approximate the progress of the setup.
-   * The value within [0, 100] represents the percent of enrollment completion.
-   * @type {number}
-   * @private
-   */
-  percentComplete_: 0,
-
   /** @override */
   attached: function() {
     this.addWebUIListener(
@@ -117,7 +122,6 @@ Polymer({
   reset_: function() {
     this.step_ = settings.FingerprintSetupStep.LOCATE_SCANNER;
     this.percentComplete_ = 0;
-    this.$.arc.reset();
     this.clearSensorMessageTimeout_();
   },
 
@@ -141,28 +145,19 @@ Polymer({
       case settings.FingerprintSetupStep.LOCATE_SCANNER:
         this.$.arc.reset();
         this.step_ = settings.FingerprintSetupStep.MOVE_FINGER;
-        this.percentComplete_ = 0;
+        this.percentComplete_ = scan.percentComplete;
+        this.setProblem_(scan.result);
         break;
       case settings.FingerprintSetupStep.MOVE_FINGER:
         if (scan.isComplete) {
           this.problemMessage_ = '';
           this.step_ = settings.FingerprintSetupStep.READY;
-          this.$.arc.setProgress(
-              this.percentComplete_, 100 /*currPercentComplete*/,
-              true /*isComplete*/);
           this.clearSensorMessageTimeout_();
           this.fire('add-fingerprint');
         } else {
           this.setProblem_(scan.result);
-          if (scan.result == settings.FingerprintResultType.SUCCESS) {
-            if (scan.percentComplete > this.percentComplete_) {
-              this.$.arc.setProgress(
-                  this.percentComplete_, scan.percentComplete,
-                  false /*isComplete*/);
-              this.percentComplete_ = scan.percentComplete;
-            }
-          }
         }
+        this.percentComplete_ = scan.percentComplete;
         break;
       case settings.FingerprintSetupStep.READY:
         break;
@@ -286,5 +281,19 @@ Polymer({
     return this.step_ == settings.FingerprintSetupStep.MOVE_FINGER ||
         this.step_ == settings.FingerprintSetupStep.READY;
   },
+
+  /**
+   * Observer for percentComplete_.
+   * @private
+   */
+  onProgressChanged_: function(newValue, oldValue) {
+    // Start a new enrollment, so reset all enrollment related states.
+    if (newValue === 0) {
+      this.$.arc.reset();
+      return;
+    }
+
+    this.$.arc.setProgress(oldValue, newValue, newValue === 100);
+  },
 });
 })();

chrome/test/data/webui/settings/fingerprint_browsertest_chromeos.js

@@ -168,7 +168,7 @@ suite('settings-fingerprint-list', function() {
       // First tap on the sensor to start fingerprint enrollment.
       browserProxy.scanReceived(
           settings.FingerprintResultType.SUCCESS, false, 20 /* percent */);
-      assertEquals(0, dialog.percentComplete_);
+      assertEquals(20, dialog.percentComplete_);
       assertEquals(settings.FingerprintSetupStep.MOVE_FINGER, dialog.step_);
       assertTrue(dialog.$$('#scannerLocation').hidden);
       assertFalse(dialog.$$('#arc').hidden);
@@ -177,7 +177,7 @@ suite('settings-fingerprint-list', function() {
       // problem message should be visible.
       browserProxy.scanReceived(
           settings.FingerprintResultType.TOO_FAST, false, 20 /* percent */);
-      assertEquals(0, dialog.percentComplete_);
+      assertEquals(20, dialog.percentComplete_);
       assertEquals(
           'visible',
           window.getComputedStyle(dialog.$$('#messageDiv')).visibility);