Updates google-input-tools.

third_party/google_input_tools/src/chrome/os/inputview/controller.js

 // Copyright 2014 The ChromeOS IME Authors. All Rights Reserved.
 // limitations under the License.
 // See the License for the specific language governing permissions and
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // distributed under the License is distributed on an "AS-IS" BASIS,
 // Unless required by applicable law or agreed to in writing, software
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // You may obtain a copy of the License at
@@ skipping 22 matching lines @@
 goog.require('i18n.input.chrome.inputview.KeyboardContainer');
 goog.require('i18n.input.chrome.inputview.M17nModel');
 goog.require('i18n.input.chrome.inputview.Model');
 goog.require('i18n.input.chrome.inputview.PerfTracker');
 goog.require('i18n.input.chrome.inputview.ReadyState');
 goog.require('i18n.input.chrome.inputview.Settings');
 goog.require('i18n.input.chrome.inputview.SizeSpec');
 goog.require('i18n.input.chrome.inputview.SpecNodeName');
 goog.require('i18n.input.chrome.inputview.StateType');
 goog.require('i18n.input.chrome.inputview.SwipeDirection');
+goog.require('i18n.input.chrome.inputview.elements.Element');
 goog.require('i18n.input.chrome.inputview.elements.ElementType');
 goog.require('i18n.input.chrome.inputview.elements.content.Candidate');
 goog.require('i18n.input.chrome.inputview.elements.content.CandidateView');
 goog.require('i18n.input.chrome.inputview.elements.content.ExpandedCandidateView');
 goog.require('i18n.input.chrome.inputview.elements.content.MenuView');
 goog.require('i18n.input.chrome.inputview.events.EventType');
 goog.require('i18n.input.chrome.inputview.events.KeyCodes');
 goog.require('i18n.input.chrome.inputview.handler.PointerHandler');
 goog.require('i18n.input.chrome.inputview.util');
 goog.require('i18n.input.chrome.message.ContextType');
@@ skipping 627 matching lines @@
     if (data && data[SpecNodeName.DISABLE_LONGPRESS]) {
       return;
     }
   }
 
   // POINTER_UP event may be dispatched without a view. This is the case when
   // user selected an accent character which is displayed outside of the
   // keyboard window bounds. For other cases, we expect a view associated with a
   // pointer up event.
   if (e.type == EventType.POINTER_UP && !e.view) {
-    if (this.container_.altDataView.isVisible()) {
+    if (this.container_.altDataView.isVisible() &&
+        e.identifier == this.container_.altDataView.identifier) {
       var altDataView = this.container_.altDataView;
       var ch = altDataView.getHighlightedCharacter();
       if (ch) {
         this.adapter_.sendKeyDownAndUpEvent(ch, altDataView.triggeredBy.id,
             altDataView.triggeredBy.keyCode,
             {'sources': [ch.toLowerCase()], 'possibilities': [1]});
       }
       altDataView.hide();
       this.clearUnstickyState_();
     }
     return;
   }
 
   if (e.type == EventType.POINTER_UP) {
     this.stopBackspaceAutoRepeat_();
   }
 
   if (e.view) {
     this.handlePointerAction_(e.view, e);
-  } else if (e.type == EventType.POINTER_DOWN) {
-    var tabbableKeysets = [
-      Controller.HANDWRITING_VIEW_CODE_,
-      Controller.EMOJI_VIEW_CODE_];
-    if (goog.array.contains(tabbableKeysets, this.currentKeyset_)) {
-      this.resetAll_();
-      this.switchToKeyset(this.container_.currentKeysetView.fromKeyset);
-    }
   }
 };
 
 
 /**
  * Handles the drag events. Generally, this will forward the event details to
  * the components that handle drawing, decoding, etc.
  *
  * @param {!i18n.input.chrome.inputview.events.DragEvent} e .
  * @private
@@ skipping 10 matching lines @@
  * Handles the swipe action.
  *
  * @param {!i18n.input.chrome.inputview.elements.Element} view The view, for
  *     swipe event, the view would be the soft key which starts the swipe.
  * @param {!i18n.input.chrome.inputview.events.SwipeEvent} e The swipe event.
  * @private
  */
 Controller.prototype.handleSwipeAction_ = function(view, e) {
   var direction = e.direction;
   if (this.container_.altDataView.isVisible()) {
-    this.container_.altDataView.highlightItem(e.x, e.y);
+    this.container_.altDataView.highlightItem(e.x, e.y, e.identifier);
     return;
   }
   if (view.type == ElementType.BACKSPACE_KEY) {
     if (this.container_.swipeView.isVisible() ||
         this.container_.swipeView.isArmed()) {
       this.stopBackspaceAutoRepeat_();
       return;
     }
   }
 
   if (view.type == ElementType.CHARACTER_KEY) {
     view = /** @type {!i18n.input.chrome.inputview.elements.content.
         CharacterKey} */ (view);
     if (direction & i18n.input.chrome.inputview.SwipeDirection.UP ||
         direction & i18n.input.chrome.inputview.SwipeDirection.DOWN) {
       var ch = view.getCharacterByGesture(!!(direction &
           i18n.input.chrome.inputview.SwipeDirection.UP));
       if (ch) {
         view.flickerredCharacter = ch;
       }
     }
   }
 
   if (view.type == ElementType.COMPACT_KEY) {
-
     view = /** @type {!i18n.input.chrome.inputview.elements.content.
         CompactKey} */ (view);
     if ((direction & i18n.input.chrome.inputview.SwipeDirection.UP) &&
         view.hintText) {
       view.flickerredCharacter = view.hintText;
     }
   }
 };
 
 
@@ skipping 51 matching lines @@
  * @param {!i18n.input.chrome.inputview.elements.Element} view The view.
  * @param {!i18n.input.chrome.inputview.events.PointerEvent} e .
  * @private
  */
 Controller.prototype.handlePointerAction_ = function(view, e) {
   if (this.adapter_.isGestureTypingEnabled() &&
       e.type == EventType.POINTER_DOWN) {
     this.container_.gestureCanvasView.startStroke(e);
   }
 
+  if (this.adapter_.isGestureTypingEnabled() &&
+      e.type == EventType.POINTER_UP) {
+    this.container_.gestureCanvasView.endStroke(e);
+  }
+
+  // Do not trigger other actives when gesturing.
+  if (this.adapter_.isGestureTypingEnabled() &&
+      this.container_.gestureCanvasView.isGesturing) {
+    return;
+  }
+
   // Listen for DOUBLE_CLICK as well to capture secondary taps on the spacebar.
   if (e.type == EventType.POINTER_UP || e.type == EventType.DOUBLE_CLICK) {
     this.recordStatsForClosing_(
         'InputMethod.VirtualKeyboard.TapCount', 1, 4095, 4096);
   }
 
   if (e.type == EventType.SWIPE) {
     e =  /** @type {!i18n.input.chrome.inputview.events.SwipeEvent} */ (e);
     this.handleSwipeAction_(view, e);
   }
   switch (view.type) {
+    case ElementType.KEYBOARD_CONTAINER_VIEW:
+      if (e.type == EventType.POINTER_DOWN) {
+        var tabbableKeysets = [
+          Controller.HANDWRITING_VIEW_CODE_,
+          Controller.EMOJI_VIEW_CODE_];
+        if (goog.array.contains(tabbableKeysets, this.currentKeyset_)) {
+          this.resetAll_();
+          this.switchToKeyset(this.container_.currentKeysetView.fromKeyset);
+        }
+      }
+      return;
     case ElementType.BACK_BUTTON:
     case ElementType.BACK_TO_KEYBOARD:
       if (e.type == EventType.POINTER_OUT || e.type == EventType.POINTER_UP) {
         view.setHighlighted(false);
       } else if (e.type == EventType.POINTER_DOWN ||
           e.type == EventType.POINTER_OVER) {
         view.setHighlighted(true);
       }
       if (e.type == EventType.POINTER_UP) {
         this.switchToKeyset(this.container_.currentKeysetView.fromKeyset);
@@ skipping 33 matching lines @@
         view.setHighlighted(false);
       } else if (e.type == EventType.POINTER_DOWN ||
           e.type == EventType.POINTER_OVER) {
         view.setHighlighted(true);
       }
       return;
 
     case ElementType.ALTDATA_VIEW:
       view = /** @type {!i18n.input.chrome.inputview.elements.content.
           AltDataView} */ (view);
-      if (e.type == EventType.POINTER_DOWN &&
-          e.target == view.getCoverElement()) {
-        view.hide();
-      } else if (e.type == EventType.POINTER_UP) {
+      if (e.type == EventType.POINTER_UP && e.identifier == view.identifier) {
         var ch = view.getHighlightedCharacter();
         if (ch) {
           this.adapter_.sendKeyDownAndUpEvent(ch, view.triggeredBy.id,
               view.triggeredBy.keyCode,
               {'sources': [ch.toLowerCase()], 'possibilities': [1]});
         }
         view.hide();
         this.clearUnstickyState_();
         this.soundController_.onKeyUp(view.type);
       }
       return;
 
     case ElementType.MENU_ITEM:
       view = /** @type {!i18n.input.chrome.inputview.elements.content.
           MenuItem} */ (view);
-      if (e.type == EventType.CLICK) {
+      if (e.type == EventType.POINTER_UP) {
         this.executeCommand_.apply(this, view.getCommand());
         this.container_.menuView.hide();
         this.soundController_.onKeyUp(view.type);
         this.resetAll_();
       }
       view.setHighlighted(e.type == EventType.POINTER_DOWN ||
           e.type == EventType.POINTER_OVER);
       // TODO: Add chrome vox support.
       return;
 
     case ElementType.MENU_VIEW:
       view = /** @type {!i18n.input.chrome.inputview.elements.content.
           MenuView} */ (view);
 
-      if (e.type == EventType.POINTER_DOWN &&
+      if (e.type == EventType.CLICK &&
           e.target == view.getCoverElement()) {
         view.hide();
       }
       return;
 
     case ElementType.EMOJI_KEY:
       if (e.type == EventType.CLICK) {
         if (!this.container_.currentKeysetView.isDragging && view.text != '') {
           this.adapter_.commitText(view.text);
           this.soundController_.onKeyUp(view.type);
@@ skipping 109 matching lines @@
     case ElementType.CANDIDATES_PAGE_DOWN:
       if (e.type == EventType.POINTER_UP) {
         this.container_.expandedCandidateView.pageDown();
       }
       break;
     case ElementType.CHARACTER_KEY:
       key = /** @type {!i18n.input.chrome.inputview.elements.content.
           CharacterKey} */ (softKey);
       if (e.type == EventType.LONG_PRESS) {
         this.container_.altDataView.show(
-            key, goog.i18n.bidi.isRtlLanguage(this.languageCode_));
+            key, goog.i18n.bidi.isRtlLanguage(this.languageCode_),
+            e.identifier);
       } else if (e.type == EventType.POINTER_UP) {
         this.model_.stateManager.triggerChording();
         var ch = key.getActiveCharacter();
         this.adapter_.sendKeyDownAndUpEvent(ch, key.id, key.keyCode,
             this.getSpatialData_(key, e.x, e.y));
         this.clearUnstickyState_();
         key.flickerredCharacter = '';
       }
       break;
 
@@ skipping 134 matching lines @@
               key.toKeyset);
         }
       }
       break;
 
     case ElementType.COMPACT_KEY:
       key = /** @type {!i18n.input.chrome.inputview.elements.content.
           CompactKey} */(softKey);
       if (e.type == EventType.LONG_PRESS) {
         this.container_.altDataView.show(
-            key, goog.i18n.bidi.isRtlLanguage(this.languageCode_));
+            key, goog.i18n.bidi.isRtlLanguage(this.languageCode_),
+            e.identifier);
       } else if (e.type == EventType.POINTER_UP) {
         this.model_.stateManager.triggerChording();
         var ch = key.getActiveCharacter();
         if (ch.length == 1) {
           this.adapter_.sendKeyDownAndUpEvent(key.getActiveCharacter(), '', 0,
               this.getSpatialData_(key, e.x, e.y));
         } else if (ch.length > 1) {
           // Some compact keys contains more than 1 characters, such as '.com',
           // 'http://', etc. Those keys should trigger a direct commit text
           // instead of key events.
@@ skipping 386 matching lines @@
   this.container_.expandedCandidateView.state = ExpandedCandidateView.State.
       NONE;
   if (this.container_.currentKeysetView) {
     this.container_.currentKeysetView.setVisible(true);
   }
   if (!this.adapter_.isQPInputView &&
       (this.currentKeyset_ == Controller.HANDWRITING_VIEW_CODE_ ||
        this.currentKeyset_ == Controller.EMOJI_VIEW_CODE_)) {
     this.container_.candidateView.switchToIcon(
         CandidateView.IconType.BACK, true);
+  } else if (this.currentKeyset_ != Controller.HANDWRITING_VIEW_CODE_ &&
+      this.currentKeyset_ != Controller.EMOJI_VIEW_CODE_) {
+    this.container_.candidateView.switchToIcon(CandidateView.IconType.VOICE,
+        this.adapter_.isVoiceInputEnabled);
   } else {
     this.container_.candidateView.switchToIcon(CandidateView.IconType.VOICE,
-        this.adapter_.isVoiceInputEnabled);
+        false);
   }
 };
 
 
 /**
  * Callback when the layout is loaded.
  *
  * @param {!i18n.input.chrome.inputview.events.LayoutLoadedEvent} e The event.
  * @private
  */
@@ skipping 207 matching lines @@
   }
 
   if (window.innerHeight != height && !opt_ignoreWindowResize) {
     if (this.lastResizeHeight_ != height) {
       this.lastResizeHeight_ = height;
       window.resizeTo(screen.width, height);
     }
     return;
   }
 
-  this.container_.resize(screen.width, height, widthPercent,
+  this.container_.setContainerSize(screen.width, height, widthPercent,
       candidateViewHeight);
   this.container_.candidateView.setToolbarVisible(this.shouldShowToolBar_());
   if (this.container_.currentKeysetView) {
     this.isKeyboardReady = true;
   }
 };
 
 
 /**
  * Loads the resources, for currentKeyset, passwdKeyset, handwriting,
@@ skipping 240 matching lines @@
         toKeyset = this.currentKeyset_.replace('compact', 'en.compact');
       }
     }
     if (toKeyset) {
       this.resetAll_();
       this.switchToKeyset(toKeyset);
     }
   }
 };
 });  // goog.scope