9d313c6ce9
Merge "[FD3] Split stackNodes into two methods."
2013-07-24 08:39:00 +00:00
429db8d61e
[FD3] Split stackNodes into two methods.
...
In the future we need to have a method that computes only
from the size, as we used to have, to initialize the cached
addresses, and a much simpler and faster method to copy
the cached sizes.
Bug: 8526576
Change-Id: I6a5a790303ab8f3bf957c7ca266eb12da7c1ad9e
2013-07-24 17:26:16 +09:00
3014ff643f
am 2c479e78: Merge "Update dictionaries"
...
* commit '2c479e783b86b3776cc6d5e9d9a71068b95b6947':
Update dictionaries
2013-07-24 00:27:34 -07:00
2c479e783b
Merge "Update dictionaries"
2013-07-24 07:25:05 +00:00
0c3a9b549c
Make RunInLocale as top-level class
...
Change-Id: I07ed606b7aba098a5be85533e5baff300b21fb44
2013-07-24 16:00:25 +09:00
a410cb48ea
Move subtype related utility class to utils package
...
Change-Id: I3564796531ea85f2ebafde40cd822b806b8741df
2013-07-24 15:52:43 +09:00
470cd988a4
am 9d802202: Merge "Temporarily disabled Azerbaijani subtype"
...
* commit '9d802202d73592ed18f2fe7835eff6156497e39d':
Temporarily disabled Azerbaijani subtype
2013-07-23 23:41:52 -07:00
9d802202d7
Merge "Temporarily disabled Azerbaijani subtype"
2013-07-24 06:38:57 +00:00
f0046aea26
Update dictionaries
...
en, en_GB, en_US:
Add "id" -> "I'd" whitelist entry
Reinstate "id" and "ID" in the respective dicts
fr:
Remove many words that are not French
Change "google" to "Google"
pt_BR:
Delete "idéia"
Change-Id: I942266ac7995345580926f60de45d202aa257ae7
2013-07-24 12:10:06 +09:00
d94de42cb4
Temporarily disabled Azerbaijani subtype
...
Bug: 9698902
Change-Id: Ib8a38f85f44909bfba42eaf70407d5bd7346feb2
2013-07-24 11:13:31 +09:00
9b4d0c7047
am 5526d138: Merge "[FD2] Separate cached address before/after update for nodes."
...
* commit '5526d138fe76e7d19a58ab68c9ba7a0354172daa':
[FD2] Separate cached address before/after update for nodes.
2013-07-23 18:57:46 -07:00
5526d138fe
Merge "[FD2] Separate cached address before/after update for nodes."
2013-07-24 01:56:02 +00:00
d7da546fbb
am 6587773f: Merge "Add default keypress vibration duration of HTC J One"
...
* commit '6587773fcfa26fa277901315859397005e3d1f27':
Add default keypress vibration duration of HTC J One
2013-07-23 07:10:52 -07:00
6587773fcf
Merge "Add default keypress vibration duration of HTC J One"
2013-07-23 14:08:56 +00:00
14ac4bf1e9
am b9eb3267: Cosmetic fix for the copyright header
...
* commit 'b9eb32679f27b28051fdd0c5e7cc59805f0bf20f':
Cosmetic fix for the copyright header
2013-07-23 03:43:13 -07:00
b9eb32679f
Cosmetic fix for the copyright header
...
Change-Id: I2a93ac21571d1f6255a72a1a238b03dbb95108de
2013-07-23 19:39:03 +09:00
3029b25000
Add default keypress vibration duration of HTC J One
...
This change also removes obsolete HTC One Google Play edition's model
name.
Change-Id: Ic396d1a2288c8926782c3f0bc930170d468c047b
2013-07-23 19:38:29 +09:00
dc3b0c812a
am 50a29b80: Merge "Fix wrong copyright header comment"
...
* commit '50a29b808257b71710f2c3dab04030b883e40d83':
Fix wrong copyright header comment
2013-07-23 03:31:20 -07:00
50a29b8082
Merge "Fix wrong copyright header comment"
2013-07-23 10:29:05 +00:00
db341afc65
Fix wrong copyright header comment
...
Change-Id: I75ffbc0508c00f7ac8004b764667a174b6ab0b63
2013-07-23 19:26:05 +09:00
116bfe9356
am 8c04df20: Temporarily disabled Kazakh subtype
...
* commit '8c04df2006a0ff1f0733c7344aeb62e875cba4bb':
Temporarily disabled Kazakh subtype
2013-07-23 03:14:15 -07:00
8c04df2006
Temporarily disabled Kazakh subtype
...
Bug: 9698902
Change-Id: Ic44ef378a979de364ce56aa41c6c3c95fec9709c
2013-07-23 18:34:06 +09:00
91cbe3566d
[FD2] Separate cached address before/after update for nodes.
...
Bug: 8526576
Change-Id: Ib9f8594a9e12dc75eba296faff2612c4bd7483d3
2013-07-23 17:52:54 +09:00
34476d0205
am a005d09d: Merge "Fix prefs.xml"
...
* commit 'a005d09dd186254a50c60fb86b8b20012c561be3':
Fix prefs.xml
2013-07-22 21:30:26 -07:00
318cb109f1
Fix prefs.xml
...
This is a follow up of Id170dbfe2d.
Change-Id: I52e4f44b7d135f51551b912c44e1dd354c16d125
2013-07-23 13:24:45 +09:00
20c03e2d16
am e6c51847: Fix NPE in SubtypeLocale.getSubtypeDisplayName
...
* commit 'e6c51847426121246cc8b48f42f8f5668db71cdb':
Fix NPE in SubtypeLocale.getSubtypeDisplayName
2013-07-22 21:04:22 -07:00
e6c5184742
Fix NPE in SubtypeLocale.getSubtypeDisplayName
...
This change moves the methods that create the subtype display name for
spacebar from MainKeyboardView to SubtypeLocale class, and
consolidates SpacebarTextTests with SubtypeLocaleTests.
Bug: 9962955
Change-Id: Ifa0a08ff80bc30753a213c2feb471599ca63fa66
2013-07-23 13:00:04 +09:00
0f38876a62
am 1676b838: Merge "Fix a bug when moving the pointer in a > 48 chars word"
...
* commit '1676b8387f753212da2642f6caf6b838e649d827':
Fix a bug when moving the pointer in a > 48 chars word
2013-07-22 01:30:59 -07:00
4c606e6a25
am a6906a62: Merge "Move settings related classes to "settings""
...
* commit 'a6906a62483dbb2a60ef1477c46b84035a26e6b7':
Move settings related classes to "settings"
2013-07-22 01:30:58 -07:00
1676b8387f
Merge "Fix a bug when moving the pointer in a > 48 chars word"
2013-07-22 08:04:43 +00:00
5fa2202e36
Fix a bug when moving the pointer in a > 48 chars word
...
Bug: 9892261
Change-Id: I9db20c5b20a0764bd9f5b5e2bdc98180bbb9ec15
2013-07-22 17:02:09 +09:00
a6906a6248
Merge "Move settings related classes to "settings""
2013-07-22 08:01:11 +00:00
a7d2fc6bef
Move settings related classes to "settings"
...
Change-Id: Id170dbfe2dcfc93130b7be4a84615940403ec37f
2013-07-22 16:35:44 +09:00
3b84f81ba4
am 71dc7a38: Fix missing Devanagari digit 9
...
* commit '71dc7a3876de2f8b10ca3cdc3b70015a29d2b978':
Fix missing Devanagari digit 9
2013-07-21 23:05:50 -07:00
71dc7a3876
Fix missing Devanagari digit 9
...
Change-Id: I487cb5177a6680ad8852a045392c10a324524df6
2013-07-22 14:55:46 +09:00
b62a5ed1e1
am dc711101: Merge "Fix IllegalArgumentException in MoreKeysKeyboard"
...
* commit 'dc7111013f84ca5f82998a875054c28fec829358':
Fix IllegalArgumentException in MoreKeysKeyboard
2013-07-18 23:46:51 -07:00
dc7111013f
Merge "Fix IllegalArgumentException in MoreKeysKeyboard"
2013-07-19 06:44:54 +00:00
db07b716fd
am a4c44654: Merge "Move a couple classes to the utils package"
...
* commit 'a4c44654beb008b5f623f8c30b2e713b720aa457':
Move a couple classes to the utils package
2013-07-18 20:15:05 -07:00
a4c44654be
Merge "Move a couple classes to the utils package"
2013-07-19 03:13:57 +00:00
edc2bb730e
am 2e0f750a: Reorder more keys of ALEF in Arabic and Persian
...
* commit '2e0f750abb7bd209d87acfdd1045a4269cb12558':
Reorder more keys of ALEF in Arabic and Persian
2013-07-18 19:45:55 -07:00
b0e76724ed
Fix IllegalArgumentException in MoreKeysKeyboard
...
It seems that MainKeyboardView.getMeasuredWidth() returns weird
value. Using KeyboardId.mWidth as main keyboard width may resolve the
issue.
Bug: 9684622
Change-Id: I975bfb934b8d2448e72555a3ccae0123341186b9
2013-07-19 11:43:50 +09:00
2e0f750abb
Reorder more keys of ALEF in Arabic and Persian
...
Regarding the frequency of letters, the visual order of the more keys
of Alef should be (in a left-to-righ fashion):
[Arabic]
1. Alef Madda above
2. Hamza
3. Alef Hamza above <-- center of the more keys
4. Alef Hamza below
5. Alef Wasla
[Persian]
1. Alef Wasla
2. Hamza
3. Alef Madda above <-- center of the more keys
4. Alef Hamza above
5. Alef Hamza below
Bug: 9371393
Change-Id: I5f458f1123fccb992b684878dacf15cce804bd51
2013-07-19 10:52:16 +09:00
b03447e1af
Move a couple classes to the utils package
...
Change-Id: Ia14a2011d79bad7cd02697b9254705f6e2099442
2013-07-19 10:46:46 +09:00
def0cb3587
am 03a76a07: Merge "Restrict bogus events hack to certain classes of tablets"
...
* commit '03a76a07e2454271e67cfe1a6b563e7e32087a06':
Restrict bogus events hack to certain classes of tablets
2013-07-18 01:42:22 -07:00
03a76a07e2
Merge "Restrict bogus events hack to certain classes of tablets"
2013-07-18 08:40:44 +00:00
536438a45e
Restrict bogus events hack to certain classes of tablets
...
Bug: 9061320
Change-Id: Ib8c6a5e6db5da99c447bc00867fed51ca959cc3a
2013-07-18 15:49:11 +09:00
7a54dc88c4
am 257750d9: [FD1] Move parents\' address computation outside
...
* commit '257750d988b2f6499d5f7b2439c8f46df9ea3369':
[FD1] Move parents' address computation outside
2013-07-17 04:53:17 -07:00
257750d988
[FD1] Move parents' address computation outside
...
There is no need to do it repeatedly in this loop: it's
clearer and faster to do it at the end only.
Bug: 8526576
Change-Id: I707571179c89479830891ec6d4fd06a9fffed7c1
2013-07-17 20:47:53 +09:00
a62621ca56
am 1a894aeb: Merge "Distinguish key press in repeat key"
...
* commit '1a894aeb82b635d345fbdf1e520d7c21395d7acb':
Distinguish key press in repeat key
2013-07-16 03:28:22 -07:00
1a894aeb82
Merge "Distinguish key press in repeat key"
2013-07-16 10:26:10 +00:00
6455172a70
Distinguish key press in repeat key
...
Bug: 9859367
Change-Id: Iad643f9785b193e1918a8363de4fefc3b7558bdf
2013-07-16 19:21:16 +09:00
8ab3c1bf44
am d893fe5d: Merge "Don\'t put spaces before and after asterisks"
...
* commit 'd893fe5dbb81c77ebe8040cf46e4747d2b4e4095':
Don't put spaces before and after asterisks
2013-07-16 01:31:18 -07:00
d893fe5dbb
Merge "Don't put spaces before and after asterisks"
2013-07-16 08:07:53 +00:00
c4c6d05c6f
am 488659e1: Merge "Add xxhdpi assets"
...
* commit '488659e1541f5b6ea915682736d73256d601222d':
Add xxhdpi assets
2013-07-16 00:34:03 -07:00
488659e154
Merge "Add xxhdpi assets"
2013-07-16 07:31:43 +00:00
d160926659
am 2bc980ee: Merge "Serialize commands sent to a separate threads"
...
* commit '2bc980ee28f899f9647b2f1d64569c1bf0a062fc':
Serialize commands sent to a separate threads
2013-07-16 00:23:36 -07:00
2bc980ee28
Merge "Serialize commands sent to a separate threads"
2013-07-16 07:21:07 +00:00
6a7a569831
Serialize commands sent to a separate threads
...
Bug: 9715797
Change-Id: I1eda4d2f0056f70cfb8a92d658e0875706efc170
2013-07-16 15:54:39 +09:00
20d498a78d
Add xxhdpi assets
...
Bug: 8976566
Change-Id: I00034994fe2c619e91362cbaddc722597a1ae22f
2013-07-16 15:46:04 +09:00
0a951d55a0
am 0d47f284: Merge "Move punctuations to more key of z in dvorak"
...
* commit '0d47f2844809afb173a54a38ff582c909af4c069':
Move punctuations to more key of z in dvorak
2013-07-15 23:03:54 -07:00
0d47f28448
Merge "Move punctuations to more key of z in dvorak"
2013-07-16 06:02:22 +00:00
8850a158f8
am 988a1f31: Merge "Fix a bug with bad view reuse."
...
* commit '988a1f3132d2e13fcd108ef945f91d9f30d8e222':
Fix a bug with bad view reuse.
2013-07-15 22:46:07 -07:00
988a1f3132
Merge "Fix a bug with bad view reuse."
2013-07-16 05:43:15 +00:00
a45075f3ca
am 4d4310df: Merge "Fix a wrong call to cancel downloads"
...
* commit '4d4310df755a12be7b93f18c25f8e2389c33831c':
Fix a wrong call to cancel downloads
2013-07-15 22:42:54 -07:00
4d4310df75
Merge "Fix a wrong call to cancel downloads"
2013-07-16 05:40:16 +00:00
ac675de10d
Move punctuations to more key of z in dvorak
...
Bug: 9862531
Change-Id: I957729b30e5cf3cf6f3f1ea4bb643922bc7ed068
2013-07-16 14:36:13 +09:00
6912342a48
Fix a bug with bad view reuse.
...
There are many ways to fix this problem but this is the most
direct way. Removing a view from the cache when any animation
is started will ensure it won't be used again, and will be garbage
collected when it's possible. Since views are created on demand
anyway, a new one will just get created when needed, and that's
it.
Bug: 9400128
Change-Id: I4945d2859d642e79694d51ae90cf4f5bde9a5f1d
2013-07-16 14:12:55 +09:00
1a16cdc60c
am 4944827e: Merge "Add methods for dynamic updating binary dictionary."
...
* commit '4944827e0fdb5657a7f9305c317464edb0ef2b08':
Add methods for dynamic updating binary dictionary.
2013-07-15 19:47:53 -07:00
4944827e0f
Merge "Add methods for dynamic updating binary dictionary."
2013-07-16 02:45:01 +00:00
83196d0b57
am 8bfd5782: Merge "Do not output string-encoded MotionEvent."
...
* commit '8bfd57820f840d82dafad33c1d2f44c54f461fc1':
Do not output string-encoded MotionEvent.
2013-07-15 10:38:59 -07:00
8bfd57820f
Merge "Do not output string-encoded MotionEvent."
2013-07-15 17:36:56 +00:00
d6c621cd87
Don't put spaces before and after asterisks
...
Change-Id: I3c87745c3d4e7a0c531f6c2e68120fada556b44b
2013-07-12 13:37:40 +09:00
faa729c47c
Fix a wrong call to cancel downloads
...
This resulted in downloads not being correctly canceled.
Bug: 9715797
Change-Id: I786d869977df225f85cb69ec7ea9c96b039258fe
2013-07-11 17:15:45 +09:00
0abf16a331
Import translations. DO NOT MERGE
...
Change-Id: I580f44f5334d0af91339646c0cfe94293f96711f
Auto-generated-cl: translation import
2013-07-10 23:56:58 -07:00
551091ef39
am cfbb7fbd: Fix: Read lock is wrongly used for gutSuggestions.
...
* commit 'cfbb7fbd48125909ed61e58500e56b06afc12709':
Fix: Read lock is wrongly used for gutSuggestions.
2013-07-09 01:54:44 -07:00
cfbb7fbd48
Fix: Read lock is wrongly used for gutSuggestions.
...
Bug: 9737865
Change-Id: I017f80b46c5dc48c40f2de7c4d516a042992feb4
2013-07-09 08:40:43 +00:00
8eddeffdaf
Import translations. DO NOT MERGE
...
Change-Id: I94e8a1dd3472e65b3c784ba285514a9117d3c776
Auto-generated-cl: translation import
2013-07-08 12:31:49 -07:00
70147fa026
am 58b2a637: Merge "Update ExpandableDictionary.BASE_CHARS[]"
...
* commit '58b2a6372fd0404e27bbe137bbac18bbdf70e153':
Update ExpandableDictionary.BASE_CHARS[]
2013-07-07 20:23:59 -07:00
58b2a6372f
Merge "Update ExpandableDictionary.BASE_CHARS[]"
2013-07-08 03:22:15 +00:00
d0ca62678d
Update ExpandableDictionary.BASE_CHARS[]
...
This should be the same as CharUtils::BASE_CHARS[] in the native code.
Change-Id: I72ed4a43fd5c26a4439ef791b6b1cf703845c3a1
2013-07-05 20:29:21 +09:00
a5424c82a9
am f5be54f7: Merge "Move TypefaceUtils and ViewUtils to utils package"
...
* commit 'f5be54f710e2855b88f51bfb34b60742ebe3913c':
Move TypefaceUtils and ViewUtils to utils package
2013-07-05 03:36:45 -07:00
b6b6fa7dcf
am bac479bb: Merge "Reorganize Utils class"
...
* commit 'bac479bbe1d6daa074c375845bb3af42c931ecbd':
Reorganize Utils class
2013-07-05 03:36:44 -07:00
ccf4a31027
Move TypefaceUtils and ViewUtils to utils package
...
Change-Id: Iccd47c27670248c43de9a539c1951111d7733111
2013-07-05 19:24:59 +09:00
4be6198cb7
Reorganize Utils class
...
Change-Id: I7294d1547def5dcfcae9d1d53b277cb3cc9f2d18
2013-07-05 19:24:40 +09:00
c85efa92bf
am 72c2feb5: Use TimeUnit instead of DateUtils for readability
...
* commit '72c2feb57369527b5f0d2b89505f94503978b928':
Use TimeUnit instead of DateUtils for readability
2013-07-05 02:25:08 -07:00
72c2feb573
Use TimeUnit instead of DateUtils for readability
...
Bug: 9550800
Change-Id: I087205530a5dbcff4bf08f48f4aa7068aae93215
2013-07-05 17:57:01 +09:00
c29acb5b69
am cb13d11c: Add a trace.
...
* commit 'cb13d11c0af95b0621c012be9c01e04a463e40c5':
Add a trace.
2013-07-04 21:12:54 -07:00
cb13d11c0a
Add a trace.
...
Emit a trace when a new dictionary is copied to LatinIME
successfully, not just when it fails. That will help diagnosing
some problems by being able to ensure this step succeeded
looking at the log.
This does not happen often (like, maybe 3 times at device
activation, and once every few weeks afterwards), so I think
the extra line in the log is more than acceptable.
Change-Id: I1674bc22d950a7be801076c5aa7e8bbebccab14b
2013-07-05 12:44:47 +09:00
89ca0e13d1
am 49910a9d: Merge "Fix: release lock in UserHistoryDictionary."
...
* commit '49910a9d774120479d89f537c7e1b4d43e6f153a':
Fix: release lock in UserHistoryDictionary.
2013-07-04 08:14:58 -07:00
49910a9d77
Merge "Fix: release lock in UserHistoryDictionary."
2013-07-04 15:13:09 +00:00
06e8860e3d
am db296305: Merge "DictionaryWriter to abstract binary dictionary writing."
...
* commit 'db296305d61f9d7c8f9121eb0e663d3d0a2f6ecc':
DictionaryWriter to abstract binary dictionary writing.
2013-07-04 07:17:13 -07:00
65db026265
Fix: release lock in UserHistoryDictionary.
...
Change-Id: I050c252910c6b5b0a79cd2d52c525679f2d6091d
2013-07-04 23:12:49 +09:00
f8d2796724
Add methods for dynamic updating binary dictionary.
...
Bug: 6669677
Change-Id: I7e681ceec2af712214a647630350cb20be6b0354
2013-07-04 21:17:49 +09:00
edd1992ed3
DictionaryWriter to abstract binary dictionary writing.
...
UserHistoryDictionary should become to use ExpandableBinaryDictionary.
Bug: 6669677
Change-Id: I6831c7dd2d84207d1a8f51ba15d52e0a72205d0c
2013-07-04 21:06:04 +09:00
2babbfb8b0
am fe202d67: Add Azerbaijani keyboard
...
* commit 'fe202d6738e57187925560bdac9051468aadd63e':
Add Azerbaijani keyboard
2013-07-03 22:59:31 -07:00
fe202d6738
Add Azerbaijani keyboard
...
Bug: 7963448
Change-Id: I39c192b342278e82e30ac6ef12c6d150c817ae70
2013-07-04 14:47:33 +09:00
ed69cc3163
am 0e007eaf: Add Kazakh keyboard
...
* commit '0e007eaff6c2b0c583de17970f1c8ecddadd6fd5':
Add Kazakh keyboard
2013-07-03 22:47:00 -07:00
0e007eaff6
Add Kazakh keyboard
...
Bug: 9697273
Change-Id: Ic9943569ed60d601f093181bf135e45a25399121
2013-07-04 13:10:38 +09:00
6d7c647470
Do not output string-encoded MotionEvent.
...
JsonUtils knows how to output MotionEvents into json; that mechanism
should be reused for SuddenJumpingTouchEventHandler.
Change-Id: Id4c36c05533a3a329bf43ba33d57c0830dc4d196
2013-07-03 10:13:59 -07:00
9ed68c84c0
am 55de0bd9: Merge "Use ReentrantReadWriteLock in ExpandableBinaryDictionary."
...
* commit '55de0bd981d6dc3ad4465c654d60072604ed1f9d':
Use ReentrantReadWriteLock in ExpandableBinaryDictionary.
2013-07-03 04:40:27 -07:00
55de0bd981
Merge "Use ReentrantReadWriteLock in ExpandableBinaryDictionary."
2013-07-03 11:39:17 +00:00
41f1399b2b
am 88d0138d: Merge "Add missing letter THEH to Perisan keyboard layout"
...
* commit '88d0138d9818b49d37cf44a25b96440ea0fba507':
Add missing letter THEH to Perisan keyboard layout
2013-07-03 04:08:45 -07:00
b7c3c75e73
am d3ef3f0a: Merge "Add missing letter THEH to Arabic keyboard layout"
...
* commit 'd3ef3f0ac713c80d366061adac116c3cdb10ce98':
Add missing letter THEH to Arabic keyboard layout
2013-07-03 04:08:44 -07:00
5b3a54fada
Add missing letter THEH to Perisan keyboard layout
...
With this change, the phone keyboard layout use quite similar one of
the oridinal PC. The differences from the ordinal PC keyboard layout
are:
- Add letter JEH between letter TAH and ZAIN at 3rd row.
- Move letter TCHEN from the most left of 1st row to the most left of
3rd row.
The tablet keyboard layout is the same of of the phone except:
- Add letter ALEF with MADDA above between letter WAW and letter TCHEN
at 3rd row.
This change also moves the delete key and the enter key on tablet to
1st and 2nd row respectively.
Bug: 9371393
Change-Id: I964589055eb15549fe20e5ec45e02f7dc6b5686e
2013-07-03 19:50:14 +09:00
614347bfd9
Add missing letter THEH to Arabic keyboard layout
...
With this change, the tablet keyboard layout both 7inch and 10inch use
quite similar one of the ordinal PC. The differences from the ordinal
PC keyboard layout are:
- Move letter THAL from the most left of digits' row to the most left
of 3rd row.
- Move letter DAL from the most right of 1st row to the most right of
3rd row.
- Omit ligature LAM with ALEF from 3rd row and move to more keys of
letter LAM on 2nd row.
The phone keyboard layout is the same one of the tablet except:
- Omit letter YEH with HAMZA avobe from 3rd row and move to more keys
of letter ALEF MAKSURA on 3rd row.
Bug: 9371393
Change-Id: I1cd164ce7c1c3a5cae67b9985f1b167aef028ca0
2013-07-03 19:49:16 +09:00
0b1c08bf5a
Use ReentrantReadWriteLock in ExpandableBinaryDictionary.
...
Bug: 6669677
Change-Id: I2acde0517d5ed5cbd7b7149709e35fc36651335d
2013-07-03 19:46:08 +09:00
9caf1791f2
am d365d82d: Merge "Handling key repeat by emulating key press and code input"
...
* commit 'd365d82d518e75eff3e9fb67a5ce24c73f83eaed':
Handling key repeat by emulating key press and code input
2013-07-02 12:33:13 -07:00
f87e8f7ec1
Handling key repeat by emulating key press and code input
...
This change also eliminates a reference of
AudioAndHapticFeedbackManager from KeyboardSwitcher and MainKeyboard.
Bug: 6522943
Change-Id: Iac42ec8ff00c66deb76a660ffc07477923a58959
2013-07-02 19:50:34 +09:00
0fed749de6
am e5a3b776: Merge "Move Range out of RichInputConnection and rename it."
...
* commit 'e5a3b77664db1ecfd95601a806649f063eb604d3':
Move Range out of RichInputConnection and rename it.
2013-07-01 00:22:38 -07:00
e5a3b77664
Merge "Move Range out of RichInputConnection and rename it."
2013-07-01 07:20:51 +00:00
d749af1664
am 109ba3ac: Merge "Regenerate old version dictionaries using new format."
...
* commit '109ba3ace3815a7650a9fb0485b187968ddf8c29':
Regenerate old version dictionaries using new format.
2013-07-01 00:18:25 -07:00
109ba3ace3
Merge "Regenerate old version dictionaries using new format."
2013-07-01 07:16:15 +00:00
0ae2498bbb
am 70ee2201: Merge "Do not re-resume suggestion if it\'s not needed."
...
* commit '70ee2201a09af63f9fc87b408cc9b48c25a39605':
Do not re-resume suggestion if it's not needed.
2013-07-01 00:14:12 -07:00
70ee2201a0
Merge "Do not re-resume suggestion if it's not needed."
2013-07-01 07:12:24 +00:00
544e36d961
am 3f0858eb: Fix a bug where no URL means refresh never ends
...
* commit '3f0858eb2bcb9414dd94e01991b02c785af7b871':
Fix a bug where no URL means refresh never ends
2013-06-30 23:45:47 -07:00
675bcf191c
Move Range out of RichInputConnection and rename it.
...
Range has grown a bit too big to stay an internal class.
Change-Id: Ic3fbc48a5d10776eedd7559c4d696e5926b88288
2013-07-01 15:41:13 +09:00
a62b5b22ef
Regenerate old version dictionaries using new format.
...
Bug: 9617181
Change-Id: I228a3eac959f81b38e4092015e8e3c429d46fa60
2013-07-01 15:25:33 +09:00
3f0858eb2b
Fix a bug where no URL means refresh never ends
...
This patch does two things:
- If there is no URL to download new data from, then the
Refresh button is not shown.
- Even if for some reason refresh starts for a client for
which there is no URL, loading correctly finishes.
Bug: 9388602
Change-Id: I3fd9214da50faa4b59d0bd3e775293dd34f07547
2013-07-01 14:47:30 +09:00
f0af452ce2
Do not re-resume suggestion if it's not needed.
...
This is much better interface-wise. It eliminates all blinking
of the line in the practice.
Bug: 8874148
Bug: 8864306
Change-Id: I87754e44784327c2e9c8b162d598d145e20668e8
2013-07-01 14:40:12 +09:00
a9e975baa2
am 8142a7b6: Merge "Record number of words entered"
...
* commit '8142a7b637326e8fe8736de94246b1fffb4f2886':
Record number of words entered
2013-06-28 10:04:00 -07:00
8142a7b637
Merge "Record number of words entered"
2013-06-28 17:01:18 +00:00
8873ac60f9
am a5e28acf: Merge "Fix a bug where AOSP Latin IME would not fill dictionaries"
...
* commit 'a5e28acf634988f7589e4b1f07962863f15a991a':
Fix a bug where AOSP Latin IME would not fill dictionaries
2013-06-28 07:05:33 -07:00
4936fa348a
am 21c3a529: Merge "Update dictionaries"
...
* commit '21c3a529142cb8d07ed82b207b8d514204094b8b':
Update dictionaries
2013-06-28 07:05:30 -07:00
a5e28acf63
Merge "Fix a bug where AOSP Latin IME would not fill dictionaries"
2013-06-28 13:21:31 +00:00
21c3a52914
Merge "Update dictionaries"
2013-06-28 07:52:31 +00:00
ffe7dbbe7a
Update dictionaries
...
>>> dictionaries/cs_wordlist.combined.gz
Header :
date : 1355802831 <=> 1372393817
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/de_wordlist.combined.gz
Header :
date : 1355802835 <=> 1372393817
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
date : 1366272052 <=> 1372393817
version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25
>>> dictionaries/en_US_wordlist.combined.gz
Header :
date : 1366272093 <=> 1372393817
version : 31 <=> 35
Body :
Added: LTE 25
>>> dictionaries/en_wordlist.combined.gz
Header :
date : 1366272977 <=> 1372393837
version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25
>>> dictionaries/es_wordlist.combined.gz
Header :
date : 1355802832 <=> 1372393817
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/fr_wordlist.combined.gz
Header :
date : 1366272255 <=> 1372393818
version : 31 <=> 35
Body :
Deleted: R'n'B 95
Deleted: count 60
Deleted: d'Inti 34
Added: beurk 25
>>> dictionaries/hr_wordlist.combined.gz
Header :
date : 1355802836 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/it_wordlist.combined.gz
Header :
date : 1355802836 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/lt_wordlist.combined.gz
Header :
date : 1355802843 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/lv_wordlist.combined.gz
Header :
date : 1355802843 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/nb_wordlist.combined.gz
Header :
date : 1366003450 <=> 1372393818
version : 31 <=> 35
Body :
Added: LTE 25
>>> dictionaries/nl_wordlist.combined.gz
Header :
date : 1355802844 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/ru_wordlist.combined.gz
Header :
date : 1370244430 <=> 1372393835
version : 34 <=> 35
Body :
Freq changed: связывание 93 -> 0
>>> dictionaries/sl_wordlist.combined.gz
Header :
date : 1355802835 <=> 1372393835
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/sr_wordlist.combined.gz
Header :
date : 1355802853 <=> 1372393835
version : 29 <=> 35
Body :
Added: LTE 25
>>> dictionaries/sv_wordlist.combined.gz
Header :
date : 1366003804 <=> 1372393836
version : 31 <=> 35
Body :
Added: LTE 25
>>> dictionaries/tr_wordlist.combined.gz
Header :
date : 1355802858 <=> 1372393837
version : 29 <=> 35
Body :
Added: LTE 25
>>> java/res/raw/main_de.dict
Header :
date : 1355802835 <=> 1372393817
version : 29 <=> 35
Body :
Added: LTE 25
>>> java/res/raw/main_en.dict
Header :
date : 1366272977 <=> 1372393837
version : 31 <=> 35
Body :
Deleted: Sea 126
Added: LTE 25
>>> java/res/raw/main_es.dict
Header :
date : 1355802832 <=> 1372393817
version : 29 <=> 35
Body :
Added: LTE 25
>>> java/res/raw/main_fr.dict
Header :
date : 1366272255 <=> 1372393818
version : 31 <=> 35
Body :
Deleted: R'n'B 95
Deleted: count 60
Deleted: d'Inti 34
Added: beurk 25
>>> java/res/raw/main_it.dict
Header :
date : 1355802836 <=> 1372393818
version : 29 <=> 35
Body :
Added: LTE 25
>>> java/res/raw/main_ru.dict
Header :
date : 1370244430 <=> 1372393835
version : 34 <=> 35
Body :
Freq changed: связывание 93 -> 0
Bug: 9301610
Bug: 9607966
Change-Id: I1117ed85d97fbb0ee50f11bc31776f1970b56f12
2013-06-28 14:54:51 +09:00
555c4236db
Fix a bug where AOSP Latin IME would not fill dictionaries
...
There is no reason not to contact the dictionary provider
when we don't have internet permission or when the URL
is empty. It knows how to handle both these cases.
Bug: 9388602
Change-Id: I30c4540551ad2f5e527d3acd1842bbd749feca89
2013-06-28 12:48:41 +09:00
169571b3c0
Record number of words entered
...
This change records the number of words entered in every LogUnit.
This metric is helpful for determining how much multi-word gestures
and spaceless tapping is used.
Change-Id: I4c6d0f9d78e4ac2dd63fd53ed2ec70b368366f15
2013-06-27 12:30:00 -07:00
1634f8a7c4
am e04794cb: Fix some warnings
...
* commit 'e04794cbbeafec7463a91554d7c069deacddc744':
Fix some warnings
2013-06-27 05:45:17 -07:00
e04794cbbe
Fix some warnings
...
Mostly remove unused imports
Change-Id: If8ceffdfad79b78194094527759f5c334746973e
2013-06-27 21:36:52 +09:00
120a8da91c
am 4ded1af2: Improve the language list in the personal dictionary
...
* commit '4ded1af21097652dcd0750d9b3f2f24df2904e25':
Improve the language list in the personal dictionary
2013-06-27 04:36:03 -07:00
4ded1af210
Improve the language list in the personal dictionary
...
Bug: 9117704
Change-Id: I26e6f8369a3c7ffa4bb651b4b5a3e6f004121983
2013-06-27 20:31:02 +09:00
2221b89564
am ec69a259: Merge "Open an API in ExternalDictionaryGetterForDebug"
...
* commit 'ec69a259c60b89cfe5157dc6b43aa17f2f60d6ca':
Open an API in ExternalDictionaryGetterForDebug
2013-06-27 03:33:33 -07:00
b6408d81e0
am a2bfd46a: Use internal personal dictionary settings on JBMR2 or before
...
* commit 'a2bfd46adf6aca5864be3d6ef2204bc18008e9c9':
Use internal personal dictionary settings on JBMR2 or before
2013-06-27 03:33:32 -07:00
ec69a259c6
Merge "Open an API in ExternalDictionaryGetterForDebug"
2013-06-27 10:32:05 +00:00
a2bfd46adf
Use internal personal dictionary settings on JBMR2 or before
...
Bug: 9117704
Change-Id: I7e20b03daa23b59211235183cf48d933e32845e4
2013-06-27 19:20:05 +09:00
bd84a00fc1
Open an API in ExternalDictionaryGetterForDebug
...
and extend it
Change-Id: Id2ba8dd8928a6327d3b31eb35f7cc314e2d31050
2013-06-27 18:41:07 +09:00
5fee4909f1
am 2bbd78ab: Merge "Ignore spans that are not the right size."
...
* commit '2bbd78ab0a0e6eb15c22365d03f58ccbcaff51e6':
Ignore spans that are not the right size.
2013-06-26 20:08:09 -07:00
2bbd78ab0a
Merge "Ignore spans that are not the right size."
2013-06-27 03:06:47 +00:00
2f7f6257b6
Ignore spans that are not the right size.
...
Bug: 8839763
Bug: 8862327
Change-Id: I5d49c86edcbc0fc1b2b147856437cfbadd678377
2013-06-26 23:02:50 +09:00
17e37743dd
am 16c418be: Merge "Follow-up to I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a"
...
* commit '16c418bebcb0ff5347235b2a5963b983eae2fb64':
Follow-up to I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a
2013-06-26 04:33:30 -07:00
16c418bebc
Merge "Follow-up to I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a"
2013-06-26 11:32:25 +00:00
c98d08b6b0
am 6c0e4121: Merge "Resume suggestion at start input"
...
* commit '6c0e4121376e9ce0b96d656f3aea3bfd80f2215e':
Resume suggestion at start input
2013-06-26 03:19:30 -07:00
6c0e412137
Merge "Resume suggestion at start input"
2013-06-26 10:18:32 +00:00
0053bc5832
Follow-up to I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a
...
Change-Id: I741a12508a3a05e2e517e187a7f197e6a661eddb
2013-06-26 18:09:34 +09:00
fe7b76aca6
am b1b21d4e: Make sure to always keep native methods
...
* commit 'b1b21d4eeaae27057ece50307723ec3d5de8f2e3':
Make sure to always keep native methods
2013-06-26 02:05:19 -07:00
b1b21d4eea
Make sure to always keep native methods
...
Saw a problem with proguard
Change-Id: I97df1c3d4076fe97657ebc3b086cccd2b97e9a9a
2013-06-26 17:58:39 +09:00
f608f0a6d3
am a690f3bc: Merge "Readability improvement"
...
* commit 'a690f3bc40268ccee20c44c7e359890b34eb2a8a':
Readability improvement
2013-06-26 00:38:43 -07:00
9252ea38a9
am 173f74bb: Merge "Fixing follow-up to I548d899b"
...
* commit '173f74bb18016ccab3e5fad4c86c5201add41c30':
Fixing follow-up to I548d899b
2013-06-26 00:38:42 -07:00
a690f3bc40
Merge "Readability improvement"
2013-06-26 07:37:15 +00:00
173f74bb18
Merge "Fixing follow-up to I548d899b"
2013-06-26 07:36:44 +00:00
fb72890ac6
Readability improvement
...
Change-Id: I2f350145f333ba1fa4eb20027b0f41107c2df02c
2013-06-26 16:03:40 +09:00
7fcf304c97
Fixing follow-up to I548d899b
...
I548d899b introduced a new method to fix a sync miss between
the cursor position and the cached cursor position, but did not
take into account that it should also update the cached text
before and after the cursor in this case and that there was
already a method for doing this.
Change-Id: I31bd741893207c822827304e77791b1159774e1a
2013-06-26 15:28:42 +09:00
36108c2f85
am 5bf1be71: Add jni methods for dynamically handling a dictionary.
...
* commit '5bf1be71629607e7206e6203489cf742d2f8ed79':
Add jni methods for dynamically handling a dictionary.
2013-06-25 22:32:43 -07:00
5bf1be7162
Add jni methods for dynamically handling a dictionary.
...
Bug: 6669677
Change-Id: I8a26623adbb41a78e3c023c652be635c635e3b47
2013-06-26 12:51:33 +09:00
4da287d0d1
Merge "Import translations. DO NOT MERGE"
2013-06-25 20:15:49 +00:00
08215024c0
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-06-25 20:15:30 +00:00
2f69348d51
Resume suggestion at start input
...
Bug: 9568410
Change-Id: I65468268f8613c863fa7f3a497b64656da0a221c
2013-06-25 19:38:31 +09:00
ed42ccf102
am fd0945b0: Merge "Make UserLogRingCharBuffer an external class"
...
* commit 'fd0945b0da3e53109afc346432a7a8b40d715a0f':
Make UserLogRingCharBuffer an external class
2013-06-25 02:42:13 -07:00
fd0945b0da
Merge "Make UserLogRingCharBuffer an external class"
2013-06-25 09:40:31 +00:00
9419e02fd9
Make UserLogRingCharBuffer an external class
...
Change-Id: I9d506995337d64ec11c72939a8d739423ee46efa
2013-06-25 18:38:13 +09:00
12d0e4f337
am 333362ad: Merge "Fix the one-suggestion case."
...
* commit '333362adfc2a6a3df980a23ea58eceea5f695b46':
Fix the one-suggestion case.
2013-06-25 02:12:01 -07:00
333362adfc
Merge "Fix the one-suggestion case."
2013-06-25 09:10:09 +00:00
d7d5ff1f99
Fix the one-suggestion case.
...
When there is only one suggestion, this code does
not work. The reason for that is, it's not homogeneous
at all and takes indices of one thing into another.
Not completely related to b/8839763, but realized
working on this and needed to have it addressed.
Bug: 8839763
Change-Id: I422730cc7eebb69ff421a171025af0390ebcdf92
2013-06-25 18:00:30 +09:00
9a5e0d9cfd
am 38b54262: Merge "Add a parameter isUpdatable to the constructor of BinaryDictionary."
...
* commit '38b542629adb4e79cb08f6324f82307784e3da0f':
Add a parameter isUpdatable to the constructor of BinaryDictionary.
2013-06-25 01:45:58 -07:00
38b542629a
Merge "Add a parameter isUpdatable to the constructor of BinaryDictionary."
2013-06-25 08:44:48 +00:00
981717da4c
Add a parameter isUpdatable to the constructor of BinaryDictionary.
...
Bug: 6669677
Change-Id: I6bc25131afd97112e3bbde036a81ab559a9a6460
2013-06-25 17:39:06 +09:00
a158159411
am 12ef7d37: Merge "Cleanup under the utils package"
...
* commit '12ef7d37021e2f99de5cc15826cc6dcd3250c41a':
Cleanup under the utils package
2013-06-25 01:30:21 -07:00
12ef7d3702
Merge "Cleanup under the utils package"
2013-06-25 08:20:57 +00:00
03118a2760
Cleanup under the utils package
...
Change-Id: If2f7bd1346cc5085bf57645830f0faac44d017e4
2013-06-25 17:09:12 +09:00
162f1f8928
am 8bc0b513: Merge "Allow mmapping dictionary file in writable mode in openNative."
...
* commit '8bc0b51369822b50c701cfe5a6ec612e5c94f75a':
Allow mmapping dictionary file in writable mode in openNative.
2013-06-25 00:11:18 -07:00
8bc0b51369
Merge "Allow mmapping dictionary file in writable mode in openNative."
2013-06-25 07:09:37 +00:00
f3b62900c7
Allow mmapping dictionary file in writable mode in openNative.
...
Bug: 6669677
Change-Id: I447668932de118b158fa029ddc977b3f3cc06cb8
2013-06-25 16:03:33 +09:00
d2f0d82220
Import translations. DO NOT MERGE
...
Change-Id: I17e9ad751b1e628c8a60bc2234180a37716d10e9
Auto-generated-cl: translation import
2013-06-24 22:02:24 -07:00
cdb9fbfef7
am 10585620: Merge "Fix a bug in the cached cursor pos, and simplify selection handling"
...
* commit '10585620bdfad418f6c093ab4bfd8efaa2d84abf':
Fix a bug in the cached cursor pos, and simplify selection handling
2013-06-24 22:01:55 -07:00
10585620bd
Merge "Fix a bug in the cached cursor pos, and simplify selection handling"
2013-06-25 05:00:11 +00:00
894e7962eb
Import translations. DO NOT MERGE
...
Change-Id: Id9bb0441fc30d6e75a23afc4b47a17d674d2c4c8
Auto-generated-cl: translation import
2013-06-24 21:57:51 -07:00
d57a26b2a1
am 1fc6b800: Merge "Move splash screen to separate file"
...
* commit '1fc6b800095e2f630b006a61cea5f23feefb9a63':
Move splash screen to separate file
2013-06-24 06:41:46 -07:00
1fc6b80009
Merge "Move splash screen to separate file"
2013-06-24 13:40:01 +00:00
260284110d
am cdf77412: Merge "Fix a small bug"
...
* commit 'cdf774122d29754d91aac162f7e7416b65583ea9':
Fix a small bug
2013-06-24 03:01:53 -07:00
cdf774122d
Merge "Fix a small bug"
2013-06-24 10:00:05 +00:00
292c5cc1d2
am bfaf349c: Load the native lib eagerly
...
* commit 'bfaf349c3554e11af8227a5f0807a74107a93069':
Load the native lib eagerly
2013-06-24 02:16:04 -07:00
bfaf349c35
Load the native lib eagerly
...
in the hope of avoiding UnsatisfiedLinkError. This is definitely not a
confident fix as we still don't know the root cause of the issue.
bug: 9325110
Change-Id: I1abf8031b98509f63fce6a2d069d497895ea712c
2013-06-24 18:12:04 +09:00
d5f635a72f
am bc181318: Merge "Move util classes to the latin/utils directory"
...
* commit 'bc1813186df823e4e1a5aabceb3198674387061e':
Move util classes to the latin/utils directory
2013-06-24 01:51:02 -07:00
bc1813186d
Merge "Move util classes to the latin/utils directory"
2013-06-24 08:49:06 +00:00
e189103e00
am fadff6ad: Merge "Fix possible divided by zeror error"
...
* commit 'fadff6ada189ab789daae76fb9d603d26244ee1c':
Fix possible divided by zeror error
2013-06-24 01:45:45 -07:00
fadff6ada1
Merge "Fix possible divided by zeror error"
2013-06-24 08:44:17 +00:00
bafe4b8a4e
Fix possible divided by zeror error
...
Bug: 9534022
Change-Id: I5ab575c724fd7a9e80c76a93d83949e81b2970bb
2013-06-24 17:39:36 +09:00
ca52e1ca5a
Fix a small bug
...
SpannableStrings are not the only type of Spanned, they are
only the mutable kind. SpannedString is the immutable one.
Spanned is the correct class to use there.
Bug: 8839763
Bug: 8862327
Change-Id: Ic5e6199a51f22368914f2748ac2d0d1ca6a33f78
2013-06-24 17:39:17 +09:00
e28eba5074
Move util classes to the latin/utils directory
...
Change-Id: I1c5b27c8edf231680edb8d96f63b9d04cfc6a6fa
2013-06-24 17:04:40 +09:00
4023340775
am c074c335: Merge "Refactor text range to be able to get spans larger than the word"
...
* commit 'c074c3357c3bb0dfe92fff90bccbcab2b6ec422e':
Refactor text range to be able to get spans larger than the word
2013-06-23 23:11:36 -07:00
e8c4b99e56
Refactor text range to be able to get spans larger than the word
...
This changes how the Range class stores its data, but not its
functionality. It also improves encapsulation a bit.
Bug: 8839763
Bug: 8862327
Change-Id: I5bd583b3fc96a99b93a2632882d8fd587c03ab76
2013-06-24 12:31:14 +09:00
82e21ee260
am 564ad492: Merge "Enable long-press digit input for tablets"
...
* commit '564ad4927c784e541e7f00bb17bea416cb06115e':
Enable long-press digit input for tablets
2013-06-23 18:18:42 -07:00
564ad4927c
Merge "Enable long-press digit input for tablets"
2013-06-24 01:16:57 +00:00
1a0750dc95
Move splash screen to separate file
...
Change-Id: I5cad5d5814303d7ca4abadd3fca1c37bd1bc357e
2013-06-22 10:24:13 -07:00
3f391865c1
am b7a2fd16: Merge "Defer disk-intensive tasks until after the keyboard is shown"
...
* commit 'b7a2fd16a139046587daaf44fdf73fed95cf6248':
Defer disk-intensive tasks until after the keyboard is shown
2013-06-21 03:59:38 -07:00
b7a2fd16a1
Merge "Defer disk-intensive tasks until after the keyboard is shown"
2013-06-21 10:57:33 +00:00
673c727b7a
Defer disk-intensive tasks until after the keyboard is shown
...
Bug: 8689779
Change-Id: Ia78d3540f44ec0028c3246a8e0163e9ecf061ecf
2013-06-21 19:41:45 +09:00
2cf3056354
am d02daf20: Merge "Fix punctuations strip"
...
* commit 'd02daf201631e5da042a43faf86e439c6904564c':
Fix punctuations strip
2013-06-21 02:25:27 -07:00
e5dee0af4a
Fix a bug in the cached cursor pos, and simplify selection handling
...
The documentation for setComposingRegion states explicitly
that it does not move the cursor. This is just a bug.
This does not have any ill effects right now, but it will have
in later changes if not fixed.
As for the selection handling, the specific test that this code
removes used to serve a purpose, but it does not any more because
the code using the value has been much sanitized. Now the variable
can just take the obvious value, and become so self-explanatory
that the comments are unnecessary.
Change-Id: I548d899b38776bd3ab5f5361aab0d89d98f12e73
2013-06-21 18:15:07 +09:00
Jean Chalard
Tadashi G. Takaoka
Ken Wakasa
Keisuke Kuroynagi
Kurt Partridge
Baligh Uddin
Satoshi Kataoka