Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js

Issue 899673003: Uprev Google Input Tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js
index 6e6ec657ded29f1ca874b6e5bb550765ce70ea1d..2c0c5f9099683f4178978e5bb7d64954d061364e 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/characterkey.js
@@ -50,6 +50,8 @@ var Character = i18n.input.chrome.inputview.elements.content.Character;
* @param {boolean} enableShiftRendering Whether renders two letter vertically,
* it means show shift letter when in letter state, shows default letter
* when in shift state, same as the altgr state.
+ * @param {boolean} isQpInputView Temporary flag to indicate it is in material
+ * design.
* @param {goog.events.EventTarget=} opt_eventTarget The event target.
* @constructor
* @extends {i18n.input.chrome.inputview.elements.content.SoftKey}
@@ -57,7 +59,7 @@ var Character = i18n.input.chrome.inputview.elements.content.Character;
i18n.input.chrome.inputview.elements.content.CharacterKey = function(id,
keyCode, characters, isLetterKey, hasAltGrCharacterInTheKeyset,
alwaysRenderAltGrCharacter, stateManager, isRTL,
- enableShiftRendering, opt_eventTarget) {
+ enableShiftRendering, isQpInputView, opt_eventTarget) {
goog.base(this, id, i18n.input.chrome.inputview.elements.ElementType.
CHARACTER_KEY, opt_eventTarget);
@@ -117,6 +119,9 @@ i18n.input.chrome.inputview.elements.content.CharacterKey = function(id,
/** @private {boolean} */
this.enableShiftRendering_ = enableShiftRendering;
+ /** @private {boolean} */
+ this.isQpInputView_ = isQpInputView;
+
this.pointerConfig.longPressWithPointerUp = true;
this.pointerConfig.longPressDelay = 500;
};
@@ -164,6 +169,7 @@ CharacterKey.prototype.createDom = function() {
CharacterKey.STATE_LIST_[i],
this.stateManager_,
this.enableShiftRendering_,
+ this.isQpInputView_,
this.getCapslockCharacter_(i));
var character = new Character(this.id + '-' + i, model, this.isRTL_);
this.addChild(character, true);

Powered by Google App Engine
This is Rietveld 408576698