47db8fe121
am d900867b: Change all-subdir-java-files to all-java-files-under,src
...
Merge commit 'd900867b37844206d1221c69501ce3e92608f0d8' into gingerbread-plus-aosp
* commit 'd900867b37844206d1221c69501ce3e92608f0d8':
Change all-subdir-java-files to all-java-files-under,src
2010-08-25 02:55:45 -07:00
d900867b37
Change all-subdir-java-files to all-java-files-under,src
...
Change-Id: I3c15101a769f19b3f3696f315db47c929979b703
2010-08-25 18:12:18 +09:00
cd1636790d
am 05d1904e: Refactor SwipeTracker to top level class
...
Merge commit '05d1904ed703348df59f918486f2344dd2a92fec' into gingerbread-plus-aosp
* commit '05d1904ed703348df59f918486f2344dd2a92fec':
Refactor SwipeTracker to top level class
2010-08-25 01:27:28 -07:00
05d1904ed7
Refactor SwipeTracker to top level class
...
Bug: 2910379
Change-Id: If0ef09d8b0e7ca1c62b4c5a31bcaa620664868f2
2010-08-25 17:21:43 +09:00
bf75bec7cd
am 15d5dc53: Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread
...
Merge commit '15d5dc532fc5460f103f8558f534e3c9e1bcdb97' into gingerbread-plus-aosp
* commit '15d5dc532fc5460f103f8558f534e3c9e1bcdb97':
Move ImeLoggerTests.java from package to vendor
2010-08-25 00:24:46 -07:00
15d5dc532f
Merge "Move ImeLoggerTests.java from package to vendor" into gingerbread
2010-08-25 00:22:52 -07:00
b9792ab1c5
Move ImeLoggerTests.java from package to vendor
...
Change-Id: I002dcd43b91f9a7911b52ef1d5b7b16acb01209d
2010-08-25 16:15:38 +09:00
f8737965be
am f4271e51: Refactor key repeating related code
...
Merge commit 'f4271e51e713688a4e9f368956fb41aa45b76ff7' into gingerbread-plus-aosp
* commit 'f4271e51e713688a4e9f368956fb41aa45b76ff7':
Refactor key repeating related code
2010-08-24 23:14:00 -07:00
f4271e51e7
Refactor key repeating related code
...
This change encapsulates mInKeyRepeat (former mRepeatKeyIndex) into
UIHandler class. Also this eliminates mCurrentKey and mLastTapTime
dependency from repeatKey method.
Bug: 2910379
Change-Id: I9351a558be2ebc04de4ebb0d323af4be33bd470c
2010-08-25 12:33:46 +09:00
ed99b8d9c1
am 8ee13212: Refactor long press related code
...
Merge commit '8ee1321264a721a20fa2371d45bb14a07906f60c' into gingerbread-plus-aosp
* commit '8ee1321264a721a20fa2371d45bb14a07906f60c':
Refactor long press related code
2010-08-24 20:23:38 -07:00
8ee1321264
Refactor long press related code
...
This change eliminates mCurrentKey dependency from openPopupIfRequired
method. Also slightly cleanup onModifiedTouchEvent.
Bug: 2910379
Change-Id: I90c9b39c46c0bb32ecc6588abfc49eb60315f54c
2010-08-25 12:08:20 +09:00
4a2ad03a56
am edadd266: Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread
...
Merge commit 'edadd2661b40979dc79b659e38ffe30059192693' into gingerbread-plus-aosp
* commit 'edadd2661b40979dc79b659e38ffe30059192693':
Refactor onModifiedTouchEvent of LatinKeyboardBaseView
2010-08-24 18:29:22 -07:00
edadd2661b
Merge "Refactor onModifiedTouchEvent of LatinKeyboardBaseView" into gingerbread
2010-08-24 18:27:47 -07:00
8b0cb128be
Refactor onModifiedTouchEvent of LatinKeyboardBaseView
...
This change simplifies onModifierTouchEvent to focus on handling
motion event related to a key event.
Other refactoring will follow in order to support multi touch.
Bug: 2910379
Change-Id: I036be64168d951a535600a7910b36bc109f88490
2010-08-25 10:17:14 +09:00
d4f9126336
am 525141a4: Clean up LatinIME java
...
Merge commit '525141a402ac9a3fb3495cb069ad25b9ba1fc970' into gingerbread-plus-aosp
* commit '525141a402ac9a3fb3495cb069ad25b9ba1fc970':
Clean up LatinIME java
2010-08-23 23:37:29 -07:00
bd1eb5d050
am e07d6a77: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
...
Merge commit 'e07d6a776ad818e21de3598d115ec5de0b12481b' into gingerbread-plus-aosp
* commit 'e07d6a776ad818e21de3598d115ec5de0b12481b':
Fix a bug in backspace handling for the "Tap again to save"
Fix bug: 2693836 - Russian keyboard is missing a letter
2010-08-23 23:36:49 -07:00
525141a402
Clean up LatinIME java
...
- remove unused code
- add @Override
- change the inappropriate cast
Change-Id: Ib25b4939e5b4273794ab0f6349776b5b62d89894
2010-08-24 12:40:00 +09:00
e07d6a776a
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
...
Change-Id: I1dba838629fe6e7c16f7684a0d438328cda1c325
2010-08-23 19:09:17 -07:00
6b6ae29b61
am 78c46117: Fix LatinIME crashing due to crash in Contacts DB
...
Merge commit '78c4611719f10b4a53ade54ab5eeb390061737a3' into gingerbread-plus-aosp
* commit '78c4611719f10b4a53ade54ab5eeb390061737a3':
Fix LatinIME crashing due to crash in Contacts DB
2010-08-20 15:59:01 -07:00
78c4611719
Fix LatinIME crashing due to crash in Contacts DB
...
bug: 2895391
Change-Id: I3a0628942b74556f8b600b63ebc5d808fb2f0abd
2010-08-20 20:12:39 +09:00
3ecb4813f1
am 17dc363a: Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
...
Merge commit '17dc363a63a20d18cd8161f917899b39aed6ddd6' into gingerbread-plus-aosp
* commit '17dc363a63a20d18cd8161f917899b39aed6ddd6':
Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
2010-08-20 02:41:46 -07:00
17dc363a63
Fix an NPE found in KeyboardSwitcher.isAlphabetMode()
...
Change-Id: I03d3d9b25147632d25c1502f796acad4cdaeb239
2010-08-20 18:28:22 +09:00
d56f8f5c10
am 979f8690: DO NOT MERGE. Backport LatinIME from master to Gingerbread
...
Merge commit '979f8690967ff5409fe18f5085858ccdb8e0ccf1' into gingerbread-plus-aosp
* commit '979f8690967ff5409fe18f5085858ccdb8e0ccf1':
DO NOT MERGE. Backport LatinIME from master to Gingerbread
2010-08-19 22:46:06 -07:00
979f869096
DO NOT MERGE. Backport LatinIME from master to Gingerbread
...
TODO: Cleanup will follow.
Change-Id: I4a68ba9f2f55760aa24187f1f13fdfa8a0b70963
2010-08-20 14:37:03 +09:00
479a3a7891
Fix a bug in backspace handling for the "Tap again to save"
...
bug: 2889273
Change-Id: I0f317e203f368f5f47738154a6dee0f556d56148
2010-08-18 00:09:26 -07:00
b608a93c0f
am 6511376f: am 65582531: Fix a bug in backspace handling for the "Tap again to save"
...
Merge commit '6511376ff6f06aba15cdd1ab598a96924bae16ad' into gingerbread-plus-aosp
* commit '6511376ff6f06aba15cdd1ab598a96924bae16ad':
Fix a bug in backspace handling for the "Tap again to save"
2010-08-05 16:41:02 -07:00
6511376ff6
am 65582531: Fix a bug in backspace handling for the "Tap again to save"
...
Merge commit '6558253160e2039c87f424bd814f402ecd31de3b' into gingerbread
* commit '6558253160e2039c87f424bd814f402ecd31de3b':
Fix a bug in backspace handling for the "Tap again to save"
2010-08-05 16:37:47 -07:00
6558253160
Fix a bug in backspace handling for the "Tap again to save"
...
bug: 2889273
Change-Id: I0f317e203f368f5f47738154a6dee0f556d56148
2010-08-06 01:14:09 +09:00
07d18c73af
am 7faf89f8: Import revised translations. DO NOT MERGE
...
Merge commit '7faf89f8015ebf4b1873b7e42c93c8149ec4316b' into gingerbread-plus-aosp
* commit '7faf89f8015ebf4b1873b7e42c93c8149ec4316b':
Import revised translations. DO NOT MERGE
2010-08-04 10:59:19 -07:00
7faf89f801
Import revised translations. DO NOT MERGE
...
Change-Id: Ia4de960b5d1168d49b7a97b22751fde11047f5ea
2010-08-04 10:45:43 -07:00
0c1d0eaafe
Fix bug: 2693836 - Russian keyboard is missing a letter
2010-07-22 22:41:46 -07:00
d69910c170
am 1812bceb: am 88e7b49f: Backport https://android-git.corp.google.com/g/#change,52371 to Froyo. Fix bug: 2693836 - Russian keyboard is missing a letter
...
Merge commit '1812bcebd653ce7ba7d89ca163954e57b5c67021' into gingerbread-plus-aosp
* commit '1812bcebd653ce7ba7d89ca163954e57b5c67021':
Backport https://android-git.corp.google.com/g/#change,52371 to Froyo. Fix bug: 2693836 - Russian keyboard is missing a letter
2010-07-16 18:15:20 -07:00
1812bcebd6
am 88e7b49f: Backport https://android-git.corp.google.com/g/#change,52371 to Froyo. Fix bug: 2693836 - Russian keyboard is missing a letter
...
Merge commit '88e7b49fc8657544380620729eb28966669103a2' into gingerbread
* commit '88e7b49fc8657544380620729eb28966669103a2':
Backport https://android-git.corp.google.com/g/#change,52371 to Froyo. Fix bug: 2693836 - Russian keyboard is missing a letter
2010-07-16 18:12:48 -07:00
88e7b49fc8
Backport https://android-git.corp.google.com/g/#change,52371 to Froyo. Fix bug: 2693836 - Russian keyboard is missing a letter
...
Change-Id: Ic931991bc188f646d30a399bb0b268f415f12051
2010-07-17 09:51:26 +09:00
e62384faeb
merge from froyo-plus-aosp
...
Change-Id: Iec3c2022aaea07b09ff09bcb690331385b30584b
2010-06-25 09:59:31 -07:00
3e59cea2c0
am a008d164: am 7697133c: Import revised translations
...
Merge commit 'a008d1640268559e9614f5766eaad624087c2389' into gingerbread-plus-aosp
* commit 'a008d1640268559e9614f5766eaad624087c2389':
Import revised translations
2010-06-21 12:37:19 -07:00
a008d16402
am 7697133c: Import revised translations
...
Merge commit '7697133c85f30ae2ec046d9fd19fdb5f2ddc7cbc' into gingerbread
* commit '7697133c85f30ae2ec046d9fd19fdb5f2ddc7cbc':
Import revised translations
2010-06-21 12:36:18 -07:00
b4d550e719
am 7697133c: Import revised translations
...
Merge commit '7697133c85f30ae2ec046d9fd19fdb5f2ddc7cbc' into froyo-plus-aosp
* commit '7697133c85f30ae2ec046d9fd19fdb5f2ddc7cbc':
Import revised translations
2010-06-21 11:18:29 -07:00
7697133c85
Import revised translations
...
Change-Id: If4c56c6cea6a99cc784e3e16457a43ca550fdefa
2010-06-21 11:05:32 -07:00
dca7c0080e
merge from froyo-plus-aosp
...
Change-Id: I297edc39b1076522bb50ffa67e5ee02c3bf0a40c
2010-06-14 11:56:30 -07:00
e6de8785d6
am 36dcfec5: Import revised translations
...
Merge commit '36dcfec5a744996ee35735ffa4c796d37b946a9b' into kraken
* commit '36dcfec5a744996ee35735ffa4c796d37b946a9b':
Import revised translations
2010-06-09 23:19:48 -07:00
e1e0a5a054
am 36dcfec5: Import revised translations
...
Merge commit '36dcfec5a744996ee35735ffa4c796d37b946a9b' into froyo-plus-aosp
* commit '36dcfec5a744996ee35735ffa4c796d37b946a9b':
Import revised translations
2010-06-09 23:04:15 -07:00
36dcfec5a7
Import revised translations
...
Change-Id: I7ffd12b24b3946d83899813c498c32eea0b75de0
2010-06-09 22:51:48 -07:00
71403bcc58
am 8099a06b: Import revised translations
...
Merge commit '8099a06ba4e70177cfa2c8a997a6ed146fbe2fbf' into froyo-plus-aosp
* commit '8099a06ba4e70177cfa2c8a997a6ed146fbe2fbf':
Import revised translations
2010-05-17 12:05:45 -07:00
8099a06ba4
Import revised translations
...
Change-Id: I05cc3d1908de8a9a9765f4887cdf641639e65cfd
2010-05-17 11:43:46 -07:00
a8e487be4c
am d6b80c6e: Merge "Fix hardcoded "isDefault" setting" into froyo
...
Merge commit 'd6b80c6ed4433d66381501cd0a00813647261a6c' into froyo-plus-aosp
* commit 'd6b80c6ed4433d66381501cd0a00813647261a6c':
Fix hardcoded "isDefault" setting
2010-05-07 10:34:41 -07:00
d6b80c6ed4
Merge "Fix hardcoded "isDefault" setting" into froyo
2010-05-07 10:32:51 -07:00
8a3f6dfba9
Fix hardcoded "isDefault" setting
...
Bug:2661261
- Changed true to @bool/im_is_default
- isDefault was changed in https://android-git.corp.google.com/g/#patch,sidebyside,37627,3,res/xml/method.xml by mistake
Change-Id: Id1c20c292bed27523fb41f32514f2abdee11f992
2010-05-07 18:00:45 +09:00
1633fa9bfc
am 3d23421c: Merge "For issue #2651381 , allow library prelinking." into froyo
...
Merge commit '3d23421c1171e5c04691c2e128c9fb86a4082dfa' into froyo-plus-aosp
* commit '3d23421c1171e5c04691c2e128c9fb86a4082dfa':
For issue #2651381 , allow library prelinking.
2010-05-05 17:50:10 -07:00
3d23421c11
Merge "For issue #2651381 , allow library prelinking." into froyo
2010-05-05 16:55:50 -07:00
Tadashi G. Takaoka
Ken Wakasa
satok
Jean-Baptiste Queru
Eric Fischer
Amith Yamasani
The Android Open Source Project
Kenny Root
Dan Bornstein