aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | am 974317e4: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '974317e469a71efc40741ff7565f7d4530d05b2e':
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | | Change-Id: I7eee499eec4415afc1fd50d3e3d26b4c1d5a2f82
| | | * | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | |/| | | |
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | |\ \ \ \ \
* | | | | | | | am 4bdb2bf3: am e1128687: Merge "Change to a binary version of the ↵Tom Ouyang2012-05-219-14/+311
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expandable user dictionary." into jb-dev * commit '4bdb2bf3b9cceb99736a736de42088fcf3bd1a0f': Change to a binary version of the expandable user dictionary.
| * | | | | | | am e1128687: Merge "Change to a binary version of the expandable user ↵Tom Ouyang2012-05-189-14/+311
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary." into jb-dev * commit 'e1128687b101e6bda47e8dc2b8fcb5a3519a8ccf': Change to a binary version of the expandable user dictionary.
| | * | | | | | Merge "Change to a binary version of the expandable user dictionary." into ↵Tom Ouyang2012-05-189-14/+311
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-dev
| | | * | | | | | Change to a binary version of the expandable user dictionary.Tom Ouyang2012-05-179-14/+311
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6435677 Change-Id: If83409f699608d443796e64a3c65692ae81b98e6
* | | | | | | | am 6b11e604: am 16e7d134: Remove unnecessary entries in the English ↵Ken Wakasa2012-05-211-517/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whitelist dictionary * commit '6b11e6049dd862ffd0cf9672a084a98664f68b05': Remove unnecessary entries in the English whitelist dictionary
| * | | | | | | am 16e7d134: Remove unnecessary entries in the English whitelist dictionaryKen Wakasa2012-05-181-517/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '16e7d13475ae4c1fa465b100adeae6eaf3308e4f': Remove unnecessary entries in the English whitelist dictionary
| | * | | | | | Remove unnecessary entries in the English whitelist dictionaryKen Wakasa2012-05-181-517/+3
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | bug: 6354484 Change-Id: Id1c89be171f23d2bf8c8289e61f573520b46de14
* | | | | | | am 97a7324c: am 1fc0c71f: Update French/English dictionaries to the latest ↵Jean Chalard2012-05-215-309/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version * commit '97a7324c81c48f5cf3e879517860760b98e4537e': Update French/English dictionaries to the latest version
| * | | | | | am 1fc0c71f: Update French/English dictionaries to the latest versionJean Chalard2012-05-185-309/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1fc0c71fad468cdda7eaea573ae14fd6ee81e180': Update French/English dictionaries to the latest version
| | * | | | | Update French/English dictionaries to the latest versionJean Chalard2012-05-185-309/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c98280f900914d1af22b47019ebc0ad5ab175de
* | | | | | | am 628a5745: am 75c60bf3: Merge "Change auto caps mode argument to int type" ↵Tadashi G. Takaoka2012-05-218-47/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '628a5745e19d227cdff2370704a4958e2791eb5a': Change auto caps mode argument to int type
| * | | | | | am 75c60bf3: Merge "Change auto caps mode argument to int type" into jb-devTadashi G. Takaoka2012-05-188-47/+73
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '75c60bf3a5dfd8f5f529011a20d9e3e73e91d04e': Change auto caps mode argument to int type
| | * | | | | Merge "Change auto caps mode argument to int type" into jb-devTadashi G. Takaoka2012-05-188-47/+73
| | |\ \ \ \ \
| | | * | | | | Change auto caps mode argument to int typeTadashi G. Takaoka2012-05-188-47/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6501446 Change-Id: I3f7bc0fc39edd29ebf96107c3d43b9ccc9b8022e
* | | | | | | | am b710ca15: am 0a57156c: Don\'t use KeyDrawParams as argument of ↵Tadashi G. Takaoka2012-05-212-10/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Key#selectTextSize * commit 'b710ca158e9a3b2ee0e711e5d96fb350371f94bc': Don't use KeyDrawParams as argument of Key#selectTextSize
| * | | | | | | am 0a57156c: Don\'t use KeyDrawParams as argument of Key#selectTextSizeTadashi G. Takaoka2012-05-182-10/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a57156c07990b024b69100f1729997e61cb86c1': Don't use KeyDrawParams as argument of Key#selectTextSize
| | * | | | | | Don't use KeyDrawParams as argument of Key#selectTextSizeTadashi G. Takaoka2012-05-182-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of Ide48c361. Bug: 6509415 Change-Id: I59f6e47d06ebfbac6d354d36fca6788f092ed41d
* | | | | | | | am 8906f915: am aee147e2: Revert "Make KeyDrawParams and ↵Tadashi Takaoka2012-05-215-245/+185
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyPreviewDrawParams to top level class" * commit '8906f9155041ff7f9396c7bfd742682693ca105c': Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
| * | | | | | | am aee147e2: Revert "Make KeyDrawParams and KeyPreviewDrawParams to top ↵Tadashi Takaoka2012-05-185-245/+185
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level class" * commit 'aee147e2167b9d5147ec9fc315723bdf2a70eb2c': Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"
| | * | | | | | Revert "Make KeyDrawParams and KeyPreviewDrawParams to top level class"Tadashi Takaoka2012-05-185-245/+185
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4c9e6a15d174f85dfd28fbf89341549fbb986acf
* | | | | | | | am 554e5a14: am 4c9e6a15: Make KeyDrawParams and KeyPreviewDrawParams to top ↵Tadashi G. Takaoka2012-05-215-185/+245
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | level class * commit '554e5a147ea769ee0ab6fa9ead913cfec2705cc3': Make KeyDrawParams and KeyPreviewDrawParams to top level class
| * | | | | | | am 4c9e6a15: Make KeyDrawParams and KeyPreviewDrawParams to top level classTadashi G. Takaoka2012-05-185-185/+245
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c9e6a15d174f85dfd28fbf89341549fbb986acf': Make KeyDrawParams and KeyPreviewDrawParams to top level class
| | * | | | | | Make KeyDrawParams and KeyPreviewDrawParams to top level classTadashi G. Takaoka2012-05-185-185/+245
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up of Ide48c361. Bug: 6509415 Change-Id: Ib45c476924bc4b6b2ca65e0cae91d719109a9cb1
* | | | | | | am 9a06a1e9: am 468ac358: Merge "Add utils for forgetting curve" into jb-devsatok2012-05-212-0/+176
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9a06a1e9eab191838a623aa074c65fd77a2ac7d9': Add utils for forgetting curve
| * | | | | | am 468ac358: Merge "Add utils for forgetting curve" into jb-devsatok2012-05-172-0/+176
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '468ac35822034caddc3ba98e70f914b7f88dfff4': Add utils for forgetting curve
| | * | | | | Merge "Add utils for forgetting curve" into jb-devsatok2012-05-172-0/+176
| | |\ \ \ \ \
| | | * | | | | Add utils for forgetting curvesatok2012-05-182-0/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4192129 Change-Id: Iebb7ac355e1c1891da31c33754315bd76a61889b
* | | | | | | | am 3c83090b: am d7b80c4e: Merge "Use large label text size for action label" ↵Tadashi G. Takaoka2012-05-217-1/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '3c83090bb00c14470252e0f5ab6735ec0b1b3131': Use large label text size for action label
| * | | | | | | am d7b80c4e: Merge "Use large label text size for action label" into jb-devTadashi G. Takaoka2012-05-177-1/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd7b80c4eee3eaf753f46beee5d68ed44d9742f3c': Use large label text size for action label
| | * | | | | | Merge "Use large label text size for action label" into jb-devTadashi G. Takaoka2012-05-177-1/+23
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Use large label text size for action labelTadashi G. Takaoka2012-05-187-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The large label text size is used for: * The enter key's action label on phone/number keyboard layout of phone device and 7-inch tablet * The enter key's action label on alphabet/symbols keyboard of 7-inch tablet. Bug: 6509415 Change-Id: I1c0dc511b3ac87cba00163b8d29c687ad1e86ce8
* | | | | | | | am 9ad774d1: am 91492993: Merge "Close batch edit" into jb-devJean Chalard2012-05-211-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9ad774d1f68bf3d2a4c38e5b4c3a2fa03e371eff': Close batch edit
| * | | | | | | am 91492993: Merge "Close batch edit" into jb-devJean Chalard2012-05-171-3/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '914929939a492f8e3605e599e0fa40ab5c7e93e0': Close batch edit
| | * | | | | | Merge "Close batch edit" into jb-devJean Chalard2012-05-171-3/+7
| | |\ \ \ \ \ \
| | | * | | | | | Close batch editJean Chalard2012-05-181-3/+7
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does the same thing as Ie30e1aff but differently Bug: 6512086 Change-Id: I47ae990510d3f657abd45ad5f0e325d93dec83c0
* | | | | | | | am 29948e7a: am a9d28030: Merge "Fix NPE on HOVER_EXIT event when not ↵Svetoslav Ganov2012-05-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touching a key." into jb-dev * commit '29948e7a194f7aff786120542d2da7f042c86ea5': Fix NPE on HOVER_EXIT event when not touching a key.
| * | | | | | | am a9d28030: Merge "Fix NPE on HOVER_EXIT event when not touching a key." ↵Svetoslav Ganov2012-05-171-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-dev * commit 'a9d28030964c4c99e7292d7dcfc73e1453750bf9': Fix NPE on HOVER_EXIT event when not touching a key.
| | * | | | | | Merge "Fix NPE on HOVER_EXIT event when not touching a key." into jb-devSvetoslav Ganov2012-05-171-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix NPE on HOVER_EXIT event when not touching a key.alanv2012-05-171-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6513368 Change-Id: Ia6d4d01f51a620230b4d19f813fb3aff6881ec03
* | | | | | | | am 0c661dae: am a26bda7c: Increase CHAR LIMIT of some string resourcesTadashi G. Takaoka2012-05-211-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0c661dae4b8516623229cff0dd18663bfe18ab9a': Increase CHAR LIMIT of some string resources
| * | | | | | | am a26bda7c: Increase CHAR LIMIT of some string resourcesTadashi G. Takaoka2012-05-171-7/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a26bda7c2f487074ac9ac8c64d98b4df615ea429': Increase CHAR LIMIT of some string resources
| | * | | | | | Increase CHAR LIMIT of some string resourcesTadashi G. Takaoka2012-05-181-7/+7
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6513954 Change-Id: If4aa1032bc7e615c77e3a64c6e8f8dbb0a020d8d
* | | | | | | am db8b3a1e: am 817a66e7: Merge "Support large label text ratio in ↵Tadashi G. Takaoka2012-05-213-12/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyboardView" into jb-dev * commit 'db8b3a1ecf06fe7c824591fcd598c386ae0e36c7': Support large label text ratio in KeyboardView
| * | | | | | am 817a66e7: Merge "Support large label text ratio in KeyboardView" into jb-devTadashi G. Takaoka2012-05-173-12/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '817a66e7e6bc9eb0bc74bacf0431308f40185cb1': Support large label text ratio in KeyboardView
| | * | | | | Merge "Support large label text ratio in KeyboardView" into jb-devTadashi G. Takaoka2012-05-173-12/+24
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Support large label text ratio in KeyboardViewTadashi G. Takaoka2012-05-173-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6509415 Change-Id: Ide48c36126c23d91612c322a1027257c9b967e6b