Change-Id: I5d9344aa7c14e545c6a3bd4aa00287becb13a545

Merge commit 'd4f91263'

* commit 'd4f91263':
  Clean up LatinIME java

am bd1eb5d0: am e07d6a77: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit 'bd1eb5d0'

* commit 'bd1eb5d0':
  Fix a bug in backspace handling for the "Tap again to save"
  Fix bug: 2693836 - Russian keyboard is missing a letter

Merge commit '6b6ae29b'

* commit '6b6ae29b':
  Fix LatinIME crashing due to crash in Contacts DB

Merge commit '525141a4' into gingerbread-plus-aosp

* commit '525141a4':
  Clean up LatinIME java

am e07d6a77: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit 'e07d6a77' into gingerbread-plus-aosp

* commit 'e07d6a77':
  Fix a bug in backspace handling for the "Tap again to save"
  Fix bug: 2693836 - Russian keyboard is missing a letter

- remove unused code
- add @Override
- change the inappropriate cast

Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894

Change-Id: I1dba838629fe6e7c16f7684a0d438328cda1c325

Merge commit '3ecb4813'

* commit '3ecb4813':
  Fix an NPE found in KeyboardSwitcher.isAlphabetMode()

Merge commit 'd56f8f5c'

* commit 'd56f8f5c':
  DO NOT MERGE. Backport LatinIME from master to Gingerbread

Bug:2930812
Change-Id: I3a6af4d2a6b0dea1d3391300f7bf9a577daf3c8d

Merge commit '78c46117' into gingerbread-plus-aosp

* commit '78c46117':
  Fix LatinIME crashing due to crash in Contacts DB

bug: 2895391
Change-Id: I3a0628942b74556f8b600b63ebc5d808fb2f0abd

Merge commit '17dc363a' into gingerbread-plus-aosp

* commit '17dc363a':
  Fix an NPE found in KeyboardSwitcher.isAlphabetMode()

Change-Id: I03d3d9b25147632d25c1502f796acad4cdaeb239

Merge commit '979f8690' into gingerbread-plus-aosp

* commit '979f8690':
  DO NOT MERGE. Backport LatinIME from master to Gingerbread

TODO: Cleanup will follow.

Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963

Move setShifted and setShifLocked methods to KeyboardSwitcher, then
delegate to LatinKeyboardView.

Bug: 2910379

Change-Id: I5dba70ec0dfc7a1ed67f1e05d54a2bd92252ed24

Change-Id: I6006c729f89cc91d5674c19b95cf19ad2cab14cf

Change-Id: Ib6529182be031be2e54072a87516caee5f0d2c1d

Bug:2909517

Change-Id: Ic323d38219a2af211b8a8db09746febe4ccbede9

bug: 2889273
Change-Id: I0f317e203f368f5f47738154a6dee0f556d56148

Change-Id: I975bcb5cf09211c6379cc7e7ad89ea09d91e7ec1

Also, continue to show the corrections when user keeps replacing the word repeatedly
with different corrections from the suggestion strip. There were problems with
tapping suggestions quickly or tapping the same suggestion more than once (same length).

Also fixes Bug: 2852891 - Text suggestion appears incorrectly when selecting text that's
not a whole word.

Changed the TextEntryState states to an enum type instead of int. Needed it to show the
states for debugging purposes.

There are some traditional differences between Norwegian and Swedish
keyboard layouts -- for instance, few Norwegians would search for ü
on the y key, but it is so on the Swedish keyboard. Correct the most
obvious differences.

Change-Id: Iab53fa51ff7faa2022b10b551e47060a6f2c5652

Change-Id: I6d12bc054fde0fe3ea03b673e7b5b7d7f8db8d54

Bug:2909517
Change-Id: I1c010b1079a04ff3b08d690c536fbe8d4414ea14

 from com.google.android.inputmethod.latin to com.android.inputmethod.latin

Related change: https://android-git.corp.google.com/g/60862

bug: 2786392

Change-Id: Ib7c6cfe61db19ef50c401a01497eef5f1f5e239e

this option is disabled as the default at x-large

Bug:2909517

Change-Id: Ifda1b7ff89bc4beeee02ba0f3e01d441a9435b37

Merge "Fix the bug that black symbols are shown when only one lanugage is selected. (Update with the files left out from Change-Id: I15f83fc43d91c2c9d74b40fdcecdfe239242d565.)"

-UnitTest for UserBigram
-Changes for number of bigrams to load

Change-Id: I2c6fbe6194d34112ccc52c7e199461d2350e8516

Change-Id: I19c1bce22c2395b727891f60776946a0eec7145b

Bug: 2898207

Merge commit 'b608a93c'

* commit 'b608a93c':
  Fix a bug in backspace handling for the "Tap again to save"

Merge commit '6511376f' into gingerbread-plus-aosp

* commit '6511376f':
  Fix a bug in backspace handling for the "Tap again to save"