Virtual Keyboard Shift Highlight fixed.

ui/keyboard/resources/elements/kb-keyboard.html

 <!--
   -- Copyright 2013 The Chromium Authors. All rights reserved.
   -- Use of this source code is governed by a BSD-style license that can be
   -- found in the LICENSE file.
   -->
 
 <polymer-element name="kb-keyboard" on-key-over="keyOver" on-key-up="keyUp"
     on-key-down="keyDown" on-key-longpress="keyLongpress" on-pointerup="up"
     on-pointerdown="down" on-enable-sel="enableSel"
     on-enable-dbl="enableDbl" attributes="keyset layout rows">
@@ skipping 165 matching lines @@
       lastPressedKey: null,
       voiceInput_: null,
       dblDetail_: null,
       dblTimer_: null,
       swipeHandler: null,
 
       /**
       * Handles the state of the shift key.
       */
       keysetChanged: function() {
-        // TODO (rsadam): Generalize to avoid the need to hardcode upper. Add
-        // state attribute to shift key.
-        if (this.keyset == 'upper') {
-          // Deals with the edge case where caps was triggered by a long press.
-          // Do not want to highlight the shift key in this case.
-          if (!this.classList.contains('caps'))
-            this.classList.add('highlight');
-        } else {
-          this.classList.remove('highlight');
-          this.classList.remove('caps');
-        }
+        var keysetId = '#' + this.layout + '-' + this.keyset;
+        var keyset = this.querySelector(keysetId);
+
+        // Unlocks the keyboard if the current keyset is not lockable.
+        if (!keyset.getAttribute('lockable'))
+          this.classList.remove('locked');
+        
       },
 
       ready: function() {
         this.voiceInput_ = new VoiceInput(this);
         this.swipeHandler = this.onSwipeUpdate.bind(this);
       },
 
       /**
        * When double click/tap event is enabled, the second key-down and key-up
        * events on the same key should be skipped. Return true when the event
@@ skipping 133 matching lines @@
       /**
        * Handles pointerup event. This is used for double tap/click events.
        * @param {PointerEvent} event The pointerup event that bubbled to
        *     kb-keyboard.
        */
       up: function(event) {
         if (this.dblDetail_) {
           this.dblDetail_.clickCount++;
           if (this.dblDetail_.clickCount == 2) {
             this.keyset = this.dblDetail_.toKeyset;
-            var keysetId = '#' + this.layout + '-' + this.keyset
-            this.querySelector(keysetId).nextKeyset = this.dblTimer_.nextKeyset;
+            var keysetId = '#' + this.layout + '-' + this.keyset;
+            var keyset = this.querySelector(keysetId);
+            keyset.nextKeyset = this.dblTimer_.nextKeyset;
             clearTimeout(this.dblTimer_);
             
             // Checks if shift is capitalized.
-            if (this.keyset == 'upper') {
-              this.classList.remove('highlight');
-              this.classList.add('caps');
-            }
+            if (keyset.getAttribute('lockable'))
+              this.classList.add('locked');
 
             this.dblDetail_ = null;
           }
         }
 
         // TODO(zyaozhujun): There are some edge cases to deal with later.
         // (for instance, what if a second finger trigger a down and up
         // event sequence while swiping).
         // When pointer up from the screen, a swipe selection session finished,
         // all the data should be reset to prepare for the next session.
@@ skipping 66 matching lines @@
       keyLongpress: function(event, detail) {
         // If the gesture is long press, remove the pointermove listener.
         this.removeEventListener('pointermove', this.swipeHandler, false);
         var toKeyset = detail.toKeyset;
         // Keyset transtion key.
         if (toKeyset) {
           this.keyset = toKeyset;
           this.querySelector('#' + this.layout + '-' + this.keyset).nextKeyset =
               detail.nextKeyset;
 
-          // Sets the caps class before removing active to prevent flicker.
-          this.classList.add('caps');
+          // Locks the keyset before removing active to prevent flicker.
+          this.classList.add('locked');
           // Makes last pressed key inactive if transit to a new keyset on long
           // press.
           this.lastPressedKey.classList.remove('active');
         }
       },
 
       /**
        * Handles a change in the keyboard layout. Auto-selects the default
        * keyset for the new layout.
        */
@@ skipping 31 matching lines @@
           }
         }
         if (keysetsLoaded)
           console.error('No default keyset found for ' + this.layout);
         return false;
       }
     });
   </script>
 </polymer-element>