Change-Id: Iff337e1c6ef3a17fd96a5e5f1c3c4a21190aac1c

Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">.  The keyboard XML file which is
included must have <merge> tag as root element.

Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32

Merge commit '2501d736'

* commit '2501d736':
  Fix bug 3063598, change "tap" to "touch" thrice.

Merge commit '47383758' into gingerbread-plus-aosp

* commit '47383758':
  Fix bug 3063598, change "tap" to "touch" thrice.

Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42

This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.

Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c

Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8

Change-Id: Ie840ae113ee6bd5b629a90959d7f955a5ceba95a

Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c

Merge commit 'c0fc4bf9'

* commit 'c0fc4bf9':
  Long press mic/comma key bring mini keyboard with settings

Merge commit '8e1f1be0' into gingerbread-plus-aosp

* commit '8e1f1be0':
  Long press mic/comma key bring mini keyboard with settings

Bug: 3050703

Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a

Merge commit 'bd677880'

* commit 'bd677880':
  Make the background of keypopup transparent

Merge commit '88a04563' into gingerbread-plus-aosp

* commit '88a04563':
  Make the background of keypopup transparent

Change-Id: I5240ffdd8e48bcb99c2edf878d8efaba2cafeb07

am 8e6a9270: am 18d536f6: Merge "Dismiss orange highlight after suggestion has been selected" into gingerbread

Merge commit '8e6a9270'

* commit '8e6a9270':
  Dismiss orange highlight after suggestion has been selected

Merge commit '18d536f6' into gingerbread-plus-aosp

* commit '18d536f6':
  Dismiss orange highlight after suggestion has been selected

Bug: 3051311
Change-Id: Ia32cd8748a0afade07a9896ad77400cf42aed0f5

Merge commit '7ed6b88c'

* commit '7ed6b88c':
  Revert changes to keyboard_popup.xml for now.

Merge commit 'a0a60b37' into gingerbread-plus-aosp

* commit 'a0a60b37':
  Revert changes to keyboard_popup.xml for now.

This unexpectedly bloated keys in mini popup keyboard.

bug: 3048638
Change-Id: I2b717c9007ce7717bac514f1d8bcae1280130cf4

am 105f7c36: am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread

Merge commit '105f7c36'

* commit '105f7c36':
  Long pressing mic/comma key will show settings menue

am 93176d86: am 77c9f2d3: Merge "Display feedback popup for saving word while the word is pressing." into gingerbread

Merge commit '93176d86'

* commit '93176d86':
  Display feedback popup for saving word while the word is pressing.

am b97d1777: am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard

Merge commit 'b97d1777'

* commit 'b97d1777':
  Fixed assets

Merge commit 'e6e45510'

* commit 'e6e45510':
  Disable suggestion bar before invoke Voice input

Merge commit '48ef72ac'

* commit '48ef72ac':
  Eliminate compiler warning

Merge commit '259778c3'

* commit '259778c3':
  Disable suggestion selection preview popup

Merge commit '7d849f8a'

* commit '7d849f8a':
  Fix proguard flag file dependency.

am 4d158dc2: am 15b840cd: Merge "Check recorrection on focusing into a text field that has text already." into gingerbread

Merge commit '4d158dc2'

* commit '4d158dc2':
  Check recorrection on focusing into a text field that has text already.

Merge commit '3297ee80' into gingerbread-plus-aosp

* commit '3297ee80':
  Long pressing mic/comma key will show settings menue

am 77c9f2d3: Merge "Display feedback popup for saving word while the word is pressing." into gingerbread

Merge commit '77c9f2d3' into gingerbread-plus-aosp

* commit '77c9f2d3':
  Display feedback popup for saving word while the word is pressing.

am 36f97dd6: Fixed assets - Make the background of popup key a full transparent color - Updated the background mdpi asset of keyboard

Merge commit '36f97dd6' into gingerbread-plus-aosp

* commit '36f97dd6':
  Fixed assets

Merge commit '11a578f4' into gingerbread-plus-aosp

* commit '11a578f4':
  Disable suggestion bar before invoke Voice input

Merge commit '8ff96805' into gingerbread-plus-aosp

* commit '8ff96805':
  Eliminate compiler warning

Merge commit 'eebe37e8' into gingerbread-plus-aosp

* commit 'eebe37e8':
  Disable suggestion selection preview popup

Merge commit '2d6a0c68' into gingerbread-plus-aosp

* commit '2d6a0c68':
  Fix proguard flag file dependency.

Bug: 3050703
Change-Id: I62773c10f435d13174f6ff6574912cb99303e83c