Change-Id: Ia4d6cffa0c6cf710da577b75f6337836352959a0

Bug: 3040988
Change-Id: Ibcac874a96ed0bf35350b50a5dd862a8d03c8354

Bug: 3041532
Change-Id: I1d846e9175bd033f056a8715287a936be2fe8f74

One of the edge flags was wrong.

am 5f1aecb2: (-s ours) am e07bc39a: Merge "Trim unwanted whitespace from translations.  DO NOT MERGE" into gingerbread

Merge commit '5f1aecb2'

* commit '5f1aecb2':
  Trim unwanted whitespace from translations.  DO NOT MERGE

Merge commit 'e07bc39a' into gingerbread-plus-aosp

* commit 'e07bc39a':
  Trim unwanted whitespace from translations.  DO NOT MERGE

Change-Id: Ie380334bc725aa55beb8ec084d1ade881a50812c

am 7f2a6a05: am 0b4ae1f5: Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case

Merge commit '7f2a6a05'

* commit '7f2a6a05':
  Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case

am 0b4ae1f5: Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case

Merge commit '0b4ae1f5' into gingerbread-plus-aosp

* commit '0b4ae1f5':
  Capitalize the displayed text in the suggestion bar when all of the user typed chars are upper case

bug:3014227
Change-Id: Ic453e2fde57ce51be00f3a506e1c9328103ca99a

This keyboard layout is tentative for UX study.

This change added xlarge keyboard layouts only for "regular text",
"symbol/number mode" and "symbol/number mode shifted".

TODO other text mode variants should have dedicated layout.

Change-Id: I36077efcec4b57c3b5cada0a851e1409a289eeb9

Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d

Merge commit '3a2b9035' into gingerbread-plus-aosp

* commit '3a2b9035':
  Add Debug Settings Activity

Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac

am b3671b58: (-s ours) am 89711080: Merge "Import revised translations.  DO NOT MERGE" into gingerbread

Merge commit 'b3671b58'

* commit 'b3671b58':
  Import revised translations.  DO NOT MERGE

Change-Id: I38532015c089c0a5c6c1b98fe44f282918aebe5e

Merge commit '89711080' into gingerbread-plus-aosp

* commit '89711080':
  Import revised translations.  DO NOT MERGE

Change-Id: I1bf6a9e39adbe7d8e938f6dd5fe12227f8da4053

am ca2fba71: am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread

Merge commit 'ca2fba71'

* commit 'ca2fba71':
  Keep addWordToDictionary from doing disk I/O on main thread

Merge commit '6ee1bd42' into gingerbread-plus-aosp

* commit '6ee1bd42':
  Keep addWordToDictionary from doing disk I/O on main thread

bug: 2999524

Change-Id: Id8b04d38079cfa1dadd5955eb7f83085e60eb8e2

am bf03559f: am 64e5a194: Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread

Merge commit 'bf03559f'

* commit 'bf03559f':
  Add enter/exit animation style to prevew and mini keyboard

Merge commit '64e5a194' into gingerbread-plus-aosp

* commit '64e5a194':
  Add enter/exit animation style to prevew and mini keyboard

TODO This animation style API of PopupWindow can be called only in
Gingrebread or later.  We should refactor this using reflection to be
able to be compatible with Froyo.

Bug: 3004787
Bug: 2973989
Change-Id: I2abfcc853b1a0af2bccee7bdf5fbd723456b7d34

Merge commit '27bddbe6'

* commit '27bddbe6':
  Move RingCharBuffer as a singleton in Util

Merge commit '1bebdcb4' into gingerbread-plus-aosp

* commit '1bebdcb4':
  Move RingCharBuffer as a singleton in Util

Change-Id: I08d09555a99a64038374e62019777d331c48319b

Merge commit '5521d06f'

* commit '5521d06f':
  Update mdpi visual assets of upper-right number hint

Merge commit '5339950b' into gingerbread-plus-aosp

* commit '5339950b':
  Update mdpi visual assets of upper-right number hint

Change-Id: I77e2b70f4ec954ea2a0822f7bdb92d8a4d405f7f

Merge commit 'bc63621f'

* commit 'bc63621f':
  Fixed popup mini-keyboard position

Merge commit '9d44411a' into gingerbread-plus-aosp

* commit '9d44411a':
  Fixed popup mini-keyboard position

This change reverts I28bf3e4deb46a428dc8422a3a165183e00608604 partly

Bug: 3029284
Change-Id: I0701ab9dfa1cfddbecbef3d32e525c0a143fc297