Commit graph

6867 commits

Author SHA1 Message Date
Keisuke Kuroyanagi
47c76f0a45 Merge "Add contextual dictionary to the dictionary facilitator." 2014-05-12 04:42:33 +00:00
Jean Chalard
2b95bc9b64 Cleanup : remove a useless member
Change-Id: I7871c3243c82b5a19acf266033187795a2ea1767
2014-05-12 11:52:45 +09:00
Tadashi G. Takaoka
59c3ef1ff8 Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Id7b3ddd8aa.

Change-Id: I2d55602d026e30b38d8f822d2124f5c5e4a9a812
2014-05-12 10:59:10 +09:00
Ken Wakasa
4f5ea4dfc2 Merge "Revert "Refactor KeyboardTheme"" 2014-05-09 11:28:51 +00:00
Ken Wakasa
d47dca429e Revert "Refactor KeyboardTheme"
This reverts commit 19688b584b.

Build breakage.

Change-Id: I95d4be1578824eaee5a2fb08ec277250727ac668
2014-05-09 11:28:19 +00:00
Tadashi G. Takaoka
c2a49f3006 Merge "Refactor KeyboardTheme" 2014-05-09 08:26:05 +00:00
Tadashi G. Takaoka
19688b584b Refactor KeyboardTheme
This CL introduces two preference keys in addition to the existing one.

- pref_keyboard_theme: The new preference key that is used only in the
  preference settings.

- pref_keyboard_layout_20110916: The previous preference key that
  holds keyboard color scheme settings. This is superseded by the next
  key.

- pref_keyboard_theme_20140509: The new preference key that holds
  keyboard theme settings. This value is forcibly reset to LMP theme
  on a LMP device. On a KitKat and previous device, the settings of
  the pref_keyboard_layout_20110916 is carried on into this
  preference.

This CL must be checked in together with Ifcedeabbec.

Change-Id: Ibe75146e2c1c7eebf964ca86550baf244fedb79a
2014-05-09 16:21:02 +09:00
Keisuke Kuroyanagi
eaa347bc1a Merge "Add VERSION4_TEST for testing." 2014-05-09 07:06:06 +00:00
Keisuke Kuroyanagi
455dc84cf2 Add VERSION4_TEST for testing.
Bug: 13406708
Change-Id: I0b434717ea3edbb131650af634c53cfbfe113c3e
2014-05-09 15:17:01 +09:00
Keisuke Kuroyanagi
82fa755bac Fix unit tests by adding @UsedForTesting
Change-Id: I9448b1bfa7bf94039de737725851e63a2921a443
2014-05-09 14:44:44 +09:00
Keisuke Kuroyanagi
28ebe2db23 Merge "Check whether contacts have changed using hashCode()." 2014-05-09 03:48:19 +00:00
Keisuke Kuroyanagi
943e28d202 Merge "Periodic GC for personalization dict." 2014-05-09 03:41:43 +00:00
Tadashi G. Takaoka
ebac0aa28f Reorder accented letters of English
This is a follow up change of Idff0b6d08e.

Bug: 13177865
Change-Id: I00ea7cda954efbd248d2abc2fa6d4995d6acbf19
2014-05-09 12:06:42 +09:00
Keisuke Kuroyanagi
89eaa6701f Periodic GC for personalization dict.
Change-Id: I1ef922684cbf1de10c45c66eb119c2343d194da3
2014-05-08 17:20:43 +09:00
Tadashi G. Takaoka
bf09cb2390 Reorder accented letters of English
Bug: 13177865
Change-Id: Idff0b6d08e6dd0ec1eb39072ba4f99e6ec7df802
2014-05-08 16:20:13 +09:00
Keisuke Kuroyanagi
08d12a1be3 Merge "Extend jni interface for dictionary migration." 2014-05-08 05:20:33 +00:00
Keisuke Kuroyanagi
1471fbad66 Extend jni interface for dictionary migration.
Bug: 13406708

Change-Id: Iadad6df296467d0e5b631fba4a409d53c8a5a6f2
2014-05-08 12:31:04 +09:00
Keisuke Kuroyanagi
9898ee6267 Check whether contacts have changed using hashCode().
Bug: 13755213
Change-Id: Ie2f7b7f9dc8bd3fce395618877d9f234287dcb21
2014-05-08 12:25:32 +09:00
Tadashi G. Takaoka
e3e331aebb Merge "Use margin instead of padding in SuggestionStripView" 2014-05-08 01:14:59 +00:00
Xiaojun Bi
50b5295d5d Merge "Use DistracterFilter when getting Language Model Param of a word" 2014-05-08 01:10:33 +00:00
Xiaojun Bi
17284659ce Use DistracterFilter when getting Language Model Param of a word
A preparation for implementing Distracter Filter.

This CL should be checked in together with Icfefa0463180

Bug: 13142176

Change-Id: If9e5ca840c4a81cb0339ab70f146b42fbfa7af5d
2014-05-07 10:10:18 -07:00
Tadashi G. Takaoka
2b479cccae Use margin instead of padding in SuggestionStripView
This CL also tunes the width of suggestions strip to be able to
display 15~16 letters without x-scaling at the center slot.

Bug: 14419121
Change-Id: Ia5766cee043899533e24e2ebc621e8dc279370b3
2014-05-07 19:12:28 +09:00
Keisuke Kuroyanagi
7d52f9b81c Fix: mIsUserDictEnabled is never updated.
Bug: 14602321

Change-Id: Ib98d5648ea2a901393b79c7f300bc6d209ee98d1
2014-05-07 16:45:37 +09:00
Ken Wakasa
0de529b4ca Fix NPE
Follow up to I2b0ec091a11aa8a495794d633efecb6d8b818f42

bug: 14488351
Change-Id: Ic88adbd6775910f35338d798dc0d5493715708e4
2014-05-03 00:33:41 +09:00
Tadashi G. Takaoka
71c96c079f Merge "Add Marathi keyboard layout" 2014-05-02 01:20:07 +00:00
Keisuke Kuroyanagi
8a7f670ec3 Merge "Remove Dictionaries.mDictMap." 2014-05-01 11:17:28 +00:00
Keisuke Kuroyanagi
c005c1dc56 Merge "Use dictType to class map to create sub dicts." 2014-05-01 10:16:58 +00:00
Keisuke Kuroyanagi
61fe28831d Merge "Create factory methods for sub dicts." 2014-05-01 10:07:24 +00:00
Keisuke Kuroyanagi
fb87c250cb Add contextual dictionary to the dictionary facilitator.
Bug: 14161647
Change-Id: I0e706b2abd0cb9f351e28681e275cd7f2fdbfd9c
2014-05-01 18:45:01 +09:00
Keisuke Kuroyanagi
d46855da72 Remove Dictionaries.mDictMap.
Bug: 13755213
Change-Id: I9ded695c31d3db05f561956c61d56ebd16d34703
2014-05-01 18:45:01 +09:00
Keisuke Kuroyanagi
99f2664871 Use dictType to class map to create sub dicts.
Bug: 13755213
Change-Id: I4dcd5684bc65f13361bf9c4f9d50b07b1e33c62d
2014-05-01 18:44:57 +09:00
Tadashi G. Takaoka
a5ab5d830c Add Marathi keyboard layout
Bug: 10028772
Change-Id: I7bca05bbbfdb2e5f61d5db611dff62ace3b71e31
2014-05-01 18:25:56 +09:00
Keisuke Kuroyanagi
c3b151957c Move dict version check to proper place.
Change-Id: I89a5b4fa93153081b4f7a9183619cbe7c9ea01fa
2014-05-01 17:28:24 +09:00
Keisuke Kuroyanagi
98e358a936 Create factory methods for sub dicts.
Bug: 13755213
Change-Id: I046af54b4860d2839328f2089ea785d81d04cf43
2014-05-01 17:22:23 +09:00
Tadashi G. Takaoka
20770f4ba0 Merge "Guard accessibility function calls" 2014-05-01 08:08:48 +00:00
Tadashi G. Takaoka
1ead609e6f Guard accessibility function calls
This is a follow up of I2b0ec091a1.

Change-Id: I2801bd1530556cfa6cc176efac9d9f09f2405892
2014-05-01 17:06:40 +09:00
Keisuke Kuroyanagi
765cbb81ba Merge "Simplify DictionaryFacilitatorForSuggest." 2014-05-01 07:55:31 +00:00
Jean Chalard
bedef0b4f0 Merge "Introduce clustering punctuation" 2014-05-01 07:01:04 +00:00
Keisuke Kuroyanagi
1ab6bfdc60 Simplify DictionaryFacilitatorForSuggest.
Bug: 13755213
Change-Id: I9663d1d60fccd8deb1a22683fb06fe64dee06b45
2014-05-01 15:51:03 +09:00
Jean Chalard
29c00ff538 Introduce clustering punctuation
Bug: 10081730
Change-Id: If198fa3df68ecb267da0a278da41fd509d6165f1
2014-05-01 15:45:24 +09:00
Tadashi G. Takaoka
3903e0d6e8 Merge "Make AccessibleKeyboardViewProxy not singleton" 2014-05-01 03:29:30 +00:00
Tadashi G. Takaoka
bca7e4e9a2 Make AccessibleKeyboardViewProxy not singleton
This CL also renames AccessibleKeyboardViewProxy and
AccessibilityEntityProvider to MainKeyboardAccessibilityDelegate and
MainKeyboardAccessibilityNodeProvider.

Change-Id: I2b0ec091a11aa8a495794d633efecb6d8b818f42
2014-05-01 12:24:54 +09:00
Jean Chalard
ec29147375 Merge "Some cleanup and reinforcement" 2014-05-01 03:04:29 +00:00
Jean Chalard
49d7871290 Some cleanup and reinforcement
Bug: 9520584
Change-Id: I1c0f9e1b530d4d5bf5f52c2905c20f5ab7c26442
2014-05-01 12:00:20 +09:00
Keisuke Kuroyanagi
a9f0a96377 Merge "Handle user dict as an ExpandableBinaryDictionary." 2014-04-30 12:44:25 +00:00
Keisuke Kuroyanagi
9ed7e47539 Handle user dict as an ExpandableBinaryDictionary.
Bug: 13755213
Change-Id: I2d242a3332e9633d4e41e08c0bbfafcefd814ecd
2014-04-30 20:35:08 +09:00
Yohei Yukawa
6d54f9f53c Merge "Fix the unintentional behavior change" 2014-04-30 11:33:11 +00:00
Yohei Yukawa
60003d5114 Fix the unintentional behavior change
I0188fa56cba8e introduced an unintentional behavior change
regarding the condition when the globe key is displayed
if LatinIME is running on KitKat or prior version.

With this CL, the previous behavior is back.

BUG: 12965588
BUG: 14426646
Change-Id: I112a327dce6ad2e40beb9a60d587e77b3954da82
2014-04-30 20:30:39 +09:00
Tadashi G. Takaoka
412ac4c573 Merge "TalkBack correct shift state" 2014-04-30 09:51:07 +00:00
Tadashi G. Takaoka
24536580bf TalkBack correct shift state
Change-Id: I3097805c6c8b4a4ac19fbe062f763e2639eb5cbf
2014-04-30 18:46:46 +09:00
Yohei Yukawa
1690992d1b Check OS codename for shouldOfferSwitchingToNextInputMethod
Make sure if Build.VERSION.CODENAME is "REL" or not when
Build.VERSION.SDK_INT is 19 (KitKat). This is a tentative
workaround until Build.VERSION.SDK_INT is bumped to 20 or
greater.

BUG: 12965588
Change-Id: I0f6a8ef92af221240d247997ce65bd5e351b2d5e
2014-04-30 17:08:04 +09:00
Keisuke Kuroyanagi
c0d754397e Fix unit tests by adding @UsedFortesting.
Change-Id: I8f66632a32b9e9ddc1b771e8ee74492c7baf9338
2014-04-29 00:00:57 +09:00
Keisuke Kuroyanagi
4426cbc59e Fix: contacts/user dicts are too frequently regenerated.
Change-Id: I6b04a58c543fda6df7a2c016b8b8a5300f137d73
2014-04-28 23:11:25 +09:00
Keisuke Kuroyanagi
f614de62aa Merge "Cleanup ExpandableBinaryDictionary." 2014-04-28 12:08:01 +00:00
Keisuke Kuroyanagi
b451f270f3 Cleanup ExpandableBinaryDictionary.
Bug: 8187060
Change-Id: I9103462412e727b0160b218b1bb301ce43621c46
2014-04-28 21:02:00 +09:00
Keisuke Kuroyanagi
c207955d4f Merge "Use ReentrantReadWriteLock in ExpandableBinaryDictionary." 2014-04-28 12:01:14 +00:00
Keisuke Kuroyanagi
1737b7ff5c Use ReentrantReadWriteLock in ExpandableBinaryDictionary.
Bug: 8187060
Change-Id: Ic665f0a5e940708aa9addedac068a64900b307e7
2014-04-28 20:56:01 +09:00
Keisuke Kuroyanagi
2367f8f602 Merge "Simplify asyncFlushBinaryDictionary." 2014-04-28 08:44:52 +00:00
Keisuke Kuroyanagi
570602a088 Simplify asyncFlushBinaryDictionary.
We no longer write files when the dict has not been updated.

Bug: 8187060
Change-Id: I8aa23a93d5deafb3a7f16f5466a5e0e84fbbf095
2014-04-28 17:30:36 +09:00
Keisuke Kuroyanagi
5c1416e426 Merge "Remove DictionaryUpdateController." 2014-04-28 08:29:02 +00:00
Keisuke Kuroyanagi
dff7153820 Merge "Use different user dict name for spell checker." 2014-04-28 08:12:17 +00:00
Keisuke Kuroyanagi
a5202c7143 Merge "Use different contacts dict name for spell checker." 2014-04-28 07:58:41 +00:00
Keisuke Kuroyanagi
07c5b307d6 Remove DictionaryUpdateController.
Bug: 8187060
Change-Id: I3e1fa4060d8a5c12d8d609be3357d56051fb5815
2014-04-28 16:58:27 +09:00
Keisuke Kuroyanagi
c5de887fd2 Merge "Move dicts for spellchecker to under spellcheck." 2014-04-28 07:51:29 +00:00
Keisuke Kuroyanagi
6256ec0587 Merge "Fix: Typed word is not included in more suggestions." 2014-04-28 07:46:21 +00:00
Keisuke Kuroyanagi
817cd9a0d5 Use different user dict name for spell checker.
Bug: 13630847
Change-Id: Icabd08c674dcf086250b9e594328a43286d1d203
2014-04-28 16:31:20 +09:00
Keisuke Kuroyanagi
60763a06e8 Use different contacts dict name for spell checker.
Bug: 13630847
Change-Id: I016a464890d5e63794fb1288b4ce7b09adffc453
2014-04-28 16:25:10 +09:00
Keisuke Kuroyanagi
24ec8bd91b Move dicts for spellchecker to under spellcheck.
Bug: 13630847

Change-Id: Iadcf5b31f66fb73efc5c640e96e8c2106a0224dd
2014-04-28 16:24:35 +09:00
Keisuke Kuroyanagi
a8c4731eab Fix: Typed word is not included in more suggestions.
Happened when top suggestion is long and auto-corrected.
Bug: 13738879

Change-Id: I47c2dfb34cfc92b54cfe54c432ee2f646fe454e5
2014-04-28 16:21:27 +09:00
Yohei Yukawa
91db602b83 Merge "Use shouldOfferSwitchingToNextInputMethod when available" 2014-04-28 06:58:02 +00:00
Yohei Yukawa
8ba4f33709 Use shouldOfferSwitchingToNextInputMethod when available
With this CL, LatinIME starts using
InputMethodManager#shouldOfferSwitchingToNextInputMethod when
available and API level is higher than 19 (KitKat).

Note that relevant settings of LatinIME will be ignored if
InputMethodManager#shouldOfferSwitchingToNextInputMethod is
considered to be available at the moment. We will revisit
here to reorganize the user visible settings before the
new global IME switching mechanism becomes publicly
available.

BUG: 12965588
Change-Id: I0188fa56cba8e983c61cef3ae3400a0e3821f718
2014-04-28 15:11:19 +09:00
Tadashi G. Takaoka
0b42851eed Merge "Move some advanced settings to debug settings" 2014-04-28 05:30:28 +00:00
Tadashi G. Takaoka
2cc7c3321d Merge "Remove unnecessary reference to LatinIME" 2014-04-25 22:20:58 +00:00
Tadashi G. Takaoka
7a78127a56 Remove unnecessary reference to LatinIME
Change-Id: Idbb45c504499d39bbf272fae84ea71a83bf4dd69
2014-04-25 15:09:39 -07:00
Keisuke Kuroyanagi
169acbf9f0 Add null check in createDistracterFilter().
Change-Id: Iff2b73081d48f32b1d3a5d5b32c9734979362c23
2014-04-25 13:36:46 -07:00
Tadashi G. Takaoka
a3920c7e6a Move some advanced settings to debug settings
This CL moves "Show slide indicator" and "Key long press delay"
advanced options to the debug settings.

Bug: 11866784
Change-Id: Iec16e09ba6e7c9f82ce0fa73a0d75766b843b44b
2014-04-25 12:03:47 -07:00
Xiaojun Bi
516c884b11 Merge "Prepare to implement distracter filter" 2014-04-25 17:15:53 +00:00
Xiaojun Bi
281dd99346 Prepare to implement distracter filter
It was implemented according to the Plan B in the
design doc:
http://go/ime-misspelling-filter

This CL is to create a DistracterFilter instance
and pass it to PersonalizationDictionarySessionRegistrar.

This patch should be checked in together with
Id633b4fd45693

Bug: 13142176
Change-Id: Ia4957e64218c9619fcf9bb91795a187617c72a2e
2014-04-25 09:13:22 -07:00
Keisuke Kuroyanagi
e581d8f8ab Merge "Fix: contains() is wrongly used in hasDict()." 2014-04-25 07:58:19 +00:00
Keisuke Kuroyanagi
bdf31fb75e Fix: contains() is wrongly used in hasDict().
Change-Id: I4699b1b75fed9dd479f5135f0a7a2dd098e6f798
2014-04-25 00:56:27 -07:00
Keisuke Kuroyanagi
1ed248dc2f Merge "Fix: Wrong null check for user history dict." 2014-04-25 06:48:16 +00:00
Keisuke Kuroyanagi
93f4aec07c Fix: Wrong null check for user history dict.
Change-Id: Idf0bcc44247e35cd95f9482d2a8017329fc977bb
2014-04-24 23:08:48 -07:00
Keisuke Kuroyanagi
a9861ac814 Merge "Handle personalization dictionary as an ExpandableBinaryDictionary." 2014-04-25 04:56:14 +00:00
Keisuke Kuroyanagi
194d64fa58 Merge "Handle contacts dictionary as an ExpandableBinaryDictionary." 2014-04-25 04:54:09 +00:00
Keisuke Kuroyanagi
56e4848ead Handle personalization dictionary as an ExpandableBinaryDictionary.
Bug: 13755213
Change-Id: I26e070e89e09b37e9dcc200d597c74c591467a66
2014-04-24 21:37:49 -07:00
Keisuke Kuroyanagi
98e276a0ec Merge "Quit creating empty dictionary file in ExpandableBinaryDictionary." 2014-04-25 04:36:55 +00:00
Keisuke Kuroyanagi
62c110a4c0 Handle contacts dictionary as an ExpandableBinaryDictionary.
Bug: 13755213
Change-Id: I0eb5055f9cdf5e1df337cdace9bf0919d4d365d3
2014-04-24 21:36:30 -07:00
Keisuke Kuroyanagi
3d2a9af20a Merge "Handle user history dictionary as an ExpandableBinaryDictionary." 2014-04-25 04:30:39 +00:00
Keisuke Kuroyanagi
a933776bf1 Merge "Simplify DictionaryFacilitatorForSuggest to be flexible." 2014-04-25 04:29:50 +00:00
Keisuke Kuroyanagi
67c0ed8f8c Handle user history dictionary as an ExpandableBinaryDictionary.
Bug: 13755213
Change-Id: I1ea8a6df007af7153852f2d32bf5e8ec669c432b
2014-04-24 14:48:01 -07:00
Tadashi G. Takaoka
e2651aa450 Merge "Announce keyboard language when TalkBack is on" 2014-04-24 20:40:31 +00:00
Keisuke Kuroyanagi
3d658a63ca Merge "Remove clearAndFlushDictionary() and use clear()." 2014-04-24 18:29:05 +00:00
Keisuke Kuroyanagi
978958a41f Simplify DictionaryFacilitatorForSuggest to be flexible.
Bug: 13755213
Change-Id: I151269a7038b72a33b436da4c7596e09949e6d00
2014-04-24 11:25:50 -07:00
Keisuke Kuroyanagi
2dcb5c1b4d Remove clearAndFlushDictionary() and use clear().
clearAndFlushDictionary() was needed when dictionaries are constructed
in java side. All expandable dictionaries now use native code; thus,
this method is same to clear() and no longer needed.

Bug: 13755213
Change-Id: Ifd836e64f8ff807930f7cd2319b103b65e8fce70
2014-04-24 11:25:47 -07:00
Tadashi G. Takaoka
b9e0b99765 Merge "Fix handling shift + enter" 2014-04-24 02:38:46 +00:00
Tadashi G. Takaoka
393da03c8e Fix handling shift + enter
Bug: 14278758
Change-Id: Id77c99b83cc69855972b27c9cebd482c8cbd3539
2014-04-23 19:22:00 -07:00
Tadashi G. Takaoka
f7edc6582a Move simulateKeyPress method to AccessibleKeyboardViewProxy
Change-Id: Ic14ff70c7c8475983cf02dc1ba4d5a5f7769aa16
2014-04-23 17:48:27 -07:00
Tadashi G. Takaoka
3cf759074a Announce keyboard language when TalkBack is on
Bug: 13013501
Change-Id: I0595abafbc177f776676cb3560f3990da9328db2
2014-04-23 13:53:06 -07:00
Keisuke Kuroyanagi
7de3d0eed7 Merge "Fix: Reporting wrong main dictionary availability." 2014-04-22 23:32:50 +00:00
Keisuke Kuroyanagi
de4d401038 Fix: Reporting wrong main dictionary availability.
Bug: 13965806
Change-Id: Ida2234ab8cb7785ec5efd433a58949bf21c44351
2014-04-22 16:24:22 -07:00