Commit Graph

9413 Commits (17c67ab8025ca2fd13ae678d69f991147775d051)

Author SHA1 Message Date
Kurt Partridge 2bf3a77814 Rename mExpectedCursorStart to mExpectedSelStart
Change-Id: If23d8bd73fe464f12f473e093dc87ed68756e1ec
2013-11-14 07:45:02 -08:00
Kurt Partridge a2632aabf7 Merge "Extract method to reloadTextCache()" 2013-11-14 15:28:07 +00:00
Ken Wakasa 46636b08fb Merge "Update targetSdkVersion to KitKat" 2013-11-14 10:30:35 +00:00
Ken Wakasa ec256f4b8a Update targetSdkVersion to KitKat
Change-Id: I4682aa854b244b58080c964bed1c3017ce365e87
2013-11-14 19:26:25 +09:00
Tadashi G. Takaoka f7bb78fb58 Merge "Add keyboard color switch option" 2013-11-14 09:33:09 +00:00
Tadashi G. Takaoka 4c8a96cf88 Merge "Fix additional subtype id calculation" 2013-11-14 09:04:33 +00:00
Tadashi G. Takaoka 053424e56e Merge "Add StringUtils.joinCommaSplittableText" 2013-11-14 09:04:24 +00:00
Tadashi G. Takaoka b4c7a10840 Add keyboard color switch option
Bug: 11622614
Change-Id: I25aa1ff7376fe72fd94ab2cb7190c61d7a98a1af
2013-11-14 17:56:07 +09:00
Tadashi G. Takaoka 1d1db42d89 Fix additional subtype id calculation
Bug: 11678247
Change-Id: I4a2061fae264473e1ebff6961aa897367ef9cc09
2013-11-14 17:45:53 +09:00
Tadashi G. Takaoka 6589751ace Add StringUtils.joinCommaSplittableText
Change-Id: I80ad9d8b5aee53f1403486a56ffae8d09cbd4e28
2013-11-14 17:43:03 +09:00
Keisuke Kuroyanagi 97fdb184bc Purge ExpandableDictionary.
Bug: 11245133
Change-Id: Ia0886686d8add940409dcd5c883c34eb5289380d
2013-11-14 14:18:02 +09:00
Jean Chalard 3a9b2430a5 Fix many small nits.
...the interaction of which results in a very bad bug.

Bug: 11648854
Change-Id: I774489e384388f187e72b9ac091ab387c5e1a79a
2013-11-12 22:44:59 -08:00
Tadashi G. Takaoka a5f5ab84c0 Add microphone key as long press of comma
Bug: 11637249
Change-Id: Ib6202484ad12c63c8a38d8e12432007ab56d4a30
2013-11-12 22:44:59 -08:00
Jean Chalard e4022137ee Remove an out-of-place check
Bug: 11584525
Change-Id: I76cc3e4ee21d62fbd56042adcf085efd5cafb53f
2013-11-12 22:44:58 -08:00
Tadashi G. Takaoka 7033338017 Update popup panel background a bit draker
Bug: 11169026
Change-Id: I164ab69eb263f58000ffed7b7d97fc6b356147d5
2013-11-12 22:44:58 -08:00
Jean Chalard b87ed46118 Merge "Fix many small nits." 2013-11-13 06:10:39 +00:00
Jean Chalard 5a0bc6ac69 Fix many small nits.
...the interaction of which results in a very bad bug.

Bug: 11648854
Change-Id: I774489e384388f187e72b9ac091ab387c5e1a79a
2013-11-13 14:42:27 +09:00
Tadashi G. Takaoka 3b2171c898 Add microphone key as long press of comma
Bug: 11637249
Change-Id: Ib6202484ad12c63c8a38d8e12432007ab56d4a30
2013-11-13 12:04:24 +09:00
Tadashi G. Takaoka d7d6088130 Revert back punctuations to the more keys keyboard of the period
Cherry-pick I157164910f from Master.

Bug: 11621857
Change-Id: I0fd0496e9091165280f34b4640ff0e524e3847b9
2013-11-12 17:51:54 +09:00
Tadashi G. Takaoka a2a1096406 Revert back punctuations to the more keys keyboard of the period
Bug: 11621857
Change-Id: I157164910fc6f23ef36c838d0a13792c766be223
2013-11-12 14:46:40 +09:00
Tadashi G. Takaoka 1c95c8ba3b Add JB/ICS resources from Azuki MR1 release
Bug: 11622614
Change-Id: I126fc42dd31e912788db0446b67a9d4ea80f848e
2013-11-12 13:04:47 +09:00
Tadashi G. Takaoka c10757e8e8 Rename KLP theme related resources
Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
2013-11-11 20:01:00 +09:00
Tadashi G. Takaoka 4b37b2b3f6 Rename KLP/JB/ICS common resource name suffixes to _holo
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
2013-11-11 19:08:07 +09:00
Tadashi G. Takaoka 1a6a8510b8 Relaxing CHAR LIMIT of strings.action-kes.xml to 7
Bug: 11589582
Bug: 11590257
Bug: 11590258
Bug: 11590364
Change-Id: Iab5b1ef8d29a3808c7270e33fc3c5e7e77104e25
2013-11-11 11:47:04 +09:00
Jean Chalard af8df16887 Remove an out-of-place check
Bug: 11584525
Change-Id: I76cc3e4ee21d62fbd56042adcf085efd5cafb53f
2013-11-08 20:32:43 +09:00
Tadashi G. Takaoka e998e51330 Merge "Tune Khmer keyboard using keyHintLabelVerticalAdjustment" 2013-11-07 10:35:12 +00:00
Tadashi G. Takaoka 541fa7858d Add keyLabelHintVerticalAdjustment attribute
Bug: 11546184
Change-Id: I1fbdbbdcf4d6a74888c48f2e4f0b7afce7913653
2013-11-07 19:29:23 +09:00
Tadashi G. Takaoka 028b425d4c Tune Khmer keyboard using keyHintLabelVerticalAdjustment
Bug: 11546184
Change-Id: I565c5202e3154e4f7d71611a9d68a02e57a1dd3c
2013-11-07 19:24:01 +09:00
Tadashi G. Takaoka 4d49908682 Move reference char/digit width/height method to TypefaceUtils
Change-Id: I3c94c23c31b273a07e145d381587ab0aa4ee8e68
2013-11-07 18:39:42 +09:00
Tadashi G. Takaoka 92248fd288 Add key press vibration value for Motorola DVX
Bug: 10884131
Change-Id: Id6d5589f3528de05c7b346ce55e926c3e18f22cc
2013-11-07 17:32:08 +09:00
Tadashi G. Takaoka 1f025a8541 Merge "Tune key label size of Khmer keyboard using autoScale" 2013-11-07 08:14:15 +00:00
Tadashi G. Takaoka 0a4f4b2bbd Add autoScale Key attribute
Bug: 11546184
Change-Id: I754e98dbc0689dbf14c52d4906141a150bde97a6
2013-11-07 16:56:37 +09:00
Kurt Partridge 4e1f8be3e5 Extract method to reloadTextCache()
Change-Id: Ibdaa9553cafeded15f800077606378b06af755cb
2013-11-06 23:43:56 -08:00
Tadashi G. Takaoka 92f9f6e5d2 Tune key label size of Khmer keyboard using autoScale
Bug: 11546184
Change-Id: I187b1e4205146f517c90de33aee9339d1d91f5b9
2013-11-07 16:09:07 +09:00
Tadashi G. Takaoka 0ea72c8519 Separate action key labels to strings-action-keys.xml
Bug: 11562208
Change-Id: I70390f9eafe51f16ff47b2e39454d1948a259469
2013-11-07 15:12:55 +09:00
Tadashi G. Takaoka 1e1ffa7663 Update popup panel background a bit draker
Bug: 11169026
Change-Id: I164ab69eb263f58000ffed7b7d97fc6b356147d5
2013-11-06 18:57:50 +09:00
Tadashi G. Takaoka aaf532e641 Fix possible RuntimeException in parsing saved addtional subtypes
Bug: 11488129
Change-Id: I91f333aee9f3ae8d4b1d5e67d47de30f361947f3
2013-11-06 17:16:24 +09:00
Tadashi G. Takaoka 463674f950 Merge "Remove unused vertical scrollable KeyboardView" 2013-11-05 10:26:14 +00:00
Tadashi G. Takaoka 78d2895c8d Remove unused vertical scrollable KeyboardView
Bug: 11517736
Change-Id: I9d71290112c2306336e136c94b628b533e386aaa
2013-11-05 19:15:20 +09:00
Baligh Uddin d075a7af41 Import translations. DO NOT MERGE
Change-Id: I103b96a481208d2d3525dd57df2387e9c61b84a3
Auto-generated-cl: translation import
2013-11-04 23:29:12 -08:00
Baligh Uddin 7505290c9a Import translations. DO NOT MERGE
Change-Id: I598c4282b342132f3f9937a9652f570c3c1bc246
Auto-generated-cl: translation import
2013-11-04 23:24:59 -08:00
Keisuke Kuroyanagi 9b3e59d644 Implement ver4 bigram reading method.
Bug: 11073222
Change-Id: I7b3408938f304da361201892e0a1342fdf92e62e
2013-11-05 16:00:26 +09:00
Baligh Uddin 9bd2e4c7e7 Merge "Import translations. DO NOT MERGE" 2013-11-01 14:28:43 +00:00
Baligh Uddin 21dc0bfef0 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle-bayo 2013-11-01 14:28:23 +00:00
Baligh Uddin 9e80ef32f2 Import translations.
Cherry-picked from I83d28c60de84b09da48bd79aa9917f12bd850fdc

Change-Id: I55184cfd398bfe5c4a7dce8c41dd6ab60d5433d5
2013-11-01 03:57:10 +00:00
Baligh Uddin b8ee18c7fe These files were in the obsoleted locale
directories and are not processed by the translation pipeline.
Moving them to their new locale directory.

Example: values-et/bools.xml moved to values-et-rEE/bools.xml

Bug: 11244796
2013-10-31 20:44:05 -07:00
Baligh Uddin fb0f805e93 Import translations. DO NOT MERGE
Change-Id: Ic4bb5751c6ed8c07668f533604542c3fb1ef5909
Auto-generated-cl: translation import
2013-10-28 23:49:13 -07:00
Baligh Uddin ea596c4f7c Import translations. DO NOT MERGE
Change-Id: Ib8c870d0c974eb3b49ae29141aaa53e5f6a2cac9
Auto-generated-cl: translation import
2013-10-28 23:45:03 -07:00
Baligh Uddin 7a5907b580 Import translations. DO NOT MERGE
Change-Id: If3b0f523c86598e0dcf3d3c41e3bfcd5f87c116d
Auto-generated-cl: translation import
2013-10-28 23:40:45 -07:00
Keisuke Kuroyanagi 67cff29fd4 Merge "Fix UserHistoryDictIOUtilsTests by adding @UsedForTesting." 2013-10-29 04:48:05 +00:00
Keisuke Kuroyanagi 82c962f1e0 Fix UserHistoryDictIOUtilsTests by adding @UsedForTesting.
Change-Id: I1bfeeafa002496bb98a385b87437e7f4eb0f6e1d
2013-10-28 21:46:05 -07:00
Satoshi Kataoka 40a3712a4c Merge "Show version in dumped info" 2013-10-29 02:43:09 +00:00
Satoshi Kataoka 5982b1ea08 Show version in dumped info
Bug: 10315296
Change-Id: Icb8e271451f4f9c5b083bfb5eb408372479c2140
2013-10-28 19:22:20 -07:00
Keisuke Kuroyanagi 388c953613 Fix tests by adding @UsedForTesting.
Change-Id: I5b98db67a083bde65bb0f2fb714ae2e799fb1d45
2013-10-28 17:16:01 -07:00
Satoshi Kataoka ba212e9d76 Add a facility to dump the dictionary contents while closing
Change-Id: I02e920e0512f2b46a778f0b23f7ca03f8d5dabe6
2013-10-28 11:25:38 -07:00
Keisuke Kuroyanagi 6e23e336ff Merge "Add a test for ver4 native binary dictionary." 2013-10-28 16:14:45 +00:00
Baligh Uddin d1575a9d89 Import translations. DO NOT MERGE
Change-Id: I9c2c9578bbc0a7036c7ee4c6b8a605ef90ae6001
Auto-generated-cl: translation import
2013-10-25 14:43:14 -07:00
Baligh Uddin c9dea6d6c2 Import translations. DO NOT MERGE
Change-Id: I9c4542106d4660da3b67907afa5696e91f537dd6
Auto-generated-cl: translation import
2013-10-25 14:39:08 -07:00
Keisuke Kuroyanagi 8e9df884aa Add a test for ver4 native binary dictionary.
Bug: 10197478
Bug: 11073222
Change-Id: I6daac6c4b048c65682c25afe6ca0fad83cc9720f
2013-10-25 12:32:30 -07:00
Jean Chalard 42de819ae8 am 1875860d: Stopgap solution for a crash.
* commit '1875860d2606eff269381ef0bb68db549ab4819d':
  Stopgap solution for a crash.
2013-10-22 08:11:48 -07:00
Jean Chalard 8a1675379e Stopgap solution for a crash.
This returns the wrong string, but since it's used for getting the
previous word for bigrams, it only results in slightly worse
suggestions quality.

Bug: 11273655
Change-Id: I6ce5de2f76effc453ca691a654ab6bf17445b9e7
2013-10-22 05:23:48 -07:00
Jean Chalard 5b5ed3d609 Fix a bug where autocaps would jam auto-commit
Bug: 11311002
Change-Id: I62955e364c9ffc75322cf05fa3ad7985f1d09259
2013-10-22 05:23:48 -07:00
Ken Wakasa 79ccba757a Update Setup Wizard welcome video & image
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
2013-10-22 05:23:48 -07:00
Keisuke Kuroyanagi 6bc5acaa79 Fix: Suggested words from user history are invalid.
- Suggestions form user history can contain invalid words.
- isValidWord always returns false.

Bug: 11139426
Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
2013-10-22 05:23:48 -07:00
Jean Chalard 7da2295328 Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-22 05:23:47 -07:00
Satoshi Kataoka a6ee1e7b9a Don't show long-pressing emoji key on tablet
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
2013-10-22 05:23:47 -07:00
Satoshi Kataoka c43738069a Fix keyboard layout
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
2013-10-22 05:23:47 -07:00
Jean Chalard d4b5bc1695 Merge "Preliminary refactor" 2013-10-22 11:26:54 +00:00
Jean Chalard b00ed46385 Preliminary refactor
Bug: 11328842
Change-Id: I7c22e951fef9bc4443c6b64625e25f632f876ab1
2013-10-22 20:16:17 +09:00
Jean Chalard 1875860d26 Stopgap solution for a crash.
This returns the wrong string, but since it's used for getting the
previous word for bigrams, it only results in slightly worse
suggestions quality.
Cherry-pick of I6ce5de2f

Bug: 11273655
Change-Id: I17fb6d74f18fb31bd8f8518f80456d74ae30a2c3
2013-10-22 20:07:06 +09:00
Jean Chalard 729abe6332 Stopgap solution for a crash.
This returns the wrong string, but since it's used for getting the
previous word for bigrams, it only results in slightly worse
suggestions quality.

Bug: 11273655
Change-Id: I6ce5de2f76effc453ca691a654ab6bf17445b9e7
2013-10-22 20:00:09 +09:00
Ken Wakasa 08360a5434 am a62dc281: Update input method subtype locales.
* commit 'a62dc28121d72978d527eec2791d1caf43b563b8':
  Update input method subtype locales.

Change-Id: Id28f5ee33c201e1d335119c1b3d99bc30a10a131
2013-10-22 19:43:09 +09:00
Satoshi Kataoka e4db349db0 am af846af8: Remove Azerbaijani subtype
* commit 'af846af8bb7e4b49c99d7b0e051e70d03a5b7359':
  Remove Azerbaijani subtype
2013-10-22 19:36:41 +09:00
Jean Chalard d869e1fdbb am f603fa1f: Merge "[DO NOT MERGE] Add a sequence number to SuggestedWords." into klp-dev
* commit 'f603fa1f0e8fc909bf2e1bc6e2d0c9b5a01c02c6':
  [DO NOT MERGE] Add a sequence number to SuggestedWords.
2013-10-21 23:36:51 -07:00
Jean Chalard 238941991d am f356a25f: [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
* commit 'f356a25f36952f59e9918daa35f7ff6e5235a37d':
  [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
2013-10-21 23:36:49 -07:00
Jean Chalard f603fa1f0e Merge "[DO NOT MERGE] Add a sequence number to SuggestedWords." into klp-dev 2013-10-22 06:34:55 +00:00
Jean Chalard c130be8779 Add a sequence number to SuggestedWords.
This allows testing for suggestion freshness in an asynchronous
suggestions world.

In-advance cherrypick of Ic76cd17568598d8534aec81e037f9e37f52eb6b4
because there's a merge conflict.

Bug: 11301597
Change-Id: I4aec765a975298fcac30a48dede73d2622224fe5
2013-10-22 13:19:16 +09:00
Jean Chalard 6b8d2d31f9 [DO NOT MERGE] Add a sequence number to SuggestedWords.
This allows testing for suggestion freshness in an asynchronous
suggestions world.
Cherry-pick of Ic76cd175

Bug: 11301597
Change-Id: I45a84de0632062475eebe30234b3147f1c680359
2013-10-22 04:03:52 +00:00
Jean Chalard f356a25f36 [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit
Cherry-pick of I62955e36

Bug: 11311002
Change-Id: I5b11cb48e6dd0563fc29566fe0d27864be2beb0a
2013-10-22 04:03:17 +00:00
Jean Chalard 926ebe849a Merge "Add a sequence number to SuggestedWords." 2013-10-22 04:02:11 +00:00
Jean Chalard ac76463306 Add a sequence number to SuggestedWords.
This allows testing for suggestion freshness in an asynchronous
suggestions world.

Bug: 11301597
Change-Id: Ic76cd17568598d8534aec81e037f9e37f52eb6b4
2013-10-22 12:52:58 +09:00
Jean Chalard c6a121805f Fix a bug where autocaps would jam auto-commit
Bug: 11311002
Change-Id: I62955e364c9ffc75322cf05fa3ad7985f1d09259
2013-10-22 12:39:49 +09:00
Ken Wakasa 859b117118 Update Setup Wizard welcome video & image
bug: 11227246
Change-Id: I291ebdaf7e96d4a2ca738432ce8be1d75b91e5c3
2013-10-22 09:36:39 +09:00
Ken Wakasa 513b99dfa2 Cosmetic fixes
Change-Id: I44ac89edaba2e57bd1b7e091ff74b77a5e598f2f
2013-10-21 15:53:49 +09:00
Ken Wakasa 1c5f5eca9d am 47568d5e: Merge "Fix: Suggested words from user history are invalid. DO NOT MERGE." into klp-dev
* commit '47568d5e19ed907485f7cb435c3944ccc0cb4411':
  Fix: Suggested words from user history are invalid. DO NOT MERGE.
2013-10-18 11:18:28 -07:00
Ken Wakasa 069d44c32c am 146cf238: DO NOT MERGE: Update input method subtype locales.
* commit '146cf238792c4748aa726a440fb96a33b4260fa5':
  DO NOT MERGE: Update input method subtype locales.
2013-10-18 11:18:26 -07:00
Ken Wakasa 47568d5e19 Merge "Fix: Suggested words from user history are invalid. DO NOT MERGE." into klp-dev 2013-10-18 17:43:00 +00:00
Yuichiro Hanada 52f18d7f40 Change the block sizes for SparseTables.
This change saves about 240k bytes.

Bug: 10941472
Change-Id: Ieb00e4dd3391cdb0d42d705f8d0a7b1421f516f9
2013-10-18 20:28:07 +09:00
Keisuke Kuroyanagi 029d9eeb38 Fix: Suggested words from user history are invalid. DO NOT MERGE.
- Suggestions form user history can contain invalid words.
- isValidWord always returns false.

Bug: 11139426
Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
2013-10-18 20:13:40 +09:00
Keisuke Kuroyanagi 8e9af925b1 Merge "Fix: Suggested words from user history are invalid." 2013-10-18 11:05:03 +00:00
Keisuke Kuroyanagi 53686e0f5f Fix: Suggested words from user history are invalid.
- Suggestions form user history can contain invalid words.
- isValidWord always returns false.

Bug: 11139426
Change-Id: I6075b275603332ddb00f4a9284afcaa82d824270
2013-10-18 19:53:57 +09:00
Satoshi Kataoka 7fdb2c2956 Merge "Change the numbering order of terminal IDs." 2013-10-18 10:31:27 +00:00
Yuichiro Hanada 9ae7d37108 Change the numbering order of terminal IDs.
Change-Id: I85a6b6e948ee0de012eef2f9f841240cbca63947
2013-10-18 19:16:11 +09:00
Yuichiro Hanada 2b7110ff1f (2/2) Implement insertWord in Ver4DictUpdater.
Change-Id: I2328a9df0a009b564e8acaf4180f9b0c1ed0901a
2013-10-18 18:03:44 +09:00
Yuichiro Hanada 19b247e79d Fix the name of the argument of writeString.
Change-Id: I76916914f1402913daa56dd5387fe82e42287989
2013-10-18 17:33:10 +09:00
Ken Wakasa 146cf23879 DO NOT MERGE: Update input method subtype locales.
To match up with the removal of obsolete locales.

cherrypick of I27098bfa26b66631ef412f8f0f72e0273a0161bc

bug: 11244796
Change-Id: I6e93513978ac657c859391d0431f90143d855e5f
2013-10-18 17:09:24 +09:00
Jean Chalard 7e7fe6057a Merge "(1/2) Implement insertWord in Ver4DictUpdater." 2013-10-18 08:00:04 +00:00
Ken Wakasa a62dc28121 Update input method subtype locales.
To match up with the removal of obsolete locales.

bug: 11244796
Change-Id: I27098bfa26b66631ef412f8f0f72e0273a0161bc
2013-10-18 16:44:38 +09:00
Yuichiro Hanada 520f612849 (1/2) Implement insertWord in Ver4DictUpdater.
Change-Id: Ia3079d5ef00ca7d831c91fb9220ad9c17038c5a3
2013-10-18 16:42:59 +09:00
Satoshi Kataoka 1760d363d4 Remove unexpectedly used resources
Change-Id: I291269dbca71805a40d48a0e373b9561ad075f6b
2013-10-18 15:05:35 +09:00
Satoshi Kataoka 27106487ba Remove unexpectedly used resources
Change-Id: I0ddd1dfd54c76177660448d156a6c670f5579671
2013-10-18 11:53:32 +09:00
Satoshi Kataoka b4b0a0507a am 2e7f360a: Merge "Do not merge. Fix keyboard layout" into klp-dev
* commit '2e7f360a04f2a840fa083dde299d10e213de7bbb':
  Do not merge. Fix keyboard layout
2013-10-17 17:44:47 -07:00
Satoshi Kataoka dcc33ab0fc am 141a0c33: Merge "Do not merge. Don\'t show long-pressing emoji key on tablet" into klp-dev
* commit '141a0c33802d44a0b8b240b6b8415d465e0aa794':
  Do not merge. Don't show long-pressing emoji key on tablet
2013-10-17 17:44:45 -07:00
Satoshi Kataoka 2e7f360a04 Merge "Do not merge. Fix keyboard layout" into klp-dev 2013-10-18 00:41:53 +00:00
Satoshi Kataoka 141a0c3380 Merge "Do not merge. Don't show long-pressing emoji key on tablet" into klp-dev 2013-10-18 00:41:42 +00:00
Baligh Uddin f4fd6017a0 am 8ccb79eb: am 66bdabad: am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
* commit '8ccb79ebab1ece201da95866d2673e43752a949c':
  These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
2013-10-17 14:40:24 -07:00
Baligh Uddin 66bdabad80 am e47f7332: These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
* commit 'e47f7332f9bb94905015061dd9791f43763ccab8':
  These files were in the obsoleted locale directories and are not processed by the translation pipeline. Moving them to their new locale directory.
2013-10-17 11:26:35 -07:00
Baligh Uddin a7cebb8c5c am 486c5896: Remove obsolete locale directories.
* commit '486c5896102cccfaa79d2109272ab7235dcacf38':
  Remove obsolete locale directories.
2013-10-17 11:26:33 -07:00
Baligh Uddin e47f7332f9 These files were in the obsoleted locale
directories and are not processed by the translation pipeline.
Moving them to their new locale directory.

Example: values-et/bools.xml moved to values-et-rEE/bools.xml

Bug: 11244796
2013-10-17 11:22:07 -07:00
Baligh Uddin 486c589610 Remove obsolete locale directories.
Bug: 11244796
2013-10-17 11:15:33 -07:00
Ken Wakasa a79431b42b am d8ba6abf: Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev
* commit 'd8ba6abfeef1bce43af3e0ac517e20172c9e8cc5':
  [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
2013-10-17 09:28:49 -07:00
Ken Wakasa d8ba6abfee Merge "[DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji" into klp-dev 2013-10-17 16:26:42 +00:00
Baligh Uddin 765c40cd76 Merge "Import translations. DO NOT MERGE" 2013-10-17 15:47:22 +00:00
Baligh Uddin 38a2099808 Import translations. DO NOT MERGE
Change-Id: Ibf795b67b9198d7357815db183d939ff703d064f
Auto-generated-cl: translation import
2013-10-17 08:46:20 -07:00
Baligh Uddin 8d757c2052 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-17 15:45:30 +00:00
Baligh Uddin 9fa7efb0c5 Import translations. DO NOT MERGE
Change-Id: Ia2590927c02e8e64506e746650d318c1d84ae7c2
Auto-generated-cl: translation import
2013-10-17 08:40:51 -07:00
Jean Chalard a3c285e876 [DO NOT MERGE] Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 23:15:09 +09:00
Jean Chalard 0f45e1bfbc Fix a bug where autoshift would be ignored coming from emoji
Bug: 11123691
Change-Id: I36474e12e34af95051129840865015f85595411b
2013-10-17 22:58:34 +09:00
Satoshi Kataoka 329fd2d832 Do not merge. Don't show long-pressing emoji key on tablet
Bug: 11264603
Change-Id: Ic46086e9f1b223e26586e0611d14a7d14b561100
2013-10-17 20:38:33 +09:00
Satoshi Kataoka 0f5256e500 Merge "Don't show long-pressing emoji key on tablet" 2013-10-17 11:37:58 +00:00
Satoshi Kataoka b2f5e0639f Don't show long-pressing emoji key on tablet
Bug: 11264603
Change-Id: I85e8dfa795bbaad26f38bcdb8a958c26e031a4cd
2013-10-17 17:53:33 +09:00
Satoshi Kataoka 0d43ce28c7 Merge "Fix keyboard layout" 2013-10-17 08:33:56 +00:00
Satoshi Kataoka 8ff1e71f8a Do not merge. Fix keyboard layout
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: I3797fe2ef8c1e4cbba3298475f01f90c98e3335f
2013-10-17 17:29:45 +09:00
Satoshi Kataoka e2d531c0fd Fix keyboard layout
- Show "..." on enter key if it has long-pressing emoji key
- Show enter key on symbols shift keyboard

Bug: 11262889
Bug: 11263464
Change-Id: If84d0cc621b12e1bf3a3102b1f09cbaedf92f007
2013-10-17 16:37:26 +09:00
Jean Chalard 578e9b91c1 Merge "Remove useless code." 2013-10-17 06:56:12 +00:00
Jean Chalard 8447409c77 Merge "Remove mIsExpectingUpdateSelection." 2013-10-17 06:55:54 +00:00
Yuichiro Hanada ad5b9bcec2 Add readVer4PtNodeInfo to Ver4DictDecoder.
Change-Id: Ibffaf64a9bda1fb0779a9b53558ca56ed31660d3
2013-10-17 14:37:04 +09:00
Yuichiro Hanada 36dd126ab4 Add ShortcutContentReader.
Change-Id: I7c2d0d86d85775065a9bcb2b4a8463bb4969579e
2013-10-17 11:11:29 +09:00
Satoshi Kataoka bfef552e62 am ea3db813: Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev
* commit 'ea3db813ccb0744129358b9db0b21b9d27b16dde':
  Do not merge. Remove Azerbaijani subtype
2013-10-16 14:22:41 -07:00
Satoshi Kataoka ea3db813cc Merge "Do not merge. Remove Azerbaijani subtype" into klp-dev 2013-10-16 21:19:59 +00:00
Jean Chalard 548716d6d9 Remove useless code.
The only use of mDeleteCount is to implement delete
acceleration. It's reset at each non-delete code point, and
is guarded by a timer.
Plus, ultimately we want to remove this completely :
acceleration should be implemented by actually deleting
stuff faster, not by deleting several code points at a time.

Change-Id: Ia3144860b3aa2499034f2a2a7c81f32087af9598
2013-10-16 18:43:15 +09:00
Satoshi Kataoka 11384432bf Merge "Fix typo" 2013-10-16 09:42:08 +00:00
Jean Chalard 5731b86b88 Merge "Remove unneeded code." 2013-10-16 09:41:44 +00:00
Satoshi Kataoka 22f67ff55e Fix typo
Change-Id: I4748935c3cf00e4a3c02aabe2ea659e1c8c2d7c6
2013-10-16 18:40:28 +09:00
Satoshi Kataoka 3dd33652e4 Do not merge. Remove Azerbaijani subtype
The corresponding change is I0d2a98dffe03ebd

Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 18:39:59 +09:00
Jean Chalard 1194b2b204 Remove mIsExpectingUpdateSelection.
Bug: 11226045
Change-Id: I043f90ba92989bd8307c978eb32630439f63a0b9
2013-10-16 18:39:20 +09:00
Jean Chalard 497976e09b Remove unneeded code.
We don't support LOG_FULL_TEXTVIEW_CONTENTS any more, nor do
we have any plans to support it again in the future.

This also is a prelude to removing mIsExpectingUpdateSelection.

Bug: 11226045
Change-Id: Ib68c6daf52993b87225a7ea9e71a414caaecfdb7
2013-10-16 18:36:16 +09:00
Yuichiro Hanada 098639d99f Add SparseContentTableReader.
Change-Id: I976afc5d320bc65835d659bae1d10d2cdc68262b
2013-10-16 17:24:59 +09:00
Yuichiro Hanada 7b5f2b71f5 Fix Ver4DictDecoder.readAndFollowForwardLink().
Change-Id: Ib527a376b693be21aebd4920ac804ee9b161eb96
2013-10-16 17:16:26 +09:00
Ken Wakasa 008d84ffa5 Merge "Fix readAndFollowForwardLink." 2013-10-16 07:48:30 +00:00
Ken Wakasa 6b7037fa68 Merge "Extract SparseTableContentWriter." 2013-10-16 07:34:03 +00:00
Satoshi Kataoka 47015f205a Merge "Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString." 2013-10-16 07:33:21 +00:00
Satoshi Kataoka 612885f65b Merge "Cleanup unintentionally used resources" 2013-10-16 07:06:16 +00:00
Satoshi Kataoka af846af8bb Remove Azerbaijani subtype
Bug: 11244796
Change-Id: I0d2a98dffe03ebddf26fc3c2760061c39de4c57e
2013-10-16 15:48:30 +09:00
Satoshi Kataoka ba9a428627 Cleanup unintentionally used resources
bug: 11244796

Change-Id: I99be3d54d38f4cd70fc38f5e0b88b4027f62d579
2013-10-16 14:44:50 +09:00
Yuichiro Hanada ed831f38db Extract SparseTableContentWriter.
Change-Id: I9a58e53317654f8a09fbe79044214de3e9c59eb7
2013-10-16 09:53:30 +09:00
Baligh Uddin 12e4167ffc Import translations. DO NOT MERGE
Change-Id: I83d28c60de84b09da48bd79aa9917f12bd850fdc
Auto-generated-cl: translation import
2013-10-15 17:40:19 -07:00
Yuichiro Hanada 1557de7aa4 Consolidate CharEncoding.writeString and BinaryDictIOUtils.writeString.
Change-Id: I6f990fd84e7f08fd1149198c33d8bbf1cac8e078
2013-10-16 00:30:45 +09:00
Yuichiro Hanada 522dc0d8ac Fix readAndFollowForwardLink.
Change-Id: Ifda44e6139a4a1bd065468a7f74cd9483b343644
2013-10-16 00:16:39 +09:00
Ken Wakasa b067be0e5f Merge "Revert "Revert "Add Swiss French and German keyboard layouts.""" 2013-10-15 14:12:29 +00:00
Ken Wakasa b91d1d6645 am b0440472: mExpectingUpdateSelection was out of sync when nothing to delete.
* commit 'b04404722729f2fa988c46c4d9080415332bbeb5':
  mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-14 22:11:41 -07:00
Ken Wakasa b044047227 mExpectingUpdateSelection was out of sync when nothing to delete.
cherripick of I9c6a948331726a821bd3ccec9c1d02dec2c4703a
(forward cherrypicking this because the automerger is stuck now.)

This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.

1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace

The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.

bug: 11181913
Change-Id: I1cbf444d8d105416e7de75c16d80b3797f470495
2013-10-15 14:05:34 +09:00
Ken Wakasa 34ad4e0879 am b9ce8421: mExpectingUpdateSelection was out of sync when nothing to delete.
* commit 'b9ce84214212f5b5072cd9fda458526887c3c739':
  mExpectingUpdateSelection was out of sync when nothing to delete.
2013-10-14 19:49:12 -07:00
Ken Wakasa dc04059df1 am cf5dfd24: am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
* commit 'cf5dfd2464d700f28fe7d8d48150d657274dd2ef':
  Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-14 11:00:10 -07:00
Ken Wakasa cf5dfd2464 am 3a3bbf4a: am eed74b81: am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
* commit '3a3bbf4a38870ecc42b7f6fbd3a7cae20fe020a7':
  Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-14 10:52:40 -07:00
Ken Wakasa b9ce842142 mExpectingUpdateSelection was out of sync when nothing to delete.
This bug was leading to corrupted rendering of surrogate pairs in the following
scenario.

1. Type some emojis
2. Move the cursor at the beginning of the text field
3. Hit backspace even though there's nothing to delete
4. Move the cursor after some emoji
5. Hit backspace

The root cause of this issue was the out-of-sync mExpectingUpdateSelection if
handleBackspace() gets called when the cursor reaches at the beginning of the
TextView. In such case, mExpectingUpdateSelection shouldn't be set true because
there's nothing to delete, so there will be no onUpdateSelection() calls associated
with it. Due to this bug, the cache in RichInputConnection could get stale at step 4
described above. Then the following handleBackspace() that should delete a surrogate
pair was not working correctly because of the stale cache.

bug: 11181913
Change-Id: I9c6a948331726a821bd3ccec9c1d02dec2c4703a
2013-10-14 17:57:48 +09:00
Ken Wakasa eed74b81a6 am c8383eda: Fix wrong commitText parameter in sendKeyCodePoint()
* commit 'c8383eda8bb05e25b22fe6d66100248f7d0e33fa':
  Fix wrong commitText parameter in sendKeyCodePoint()
2013-10-13 16:24:47 -07:00
Ken Wakasa c8383eda8b Fix wrong commitText parameter in sendKeyCodePoint()
Small optimization on generating a String instance from a single code
point too.

bug: 11181913

Change-Id: I0f905e4dc6ec7841092bb4d3d940daf3b2303f5b
2013-10-13 10:56:10 +09:00
Baligh Uddin 9e4210ba3a Import translations. DO NOT MERGE
Change-Id: I6f722071496d4673ca2214cd5fe73dde1006f036
Auto-generated-cl: translation import
2013-10-12 09:50:42 -07:00
Baligh Uddin cdc4c1dca7 Import translations. DO NOT MERGE
Change-Id: Icbe028a32311c167219f366e695cb7932f5a9a71
Auto-generated-cl: translation import
2013-10-12 09:43:32 -07:00
Baligh Uddin 82cad2db96 Import translations. DO NOT MERGE
Change-Id: Ie3282562a318563d607fea65c51efba90547d202
Auto-generated-cl: translation import
2013-10-12 09:27:54 -07:00
Baligh Uddin 8f99107bbb Merge "Import translations. DO NOT MERGE" 2013-10-11 15:35:33 +00:00
Baligh Uddin 40823338e2 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-11 15:35:27 +00:00
Baligh Uddin 6899052df1 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-10-11 15:35:09 +00:00
Baligh Uddin fc33cc6dba Import translations. DO NOT MERGE
Change-Id: Iafd4f4b04b7c80e2d686d2a3953a5c6e41df2739
Auto-generated-cl: translation import
2013-10-11 06:35:24 -07:00
Baligh Uddin 02ecae3aa3 Import translations. DO NOT MERGE
Change-Id: I45a783763fce6254469a39374d03edb6a1867cc9
Auto-generated-cl: translation import
2013-10-11 06:31:03 -07:00
Baligh Uddin 67337450d4 Import translations. DO NOT MERGE
Change-Id: Ic51ef12040f5586db280ad1f0f9721c5c0e7f3c4
Auto-generated-cl: translation import
2013-10-11 06:22:31 -07:00
Ken Wakasa a3e90243bb am fe97ff40: am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit 'fe97ff40836e71ef80c35d93367a54088586452e':
  Make emoji separators
2013-10-11 05:14:23 -07:00
Satoshi Kataoka 614a553a70 am eb7fa4dc: am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
* commit 'eb7fa4dc6d1bd629a34adcf6423c534352d0b00c':
  Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:14:20 -07:00
Ken Wakasa fe97ff4083 am 60fb5865: am 06e1bdaa: am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit '60fb58654e33448651fea191ba22cfdc87e37466':
  Make emoji separators
2013-10-11 05:10:21 -07:00
Satoshi Kataoka eb7fa4dc6d am 40506273: am ac6d0c65: am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
* commit '405062733cfe066c4b9af719bfc36a9a516c9dd3':
  Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:10:19 -07:00
Ken Wakasa 06e1bdaa25 am 3e35e072: Merge "Make emoji separators" into klp-dev
* commit '3e35e0727ce02e29ae498fb09ebc70df7e103d14':
  Make emoji separators
2013-10-11 05:05:11 -07:00
Satoshi Kataoka ac6d0c656e am 6d915037: Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev
* commit '6d91503727a6d5b4eb942c56ee3f640984ae31a4':
  Fix a bug where emojis would remove the suggestion strip.
2013-10-11 05:05:09 -07:00
Ken Wakasa 3e35e0727c Merge "Make emoji separators" into klp-dev 2013-10-11 11:57:07 +00:00
Satoshi Kataoka 6d91503727 Merge "Fix a bug where emojis would remove the suggestion strip." into klp-dev 2013-10-11 11:53:07 +00:00
Jean Chalard 6fc15b9fc4 Fix a bug where emojis would remove the suggestion strip.
Bug: 11163495
Change-Id: I23d12c430125cc2a66a6e00715a4c609bb9e2bb1
2013-10-11 20:51:13 +09:00
Jean Chalard 401fb908f0 Make emoji separators
Bug: 11163495
Change-Id: I3247b8d1bbd3406b29a30a25aebd932c63431943
2013-10-11 20:00:38 +09:00
Ken Wakasa 075d8fa65a am 7abdab1c: Merge "Add a time stamp for unigrams."
* commit '7abdab1c6fe693f11cc5ee385b2ff4d5a84cfaf4':
  Add a time stamp for unigrams.
2013-10-11 03:19:38 -07:00
Ken Wakasa 7abdab1c6f Merge "Add a time stamp for unigrams." 2013-10-11 10:17:01 +00:00
Jean Chalard 32cc5ba274 am 3def959e: am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
* commit '3def959e4deda3d8cbc9a1a7518c335086e3d062':
  Fix the suggestion size.
2013-10-11 01:52:39 -07:00
Jean Chalard 3def959e4d am 3f1c95db: am 331c84d7: am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
* commit '3f1c95dbdc18453dc0cd6f847b33e01db1f1d75b':
  Fix the suggestion size.
2013-10-11 01:49:51 -07:00
Jean Chalard 331c84d790 am 5fe9ab1c: Merge "Fix the suggestion size." into klp-dev
* commit '5fe9ab1cc680bed75160980f69f0a7d33f18fb5a':
  Fix the suggestion size.
2013-10-11 01:43:29 -07:00
Jean Chalard 5fe9ab1cc6 Merge "Fix the suggestion size." into klp-dev 2013-10-11 08:38:31 +00:00
Ken Wakasa ff013a1fbf am be22a01d: Merge "Add resolveBigramPositions."
* commit 'be22a01df33d809a83c4bed402428f98fa47c370':
  Add resolveBigramPositions.
2013-10-11 00:47:10 -07:00
Ken Wakasa be22a01df3 Merge "Add resolveBigramPositions." 2013-10-11 07:45:20 +00:00
Jean Chalard c0bd0a244d Fix the suggestion size.
The available space was not computed correctly. This makes the
decision to ellipsize/expand the middle suggestion correct.

Also, the scale was not applied correctly in some cases.

Finally, for some reason ellipsize does not work as we expect.
I'm not sure how to get it to work like we want it to, but
this works around the problem in a simple manner.

Bug: 11158757
Change-Id: I083e7ac56e157f100923733e67b92a6368a526c9
2013-10-11 16:42:46 +09:00
Satoshi Kataoka ee1ff0da30 am 7611af75: Merge "Do not merge. Save / restore the last used emoji category" into klp-dev
* commit '7611af753af5ba112bcfc8c434caf88dc8f46325':
  Do not merge. Save / restore the last used emoji category
2013-10-11 00:23:38 -07:00
Satoshi Kataoka 7611af753a Merge "Do not merge. Save / restore the last used emoji category" into klp-dev 2013-10-11 07:21:35 +00:00
Satoshi Kataoka c16be0237e am 6026a958: Merge "Save / restore the last used emoji category"
* commit '6026a9581685b2d91fc5bd6cf33a506d5560c238':
  Save / restore the last used emoji category
2013-10-11 00:07:41 -07:00
Satoshi Kataoka 7d3f53a1cb Do not merge. Save / restore the last used emoji category
Bug: 11029983
Change-Id: I5547910c7b5dd7974292fc075af33568940f4e81
2013-10-11 16:05:38 +09:00
Satoshi Kataoka 6026a95816 Merge "Save / restore the last used emoji category" 2013-10-11 07:04:42 +00:00
Satoshi Kataoka 6dc99dc200 Save / restore the last used emoji category
Bug: 11029983
Change-Id: I1bec2c3c6b547de68562a818a8d6c9fef83787b7
2013-10-11 16:00:33 +09:00
Yuichiro Hanada c068780b9d am 9514ed5c: Add the new format of bigram entries.
* commit '9514ed5c2a49e645e2d468f7191d54d77d9f127f':
  Add the new format of bigram entries.
2013-10-10 23:57:54 -07:00
Yuichiro Hanada c32962b8f1 Add a time stamp for unigrams.
Bug: 10920255
Change-Id: I26d2cce3c322a4ff39a614f8615f43fb7bd3baed
2013-10-11 15:08:09 +09:00
Yuichiro Hanada 9514ed5c2a Add the new format of bigram entries.
In new format, each bigram entry has flags (1 byte), a terminal id (3 byte),
a time-stamp (4 byte), a counter (1 byte) and a level (1 byte).

Bug: 10920255
Bug: 10920165
Change-Id: I0f7fc125a6178e6d25a07e8462afc41a7f57e3e1
2013-10-11 14:50:41 +09:00
Jean Chalard 6e9a2c2b1c am 7e6ac9d7: Allow double-space-to-period after percent
* commit '7e6ac9d7270592944f04318ea1ae00e4bee28b19':
  Allow double-space-to-period after percent
2013-10-10 08:31:39 -07:00
Jean Chalard 7e6ac9d727 Allow double-space-to-period after percent
Bug: 11158604
Change-Id: If8c94ef91ed58bb5028f51be7c8d9beb677436a4
2013-10-10 21:26:08 +09:00
Baligh Uddin a4557b064c am fbb89492: am 196ed028: (-s ours) am e03b75c0: (-s ours) am bc83cd0f: (-s ours) am b3073240: (-s ours) am 96a52175: (-s ours) am a0f6da5a: (-s ours) am a6c16790: (-s ours) am d7346f18: (-s ours) am bda32836: (-s ours) am 8e26b9c0: (-s ours) Import translations. DO N
* commit 'fbb89492a1839a49d6627820456c963436864709':
2013-10-10 01:14:21 -07:00
Baligh Uddin b7aae2df78 am 04931245: am a6d52095: (-s ours) am 09ff83d4: (-s ours) am 12a8e54e: (-s ours) am 07b83868: (-s ours) am 2159d77e: (-s ours) am 5a6bcbfb: (-s ours) am 3c6d5101: (-s ours) am 14a3c634: (-s ours) am 267928c9: (-s ours) am 981a1944: (-s ours) Merge "Import translation
* commit '04931245183975bc3ff18b859252d6cb14f9454a':
2013-10-10 00:44:26 -07:00
Ken Wakasa 85dec741a7 am 6dac27ee: Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev
* commit '6dac27eeb4cfc969a07e646f013a25a27760c773':
  Tweak vertical gap of Emoji palette. DO NOT MERGE
2013-10-09 21:25:50 -07:00
Ken Wakasa 07baf17c6f am f9d7d17f: Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev
* commit 'f9d7d17f8fe9aa30346a1e3c8d01163aac58098b':
  Retry to tweak punctuations. DO NOT MERGE
2013-10-09 21:25:49 -07:00
Satoshi Kataoka 49d8b8cacd am c8e4ad07: Support sw540 (ultra Z). DO NOT MERGE
* commit 'c8e4ad0748d38fa589fc2ffa4bcf13f08c67d74b':
  Support sw540 (ultra Z). DO NOT MERGE
2013-10-09 21:25:47 -07:00
Satoshi Kataoka 8e9ce07b7f am a6a6abc8: Fix the security related API change for PreferenceActivity
* commit 'a6a6abc81611023a0159fa678b731367d80d0aa6':
  Fix the security related API change for PreferenceActivity
2013-10-09 21:00:34 -07:00
Satoshi Kataoka 6beb03df08 am 6862b819: Fix crash in AdditionalSubtypeUtils
* commit '6862b8192df0c979ebf3a1fd566ede1b0dbd8a82':
  Fix crash in AdditionalSubtypeUtils
2013-10-09 21:00:31 -07:00
Satoshi Kataoka 6deea22cf1 am 31e152e3: am de65b7c0: Merge "Fix the position of emoji palette"
* commit '31e152e38012ddba520fc7efc527a2713e8166c1':
  Fix the position of emoji palette
2013-10-09 21:00:25 -07:00
Ken Wakasa ef2add6f1a am 1d24f19b: am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
* commit '1d24f19b00f93fa5ee14b68d7c862c73485b90b1':
  Add more_keys_for_* declarations for the Swedish keyboard.
2013-10-09 21:00:24 -07:00
Jean Chalard 718952855b am e9631bcd: am 0152ff53: Merge "Update dictionaries"
* commit 'e9631bcda47b482dee5a17d87b82a39f4a2e3104':
  Update dictionaries
2013-10-09 21:00:21 -07:00
Satoshi Kataoka 302102ee53 am db7513bb: am a701501c: Merge "Reduce memory of emoji palette"
* commit 'db7513bb25b1c1b84f69c91eb35367e80ac25e40':
  Reduce memory of emoji palette
2013-10-09 21:00:18 -07:00
Jean Chalard 2b33fc74b6 am 17bec5cb: am 92190d9a: Merge "Show the keyboard earlier when rotating."
* commit '17bec5cb1cb963e412201f3c85f00a16f0cbd9f2':
  Show the keyboard earlier when rotating.
2013-10-09 21:00:15 -07:00
Satoshi Kataoka 2715465b94 am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView
* commit '67aa1a93f8376d73511ca6d08052298326eb3b44':
  Fix memory leak in EmojiPaletteView
2013-10-09 21:00:13 -07:00
Ken Wakasa 8d454af44b am 87f06033: am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"
* commit '87f060338043ed57e8064594d632be450536ee73':
  Prep for RAM footprint optimization for Emoji palettes
2013-10-09 21:00:10 -07:00
Jean Chalard 9af393140e am 62001702: am 36c56cae: Merge "Make the sentence separator a resource."
* commit '620017028cd1ef7159c16343720e7062b09dc3ba':
  Make the sentence separator a resource.
2013-10-09 21:00:04 -07:00
Satoshi Kataoka 6d998b3635 am da9408c8: am 984aa60e: Merge "Extend hitbox of emoji keys"
* commit 'da9408c8d8a1411331cf45e55f94bafbe717b234':
  Extend hitbox of emoji keys
2013-10-09 20:59:55 -07:00
Jean Chalard a3efde54d7 am 6e979246: am 7712baa5: Merge "Fix a possible IOOB"
* commit '6e979246be424db462b594ad2a63b9f9841d39f8':
  Fix a possible IOOB
2013-10-09 20:59:53 -07:00
Jean Chalard 322366d07e am 9493affc: am 3c4e8cb6: Call loadKeyboard later if it can\'t be called right away
* commit '9493affce3156067acbaa895f921c70b32139a5f':
  Call loadKeyboard later if it can't be called right away
2013-10-09 20:59:51 -07:00
Satoshi Kataoka e167265f74 am 4a0af2cb: am 291ef1c9: Merge "Clear the cache of subtypes in onStartInputViewInternal"
* commit '4a0af2cbbac5a1a0de339f1a907f8b3c2a64b833':
  Clear the cache of subtypes in onStartInputViewInternal
2013-10-09 20:59:48 -07:00
Jean Chalard ea3a2f28ab am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
* commit '0675d37487f8f2ec92b0984b3ff28a5cd1d7a07e':
  Don't auto-correct to non-whitelist shortcuts
2013-10-09 20:59:45 -07:00
Jean Chalard e6b018aa5c am d44b2490: am a6047aae: Merge "Set the shortcut frequency correctly."
* commit 'd44b249043754e5e0561d53ee337a250be14d492':
  Set the shortcut frequency correctly.
2013-10-09 20:59:43 -07:00
Keisuke Kuroyanagi 2b1e16966c am eafff65b: am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."
* commit 'eafff65bbe2583b5f97b8e80312ecd6bc5c6eac5':
  Fix bug and Add large test for decaying dictionary.
2013-10-09 20:59:40 -07:00
Jean Chalard adc7bacfb7 am dff82299: am 7da62bbe: Merge "Remove suggestions when string contains a period"
* commit 'dff8229925525c494154fc0cd050b5102b4a4231':
  Remove suggestions when string contains a period
2013-10-09 20:59:36 -07:00
Satoshi Kataoka 9eb2acc7e5 am 6a83a875: am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
* commit '6a83a87569dba536f47e61cff0e15437c85c5595':
  Enter -> Alpha keyboard switcher in Emoji palette view
2013-10-09 20:59:33 -07:00
Satoshi Kataoka dd53038e4e am 192414a4: am 32cf6f85: Show Emoji key by longpressing the enter key
* commit '192414a4b1e95668fcba1c302cdf5b4d7ff8f9e5':
  Show Emoji key by longpressing the enter key
2013-10-09 20:59:31 -07:00
Satoshi Kataoka 72facc170b am b3ac25f1: am 4deb824f: Add navigateEmoji
* commit 'b3ac25f1d9150ab47fd1184515ec5a8b39290451':
  Add navigateEmoji
2013-10-09 20:59:29 -07:00
Satoshi Kataoka bc5198b8d1 am 8822a52c: am 287c739d: Merge "Fix build"
* commit '8822a52c3f35acf34c10946e91cbcc230e4f88f5':
  Fix build
2013-10-09 20:59:26 -07:00
Satoshi Kataoka 53e60a5e1c am 6f726f6f: am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
* commit '6f726f6fffb7cbd305a2707fab50f67afb183420':
  Rename EmojiKeyboardView -> EmojiPalettesView
2013-10-09 20:59:22 -07:00
Ken Wakasa 6dac27eeb4 Merge "Tweak vertical gap of Emoji palette. DO NOT MERGE" into klp-dev 2013-10-10 03:39:30 +00:00
Ken Wakasa f9d7d17f8f Merge "Retry to tweak punctuations. DO NOT MERGE" into klp-dev 2013-10-10 03:39:17 +00:00
Satoshi Kataoka c8e4ad0748 Support sw540 (ultra Z). DO NOT MERGE
cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def

Bug: 11125351
Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b
2013-10-10 11:33:10 +09:00
Ken Wakasa 1dcd6dc13c am 9257c049: Merge "Revert "Add Swiss French and German keyboard layouts.""
* commit '9257c049672c278c08029d344c85baf183c6ff2e':
  Revert "Add Swiss French and German keyboard layouts."
2013-10-09 19:32:55 -07:00
Satoshi Kataoka 3a9ae65525 Tweak vertical gap of Emoji palette. DO NOT MERGE
cherrypick of I8163568a9d7f9d321148001e161c672f78796c96

Bug: 11140087
Change-Id: Ifd28f3017a8cf568a8c4a1045811564a129d85b7
2013-10-10 11:29:08 +09:00
Satoshi Kataoka 557a0935d4 Retry to tweak punctuations. DO NOT MERGE
cherrypick of I9ffc457ca44bccfa3eb3bdb0c26535d795215b26

Bug: 11130808
Change-Id: I1a65fd8acc4efe9b4e4786a3dc959498ae63c2f8
2013-10-10 11:14:37 +09:00
Ken Wakasa 856b06a3ac Revert "Revert "Add Swiss French and German keyboard layouts.""
This reverts commit 56402cf10a.

I'll submit this on 10/16 after the final cut for Bayo.

Change-Id: I0fe4ab64fd8dfa1e63e29adf00388743fca6a1ed
bug: 11144401
2013-10-10 02:07:04 +00:00
Ken Wakasa 56402cf10a Revert "Add Swiss French and German keyboard layouts."
This reverts commit 220ce8f269.

Sorry, but we are now in the week before the final cut for the next launch. We shouldn't be taking new features like this at this point. Let me revert this change for now. I'll re-revert this after the cut next week.

Change-Id: Ia8b00680c992ec526e6a858945f2380cbcdfdd55
2013-10-10 02:05:50 +00:00
Jean Chalard 0ded41149e am 73ca0f2c: am 423921ca: Merge "Fallback on empty locales."
* commit '73ca0f2cec62cc67eceb526cd28d48948eae5b45':
  Fallback on empty locales.
2013-10-09 18:55:06 -07:00
Jean Chalard 3ab42a00ec am c5f7d74b: am 5db7eaba: Merge "Accept double-space-period after emoji."
* commit 'c5f7d74b2bb83e99bef7aad62924b0c043ce8961':
  Accept double-space-period after emoji.
2013-10-09 18:55:03 -07:00
Satoshi Kataoka f12df9e401 am 3bf2c598: am 1d188a28: Merge "Fix emoji"
* commit '3bf2c59881ebdd4cf77099806d26f280046623bf':
  Fix emoji
2013-10-09 18:55:00 -07:00
Satoshi Kataoka 383da922a6 am 664f11f2: am 0b288985: Merge "Fix emoji recent key behavior"
* commit '664f11f2ffee2cfefe12a98bde79673abf909148':
  Fix emoji recent key behavior
2013-10-09 18:54:57 -07:00
Ken Wakasa d439ee371d am f330de95: am c01707db: Merge "Suppress exceptions that have always been happening."
* commit 'f330de9526025448e64bdfe69b3d277e214c2512':
  Suppress exceptions that have always been happening.
2013-10-09 18:54:53 -07:00
Ken Wakasa bcb095e72f am e6a64022: am 676bb517: Merge "Add Ver4DictUpdater."
* commit 'e6a6402258a9dae8b71be7af94d682ebb775b28f':
  Add Ver4DictUpdater.
2013-10-09 18:54:51 -07:00
Ken Wakasa f9de7ca5fd am d5c90d9d: am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."
* commit 'd5c90d9d8be05d848661aba10d11bac14cf70626':
  Refactor BinaryDictIOUtilsTests.
2013-10-09 18:54:48 -07:00
Satoshi Kataoka 0f0cd69aa8 am 3944a67c: am 6ec0cf12: Merge "Tentatively revert assets"
* commit '3944a67c325478341be43a97017db0c50746c17c':
  Tentatively revert assets
2013-10-09 18:54:45 -07:00
Yuichiro Hanada 1f6b9d7fef am 10100b2c: am 14d31d46: Add AbstractDictDecoder.
* commit '10100b2c52fd6073b37eb3d8558439e62c6c9412':
  Add AbstractDictDecoder.
2013-10-09 18:54:36 -07:00
Ken Wakasa aa958adfaf am 73ddd404: am 78409cd9: Merge "Separate shortcut targets from the trie file."
* commit '73ddd4041967babdcb201da33042e15460031faf':
  Separate shortcut targets from the trie file.
2013-10-09 18:54:33 -07:00
Alan Viverette 26c006d8f0 am f6c2a0fe: am afa56511: Merge "Update string comments for translation"
* commit 'f6c2a0fe59444eb85a7e658ce36bf40edd8605da':
  Update string comments for translation
2013-10-09 17:55:51 -07:00
Keisuke Kuroyanagi 8be44a2d87 am f28ca53b: am 864ee881: Merge "Fix UserHistoryDictionaryTests."
* commit 'f28ca53b33098a87938fc9eafff5577e6c02a822':
  Fix UserHistoryDictionaryTests.
2013-10-09 17:55:48 -07:00
Yuichiro Hanada 98d7c6cde8 am be7db63a: am 3dd77a6d: Add SparseTableContentWriter to Ver4DictEncoder.
* commit 'be7db63ad91f3f1a6e78d55993adcd5c055fddea':
  Add SparseTableContentWriter to Ver4DictEncoder.
2013-10-09 17:55:46 -07:00
Yuichiro Hanada fd91482b5e am 8e19d4a1: am d6e307a4: Add DictUpdater.
* commit '8e19d4a120bf57f6eebce99bac22a01941400d61':
  Add DictUpdater.
2013-10-09 17:55:44 -07:00
Satoshi Kataoka 37da650b75 am 5fbd356a: am 85607c59: Merge "Fix the subtype id of the additional subtypes"
* commit '5fbd356a735ae02a671ca7db6dd57050e9fb0b17':
  Fix the subtype id of the additional subtypes
2013-10-09 17:55:33 -07:00
Satoshi Kataoka 26a97909f6 am 3977cc97: am c7f8d54d: Merge "Prepare for changing text color for functional keys"
* commit '3977cc97528df0851d9b671578181d64c6b7a210':
  Prepare for changing text color for functional keys
2013-10-09 17:55:25 -07:00
Keisuke Kuroyanagi 9115f38b42 am ec5ad29a: am d25cd26f: Merge "Try decaying user history at hourly intervals."
* commit 'ec5ad29a1f81b3d1a907c201f1d6fed01aea627b':
  Try decaying user history at hourly intervals.
2013-10-09 17:55:08 -07:00
Ken Wakasa aa3ae615d2 am 72c870f5: am 596a565a: Merge "Remove some unused variables."
* commit '72c870f5e67c0b332b8bf0b394796c28b53f61a7':
  Remove some unused variables.
2013-10-09 17:55:02 -07:00
Ken Wakasa 8037b971c2 am da4d87ff: am 2dcb6337: Merge "Make SparseTable have multiple content tables."
* commit 'da4d87ff000b594ede7cdb7bcb10e9272484f467':
  Make SparseTable have multiple content tables.
2013-10-09 17:54:56 -07:00
Jean Chalard d0b02b526a am 93c2fa8d: am cd7422f4: Merge "Fix a pernicious bug with caps."
* commit '93c2fa8d3e65ab91898760e64636d5d10942ea17':
  Fix a pernicious bug with caps.
2013-10-09 17:54:48 -07:00
Satoshi Kataoka 96fdbaa367 am 85eba056: am c5182c9a: Correspond to the security related API change for PreferenceActivity
* commit '85eba056f2326f5e3015e4153123d40b6f7cd98f':
  Correspond to the security related API change for PreferenceActivity
2013-10-09 17:54:44 -07:00
Jean Chalard 4afd8ff474 am 0874939e: am a8b838b4: Merge "Fix a test and crash with a better error message when reading"
* commit '0874939e1086baceba9c1f94ca98a7a5837e7813':
  Fix a test and crash with a better error message when reading
2013-10-09 17:54:40 -07:00
Satoshi Kataoka 3cc9602c57 am 319eb1c3: am 77144a64: Merge "Retain Emoji Keyboard after rotation"
* commit '319eb1c363a0d443cace14ee41c575a67ecfc93a':
  Retain Emoji Keyboard after rotation
2013-10-09 17:54:37 -07:00
Satoshi Kataoka 2e7f74f00c am 615509cf: am 9d763910: Merge "Unfortunately, hide some broken "emoji"s"
* commit '615509cf27839e946280787cf27d8c091079b91b':
  Unfortunately, hide some broken "emoji"s
2013-10-09 17:54:01 -07:00
Jean Chalard e398d09a50 am af75e48e: am 74577bed: Merge "Implement the heuristic for auto-commit."
* commit 'af75e48efdc5be7d0b1c3d411017757454ed1799':
  Implement the heuristic for auto-commit.
2013-10-09 17:53:58 -07:00
Jean Chalard 805bae9575 am 6f2830dc: am 2afa0e62: Merge "Fix a bug where gesture would delay update."
* commit '6f2830dcb91fd2d00088c7522c91a45e90a1f3e6':
  Fix a bug where gesture would delay update.
2013-10-09 17:53:52 -07:00
Ken Wakasa 3dd8185656 am a9f5c55c: am 382094a7: Merge "Cleanup and remove redundant more keys on phones"
* commit 'a9f5c55ca2f075ed6923e0040fa66c07a5a37176':
  Cleanup and remove redundant more keys on phones
2013-10-09 17:53:49 -07:00
Ken Wakasa 272a8b79d8 am 88c946af: am 194c6360: Merge "Swap keys: exclamation, question, period, comma."
* commit '88c946af0c8a8e07092be71a7b98957d021e499b':
  Swap keys: exclamation, question, period, comma.
2013-10-09 17:53:47 -07:00
Ken Wakasa b04568b460 am 1522e7be: am cc81a93b: Merge "Add skipPtNode to DictDecoders."
* commit '1522e7be20ac53c3870d493e3a9fb7946edbbea4':
  Add skipPtNode to DictDecoders.
2013-10-09 17:53:41 -07:00
Satoshi Kataoka acdd67bb42 am 98da7cfc: am c2dda795: Tentatively revert inconsistent assets
* commit '98da7cfc0b9afc75db240d10c20f3360fe693320':
  Tentatively revert inconsistent assets
2013-10-09 17:53:39 -07:00
Satoshi Kataoka 8498002afb am db083a2b: am a4913994: Hide indication bar if only one page
* commit 'db083a2b25d057f21a22333251ea0a78668e6326':
  Hide indication bar if only one page
2013-10-09 17:53:37 -07:00
Keisuke Kuroyanagi 07fe099765 am d00e4865: am 126d758c: Merge "Quit blocking getSuggestion during GC."
* commit 'd00e48656b02ff49fc834ed6762dc194d00b42ad':
  Quit blocking getSuggestion during GC.
2013-10-09 17:53:34 -07:00
Jean Chalard 645d992786 am bff2d14d: am 74730a46: Merge "Create the wiring for auto-commit confidence computation."
* commit 'bff2d14d1caf4d70f8c1fdcbbf8e9b41209a3e94':
  Create the wiring for auto-commit confidence computation.
2013-10-09 17:53:32 -07:00
Ken Wakasa a0797f459b am 064661a3: Merge "Add Swiss French and German keyboard layouts."
* commit '064661a35cfb8223577d03e014f1ab61a5ba4575':
  Add Swiss French and German keyboard layouts.
2013-10-09 15:16:04 -07:00
Fredrik Roubert 220ce8f269 Add Swiss French and German keyboard layouts.
There used to be two "Swiss" keyboard layouts, labelled fr_CH and de_QY,
available in LatinIME. They were, however, not actually Swiss layouts
but instead work-arounds to be able to get French or German with qwertz
or qwerty (instead of azerty and qwertz) layouts, respectively. These
were thus removed by commit f6972561fc
replacing them with the generic fr-qwertz and de-qwerty layouts instead.

Here, now, is a proper Swiss keyboard layout, following Swiss standards
for people accustomed to typing on Swiss keyboards, with the expected
tailorings for French and German.

Change-Id: I9feed752053ecc694c84db713284f69bc1daf155
2013-10-09 17:42:17 +02:00
Satoshi Kataoka a6a6abc816 Fix the security related API change for PreferenceActivity
Bug: 10118761
Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
2013-10-09 02:59:32 -07:00
Satoshi Kataoka 6862b8192d Fix crash in AdditionalSubtypeUtils
Bug: 11136982

Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d
2013-10-09 02:59:26 -07:00
Satoshi Kataoka 0a90c5a5b0 am 9a802e0d: Merge "Support sw540 (ultra Z)"
* commit '9a802e0dba989f3fb8cb480355828531c8e1146d':
  Support sw540 (ultra Z)
2013-10-09 01:55:37 -07:00
Satoshi Kataoka 9a802e0dba Merge "Support sw540 (ultra Z)" 2013-10-09 08:52:58 +00:00
Satoshi Kataoka e55446b6bd Support sw540 (ultra Z)
Bug: 11125351
Change-Id: Ib930ba810b25e28bcc36ea1647d46731816d9def
2013-10-09 17:45:53 +09:00
Yuichiro Hanada 67c758f160 Add resolveBigramPositions.
Bug: 11073222
Change-Id: I680e4304c6ab701e9aa132e1e140d789097a53ae
2013-10-09 17:39:22 +09:00
Satoshi Kataoka 8156a45026 am 56997a80: Retry to tweak punctuations
* commit '56997a80c25b16680e0b75d589d380bfec3aca05':
  Retry to tweak punctuations
2013-10-09 00:03:13 -07:00
Satoshi Kataoka 56997a80c2 Retry to tweak punctuations
Bug: 11130808
Change-Id: I9ffc457ca44bccfa3eb3bdb0c26535d795215b26
2013-10-09 15:39:23 +09:00
Satoshi Kataoka afe143c928 am 30ef03d8: Tweak vertical gap of Emoji palette
* commit '30ef03d865ec78469f26983f9c3e74f4e2c1bdd0':
  Tweak vertical gap of Emoji palette
2013-10-08 23:20:53 -07:00
Satoshi Kataoka 30ef03d865 Tweak vertical gap of Emoji palette
Bug: 11140087
Change-Id: I8163568a9d7f9d321148001e161c672f78796c96
2013-10-09 14:56:39 +09:00
Satoshi Kataoka 7b4703402e am 83994ad6: Merge "Fix the security related API change for PreferenceActivity"
* commit '83994ad66b337276c8ba18249a1c5d52540eeef3':
  Fix the security related API change for PreferenceActivity
2013-10-08 22:50:13 -07:00
Satoshi Kataoka 83994ad66b Merge "Fix the security related API change for PreferenceActivity" 2013-10-09 05:46:15 +00:00
Satoshi Kataoka 64f64bdf58 Fix the security related API change for PreferenceActivity
Bug: 10118761
Change-Id: I63501d6c2b5f561d7ab8b7362498665d805d5e1e
2013-10-09 14:34:06 +09:00
Jean Chalard a8285a2425 am dfaec345: Merge "Always call finishComposingText before recapitalization"
* commit 'dfaec34502e214b4f6a0ce8b91ccfa57f7c8d07f':
  Always call finishComposingText before recapitalization
2013-10-08 22:19:29 -07:00
Jean Chalard bfa0d8df8d am e306d292: Merge "Remove a useless IPC call."
* commit 'e306d292ebc2a753cb2546c306cb6abc47fb55f0':
  Remove a useless IPC call.
2013-10-08 22:19:27 -07:00
Jean Chalard dfaec34502 Merge "Always call finishComposingText before recapitalization" 2013-10-09 05:18:01 +00:00
Jean Chalard e306d292eb Merge "Remove a useless IPC call." 2013-10-09 05:17:51 +00:00
Satoshi Kataoka a87070b6c5 am 50f9ca4a: Fix crash in AdditionalSubtypeUtils
* commit '50f9ca4acd799c7ad2abd18fcdab2a895ed32dd7':
  Fix crash in AdditionalSubtypeUtils
2013-10-08 21:05:24 -07:00
Satoshi Kataoka 50f9ca4acd Fix crash in AdditionalSubtypeUtils
Bug: 11136982

Change-Id: I9d022a178c47bad3566be4c0bd8ffbce0b14896d
2013-10-09 12:50:50 +09:00
Jean Chalard f178685c11 Always call finishComposingText before recapitalization
Workaround for framework bug:
Bug: 10792236

Change-Id: I3706b9eed5223889791840e30660f8d17625cb70
2013-10-09 12:15:21 +09:00
Jean Chalard 27d78643e8 Remove a useless IPC call.
This is not useful because we're going to call setSelection again
with different values on the connection right away.

Also a preliminary change for
Bug: 10792236

Change-Id: I46c6ef1fbb3624086099bf81afddb0ef5ae85661
2013-10-09 12:11:28 +09:00
Baligh Uddin d823988b53 Merge "Import translations. DO NOT MERGE" 2013-10-08 14:03:32 +00:00
Baligh Uddin 549559e28d Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-10-08 14:03:24 +00:00
Satoshi Kataoka 31e152e380 am de65b7c0: Merge "Fix the position of emoji palette"
* commit 'de65b7c0b36963de0f5c4f5cede543b247a8ccd7':
  Fix the position of emoji palette
2013-10-08 05:06:39 -07:00
Satoshi Kataoka de65b7c0b3 Merge "Fix the position of emoji palette" 2013-10-08 12:04:03 +00:00
Satoshi Kataoka f981fe7ed2 Fix the position of emoji palette
Change-Id: I07a3912cb9fef8e28f3605de4e73a201a900e95c
2013-10-08 21:00:43 +09:00
Ken Wakasa 1d24f19b00 am c040d59d: Merge "Add more_keys_for_* declarations for the Swedish keyboard."
* commit 'c040d59defe38ce4b55e54dc8859db2e48307f1f':
  Add more_keys_for_* declarations for the Swedish keyboard.
2013-10-08 04:46:02 -07:00
Ken Wakasa c040d59def Merge "Add more_keys_for_* declarations for the Swedish keyboard." 2013-10-08 11:44:54 +00:00
Jean Chalard e9631bcda4 am 0152ff53: Merge "Update dictionaries"
* commit '0152ff53a261e1b8dd2a876120480cc103b7a799':
  Update dictionaries
2013-10-08 04:39:19 -07:00
Jean Chalard 0152ff53a2 Merge "Update dictionaries" 2013-10-08 11:36:35 +00:00
Fredrik Roubert a30884e0e0 Add more_keys_for_* declarations for the Swedish keyboard.
This adds all those popup keys that were included in commit
b1cb13292f when the Swedish keyboard was
first added. Many of these definitions were later removed by commit
79b965e04f but most likely by mistake, as
that commit log message doesn't mention anything about removing these.

To help making this file more maintainable, this commit also moves a few
definitions around so that all definitions now appear in alphabetical
order.

Change-Id: Iadef9e3dd1dc7b39fe87b2fc75210d0697b24361
2013-10-08 13:28:08 +02:00
Satoshi Kataoka db7513bb25 am a701501c: Merge "Reduce memory of emoji palette"
* commit 'a701501cb67127f6a144f9cdbd62b8a97f37856f':
  Reduce memory of emoji palette
2013-10-08 04:27:13 -07:00
Satoshi Kataoka a701501cb6 Merge "Reduce memory of emoji palette" 2013-10-08 11:22:21 +00:00
Satoshi Kataoka 0e01df9baf Reduce memory of emoji palette
Bug: 10902556
Change-Id: I3c8da35a601de2bfb248292c7b59235fc1120988
2013-10-08 20:11:35 +09:00
Jean Chalard b1eedc6ba0 Update dictionaries
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1381130519 <=> 1381226409
  version : 41 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1380293342 <=> 1381226409
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

>>> java/res/raw/main_en.dict
Header :
  date : 1380293363 <=> 1381226429
  version : 40 <=> 42
Body :
Added: haha 45

>>> java/res/raw/main_fr.dict
Header :
  date : 1380519383 <=> 1381226409
  version : 40 <=> 42
Body :
Freq changed: haha 0 -> 30

Bug: 11114205
Change-Id: I39d429d24d93ee07a70d8613ce0752432b26acc4
2013-10-08 10:34:56 +00:00
Jean Chalard 17bec5cb1c am 92190d9a: Merge "Show the keyboard earlier when rotating."
* commit '92190d9a756b7bad95648075828b23e61340358d':
  Show the keyboard earlier when rotating.
2013-10-08 03:15:55 -07:00
Jean Chalard 92190d9a75 Merge "Show the keyboard earlier when rotating." 2013-10-08 10:14:41 +00:00
Satoshi Kataoka 67aa1a93f8 am 2d3e1210: Fix memory leak in EmojiPaletteView
* commit '2d3e121014a97b7de90f287f1ef82fa98f37007c':
  Fix memory leak in EmojiPaletteView
2013-10-08 03:12:41 -07:00
Satoshi Kataoka 2d3e121014 Fix memory leak in EmojiPaletteView
Bug: 10902556
Change-Id: I3a8c1e08d6f953b462d914acd1f411c36f9d80f2
2013-10-08 19:05:00 +09:00
Ken Wakasa 87f0603380 am d900b90d: Merge "Prep for RAM footprint optimization for Emoji palettes"
* commit 'd900b90db7d411c8cfc8ff9e41518bf98f50daff':
  Prep for RAM footprint optimization for Emoji palettes
2013-10-08 01:36:46 -07:00
Ken Wakasa d900b90db7 Merge "Prep for RAM footprint optimization for Emoji palettes" 2013-10-08 08:11:53 +00:00
Ken Wakasa 8cf2a5e59f Prep for RAM footprint optimization for Emoji palettes
bug: 10902556
Change-Id: I313948c73b60cd33c437cf02e8d3fb61c288a240
2013-10-08 17:09:24 +09:00
Jean Chalard 482aa129e4 Show the keyboard earlier when rotating.
Bug: 11107229
Change-Id: I0b36341d60b634a860eb13fafd0dc69fe734bdeb
2013-10-08 16:33:27 +09:00
Jean Chalard 620017028c am 36c56cae: Merge "Make the sentence separator a resource."
* commit '36c56caee3049737a55e2421bf9e3727c4936f24':
  Make the sentence separator a resource.
2013-10-07 23:45:52 -07:00
Jean Chalard 10581e68af Make the sentence separator a resource.
This will help handing correctly the armenian full stop.

Bug: 10082781
Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
2013-10-08 15:28:43 +09:00
Baligh Uddin 03b4809729 Import translations. DO NOT MERGE
Change-Id: If76652b1bdfc62f8c8d60ca8d5a8c3b7346e75a3
Auto-generated-cl: translation import
2013-10-07 23:01:43 -07:00
Baligh Uddin 7cbd5d63fc Import translations. DO NOT MERGE
Change-Id: I8dc4664964ed153fc79309d7e70f4a36bfacceb6
Auto-generated-cl: translation import
2013-10-07 22:49:43 -07:00
Satoshi Kataoka da9408c8d8 am 984aa60e: Merge "Extend hitbox of emoji keys"
* commit '984aa60e11a160ae712527dcaa1bc837db2e7466':
  Extend hitbox of emoji keys
2013-10-07 16:29:33 -07:00
Satoshi Kataoka 984aa60e11 Merge "Extend hitbox of emoji keys" 2013-10-07 23:27:07 +00:00
Jean Chalard 6e979246be am 7712baa5: Merge "Fix a possible IOOB"
* commit '7712baa59baadccf2da64f8dc5d21621fba860af':
  Fix a possible IOOB
2013-10-07 07:23:12 -07:00
Jean Chalard 9493affce3 am 3c4e8cb6: Call loadKeyboard later if it can\'t be called right away
* commit '3c4e8cb693ce584ea1f87e354430c069cdd3da39':
  Call loadKeyboard later if it can't be called right away
2013-10-07 07:23:09 -07:00
Satoshi Kataoka 5d27cb9397 Extend hitbox of emoji keys
Bug: 11105065
Change-Id: I5e90ba55cf708bf7be27d7d101cbc0719ac583c8
2013-10-07 23:22:12 +09:00
Jean Chalard 7712baa59b Merge "Fix a possible IOOB" 2013-10-07 14:21:00 +00:00
Jean Chalard ca9c3c0613 Fix a possible IOOB
We want to use StringUtils here, but it's full of references to
stuff not accessible host-side like JsonReader and TextUtils
and SettingsValues :/

Bug: 11061476
Change-Id: I3c0194979833ede283b4f9190335dba5376fe6fc
2013-10-07 23:16:57 +09:00
Jean Chalard 3c4e8cb693 Call loadKeyboard later if it can't be called right away
Since loadKeyboard relies on the input connection being
available to give it the auto-caps state, but also can't
be called twice in a row because it needs to save and
restore its state and invalidates it after the restore,
we need to wait until we know we have a valid input
connection to call it.

Bug: 11107229
Change-Id: I1c7baf3215682df6f6ceb357bd37254f9e7418c7
2013-10-07 22:57:59 +09:00
Satoshi Kataoka 4a0af2cbba am 291ef1c9: Merge "Clear the cache of subtypes in onStartInputViewInternal"
* commit '291ef1c9c304bc6eae352e08f4ca86854853ee29':
  Clear the cache of subtypes in onStartInputViewInternal
2013-10-07 04:35:25 -07:00
Satoshi Kataoka 291ef1c9c3 Merge "Clear the cache of subtypes in onStartInputViewInternal" 2013-10-07 11:19:47 +00:00
Satoshi Kataoka 4be5f221e6 Clear the cache of subtypes in onStartInputViewInternal
Bug: 11077905
Change-Id: I9495f13a20edca0e6153cd1a7a0ac6891f707c59
2013-10-07 20:10:58 +09:00
Jean Chalard 0675d37487 am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"
* commit '86f7711407b65c341b38a9fb297c3e5f0532da26':
  Don't auto-correct to non-whitelist shortcuts
2013-10-07 03:06:26 -07:00
Jean Chalard 86f7711407 Merge "Don't auto-correct to non-whitelist shortcuts" 2013-10-07 10:04:18 +00:00
Jean Chalard d44b249043 am a6047aae: Merge "Set the shortcut frequency correctly."
* commit 'a6047aae941e0723367fa9c52157271eb405b6fb':
  Set the shortcut frequency correctly.
2013-10-07 03:02:06 -07:00
Jean Chalard f309f2288b Don't auto-correct to non-whitelist shortcuts
Bug: 11076722
Change-Id: I0de10ab24d33ec31f45664fe92d80d5a7bec9c20
2013-10-07 19:01:57 +09:00
Jean Chalard a6047aae94 Merge "Set the shortcut frequency correctly." 2013-10-07 10:00:34 +00:00
Jean Chalard f3204eebb1 Set the shortcut frequency correctly.
14 is the right value.

Bug: 11076722
Change-Id: I95d404b540f7fbe4932d1f8498cde23f1df0314f
2013-10-07 18:55:42 +09:00
Keisuke Kuroyanagi eafff65bbe am be4d85fe: Merge "Fix bug and Add large test for decaying dictionary."
* commit 'be4d85feb0b7aa65c9c0f09affe2583eb837cc2b':
  Fix bug and Add large test for decaying dictionary.
2013-10-07 02:36:31 -07:00
Keisuke Kuroyanagi be4d85feb0 Merge "Fix bug and Add large test for decaying dictionary." 2013-10-07 09:32:56 +00:00
Jean Chalard dff8229925 am 7da62bbe: Merge "Remove suggestions when string contains a period"
* commit '7da62bbe24e86ba95cab95cb5f10023ea07c08c5':
  Remove suggestions when string contains a period
2013-10-07 01:38:22 -07:00
Satoshi Kataoka 6a83a87569 am 47462172: Enter -> Alpha keyboard switcher in Emoji palette view
* commit '4746217247d14f26249217aab28215e9c6867614':
  Enter -> Alpha keyboard switcher in Emoji palette view
2013-10-07 01:38:19 -07:00
Satoshi Kataoka 192414a4b1 am 32cf6f85: Show Emoji key by longpressing the enter key
* commit '32cf6f85a2e166f8a43d9bccd4ddefa0b7167cd1':
  Show Emoji key by longpressing the enter key
2013-10-07 01:38:17 -07:00
Jean Chalard 7da62bbe24 Merge "Remove suggestions when string contains a period" 2013-10-07 08:34:52 +00:00
Keisuke Kuroyanagi cfb018ba6d Fix bug and Add large test for decaying dictionary.
- GC gets failure when the dictionary become empty.
- Useless unigrams are sometimes not removed.

Bug: 10197478
Change-Id: I8d1479c01efba61a81f03bc077da6bcb4797a940
2013-10-07 17:31:01 +09:00
Jean Chalard df33982fce Remove suggestions when string contains a period
This is not the right way to do it, but it's simple and will kill the
regression. We should investigate why the return values are
wrong in this case.

Bug: 10780091
Change-Id: I808727242c9cb1598df00a7426358dc3a658add4
2013-10-07 17:27:27 +09:00
Satoshi Kataoka 4746217247 Enter -> Alpha keyboard switcher in Emoji palette view
Bug: 11103091
Change-Id: I0c5384e9f148566d1ac1d178a8227eb913d59908
2013-10-07 17:05:54 +09:00
Satoshi Kataoka 32cf6f85a2 Show Emoji key by longpressing the enter key
Bug: 11074625
Change-Id: I5fc57a2b68d7dcfb8dbebf5821b76b0895a947f9
2013-10-07 16:47:13 +09:00
Satoshi Kataoka b3ac25f1d9 am 4deb824f: Add navigateEmoji
* commit '4deb824f3a91e2e157a3a0334e46b9bba394bc1a':
  Add navigateEmoji
2013-10-06 23:35:34 -07:00
Satoshi Kataoka 4deb824f3a Add navigateEmoji
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
2013-10-07 15:28:39 +09:00
Satoshi Kataoka 8822a52c3f am 287c739d: Merge "Fix build"
* commit '287c739db9715222733af18b5e575f0bba1033bf':
  Fix build
2013-10-06 20:51:10 -07:00
Satoshi Kataoka e6e4c70a23 Fix build
Change-Id: I61341aa7b1ceb311aaa5faa5888ba31e463a95d5
2013-10-07 12:48:14 +09:00
Satoshi Kataoka 6f726f6fff am d76b5529: Rename EmojiKeyboardView -> EmojiPalettesView
* commit 'd76b55297940a65bb9479020a9ed58aa978a0aea':
  Rename EmojiKeyboardView -> EmojiPalettesView
2013-10-06 20:35:15 -07:00
Satoshi Kataoka d76b552979 Rename EmojiKeyboardView -> EmojiPalettesView
Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
2013-10-07 12:28:13 +09:00
Baligh Uddin f96391aee0 Import translations. DO NOT MERGE
Change-Id: I15036545751abe751f2768daef7f3f1605a5457e
Auto-generated-cl: translation import
2013-10-04 22:59:25 -07:00
Baligh Uddin 4d4fe3eb5e Import translations. DO NOT MERGE
Change-Id: I04aed3599ff9570197b408a5d16ea48422294f97
Auto-generated-cl: translation import
2013-10-04 22:46:44 -07:00
Baligh Uddin a9a54bb4cd Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-10-04 16:55:51 +00:00
Baligh Uddin 2b361d95a6 Import translations. DO NOT MERGE
Change-Id: I50e530351c75746759fefc4113c4f881755405ec
Auto-generated-cl: translation import
2013-10-04 09:03:13 -07:00
Jean Chalard 73ca0f2cec am 423921ca: Merge "Fallback on empty locales."
* commit '423921ca131dd1f330599063d34acd714889edf1':
  Fallback on empty locales.
2013-10-04 06:47:34 -07:00
Jean Chalard 423921ca13 Merge "Fallback on empty locales." 2013-10-04 13:44:44 +00:00
Jean Chalard c5f7d74b2b am 5db7eaba: Merge "Accept double-space-period after emoji."
* commit '5db7eabafb75a595403309b74c86cba5d4d5486f':
  Accept double-space-period after emoji.
2013-10-04 06:08:34 -07:00
Jean Chalard 5db7eabafb Merge "Accept double-space-period after emoji." 2013-10-04 13:05:43 +00:00
Jean Chalard 43a8a0c527 Fallback on empty locales.
This is a very rare corner case.

Bug: 11072132
Change-Id: Iad2aa69511f7dc99105284a049c63f2f997b8ef0
2013-10-04 22:04:59 +09:00
Jean Chalard 8142fd83a6 Accept double-space-period after emoji.
This also includes a fix that allows this code to read surrogate
pairs in this processing.

Bug: 11070482
Change-Id: If5ef8d6863938252f09128b7e99ea07ece6e7019
2013-10-04 22:01:36 +09:00
Satoshi Kataoka 3bf2c59881 am 1d188a28: Merge "Fix emoji"
* commit '1d188a28fb0930217098fef10937674e24ca5a49':
  Fix emoji
2013-10-04 05:02:12 -07:00
Satoshi Kataoka 1d188a28fb Merge "Fix emoji" 2013-10-04 12:00:39 +00:00
Satoshi Kataoka 0cf92aa826 Fix emoji
Bug: 10538430

Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
2013-10-04 20:58:09 +09:00
Satoshi Kataoka 664f11f2ff am 0b288985: Merge "Fix emoji recent key behavior"
* commit '0b288985b7e6a74f94943f15be6d6d55d6cca872':
  Fix emoji recent key behavior
2013-10-04 04:31:32 -07:00
Satoshi Kataoka 0b288985b7 Merge "Fix emoji recent key behavior" 2013-10-04 11:18:07 +00:00
Satoshi Kataoka e7ed5cae44 Fix emoji recent key behavior
Bug: 10538430
Change-Id: I91e03a8e7914628cdc8e57c124c95e5e6e8ea2a6
2013-10-04 20:01:00 +09:00
Ken Wakasa f330de9526 am c01707db: Merge "Suppress exceptions that have always been happening."
* commit 'c01707db03c124ecab0c8ba14b4e4f2d24c973c9':
  Suppress exceptions that have always been happening.
2013-10-04 03:15:40 -07:00
Ken Wakasa c01707db03 Merge "Suppress exceptions that have always been happening." 2013-10-04 10:13:53 +00:00
Ken Wakasa fba1bd0ec4 Suppress exceptions that have always been happening.
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
2013-10-04 19:10:26 +09:00
Ken Wakasa e6a6402258 am 676bb517: Merge "Add Ver4DictUpdater."
* commit '676bb517ed7cf137c084a861ab0c2a88dd7a6452':
  Add Ver4DictUpdater.
2013-10-04 02:49:55 -07:00
Ken Wakasa d5c90d9d8b am 618158e6: Merge "Refactor BinaryDictIOUtilsTests."
* commit '618158e675c27854b0ab2cb53ec2eb2837a593c0':
  Refactor BinaryDictIOUtilsTests.
2013-10-04 02:49:52 -07:00
Ken Wakasa 676bb517ed Merge "Add Ver4DictUpdater." 2013-10-04 09:48:27 +00:00
Ken Wakasa 618158e675 Merge "Refactor BinaryDictIOUtilsTests." 2013-10-04 09:47:35 +00:00
Satoshi Kataoka 3944a67c32 am 6ec0cf12: Merge "Tentatively revert assets"
* commit '6ec0cf12b8f3dab05c48c81b1c0aaf5430d58c44':
  Tentatively revert assets
2013-10-04 02:18:45 -07:00
Satoshi Kataoka 6ec0cf12b8 Merge "Tentatively revert assets" 2013-10-04 09:17:12 +00:00
Satoshi Kataoka 0b4d75c2fa Tentatively revert assets
Change-Id: I403fc24a407fdd3b433d5820f1b46e6985cbe83e
2013-10-04 18:09:03 +09:00
Yuichiro Hanada e4e0add9fb Add Ver4DictUpdater.
Change-Id: I986ab26faf535fc4bc98443053f534eced9d048f
2013-10-04 17:33:29 +09:00
Satoshi Kataoka f4aa9a7bd7 Do not merge. Revert emoji key position to JB-mr2
Cherry pick of Ie2033b2f5253b2e2

Bug: 10954182
Change-Id: I9cc61e27a207055d5a43fe3da6fd1ec63bae49fd
2013-10-04 16:38:54 +09:00
Yuichiro Hanada 10100b2c52 am 14d31d46: Add AbstractDictDecoder.
* commit '14d31d464037c31e7f7d382a8a86f6acf4694b06':
  Add AbstractDictDecoder.
2013-10-03 22:21:44 -07:00
Yuichiro Hanada 75d60e821c Refactor BinaryDictIOUtilsTests.
Change-Id: I2208378b33038771b460abb33f9a690872e998e2
2013-10-04 14:19:13 +09:00
Yuichiro Hanada 14d31d4640 Add AbstractDictDecoder.
Change-Id: Ie69d84e090f69dc3ea1f5de73ad8c954ecd2c6a7
2013-10-04 14:16:59 +09:00
Ken Wakasa 73ddd40419 am 78409cd9: Merge "Separate shortcut targets from the trie file."
* commit '78409cd9409f5d5bc706718a5a50963596810716':
  Separate shortcut targets from the trie file.
2013-10-03 22:15:15 -07:00
Ken Wakasa 78409cd940 Merge "Separate shortcut targets from the trie file." 2013-10-04 05:12:55 +00:00
Satoshi Kataoka eb0526a9c3 am ef64676b: Merge "Revert emoji key position to JB-mr2"
* commit 'ef64676bf8e843e0f5c3b8ed1ad409219da3493a':
  Revert emoji key position to JB-mr2
2013-10-03 21:24:35 -07:00
Satoshi Kataoka ef64676bf8 Merge "Revert emoji key position to JB-mr2" 2013-10-04 02:30:26 +00:00
Satoshi Kataoka 5a54a5769c Revert emoji key position to JB-mr2
Bug: 10538430

Change-Id: Ie2033b2f5253b2e2fc2229ba6c95568e7b2a58fa
2013-10-04 11:21:51 +09:00
Yuichiro Hanada 73b9d3b879 Separate shortcut targets from the trie file.
Bug: 10920165
Change-Id: I340759eadbde7fb64cb3b9a3c619ee3a768cedf8
2013-10-04 11:16:10 +09:00
Alan Viverette f6c2a0fe59 am afa56511: Merge "Update string comments for translation"
* commit 'afa565119cd3e8fd7f92ee22033932fc8e8d47d4':
  Update string comments for translation
2013-10-03 13:37:51 -07:00
Alan Viverette afa565119c Merge "Update string comments for translation" 2013-10-03 20:34:24 +00:00
Keisuke Kuroyanagi f28ca53b33 am 864ee881: Merge "Fix UserHistoryDictionaryTests."
* commit '864ee881bd2f4a5dbde8f31c68e7f89522c67db6':
  Fix UserHistoryDictionaryTests.
2013-10-03 05:04:10 -07:00
Keisuke Kuroyanagi 864ee881bd Merge "Fix UserHistoryDictionaryTests." 2013-10-03 12:02:34 +00:00
Keisuke Kuroyanagi 11f7cae094 Fix UserHistoryDictionaryTests.
Bug: 6669677
Bug: 10667710

Change-Id: I6cdc6a6c9cacc7f276fda3a26ec31e3eb928471c
2013-10-03 20:55:34 +09:00
Yuichiro Hanada be7db63ad9 am 3dd77a6d: Add SparseTableContentWriter to Ver4DictEncoder.
* commit '3dd77a6d6696bb426b200b27adeb8be7e887a667':
  Add SparseTableContentWriter to Ver4DictEncoder.
2013-10-03 04:35:34 -07:00
Yuichiro Hanada 8e19d4a120 am d6e307a4: Add DictUpdater.
* commit 'd6e307a4b7933ad5efebc6b0d3b775c5ab5c0e6e':
  Add DictUpdater.
2013-10-03 04:32:12 -07:00
Yuichiro Hanada 3dd77a6d66 Add SparseTableContentWriter to Ver4DictEncoder.
Bug: 10920165
Change-Id: I6372492e97297baad4c5aeeb3fb36dcccd7a944b
2013-10-03 20:31:01 +09:00
Yuichiro Hanada d6e307a4b7 Add DictUpdater.
Change-Id: Ic586e46e5a9f59de53d53e59886d635345940974
2013-10-03 20:16:34 +09:00
Satoshi Kataoka 5fbd356a73 am 85607c59: Merge "Fix the subtype id of the additional subtypes"
* commit '85607c59651ed2341265253d5ab7cd9f5326e7f1':
  Fix the subtype id of the additional subtypes
2013-10-03 00:46:45 -07:00
Satoshi Kataoka 85607c5965 Merge "Fix the subtype id of the additional subtypes" 2013-10-03 07:45:24 +00:00
Satoshi Kataoka 9ecdb831db Fix the subtype id of the additional subtypes
Bug: 11032428
Change-Id: I5d422f1c15a582015770ef9a652348ca6eb8ab85
2013-10-03 16:41:13 +09:00
Satoshi Kataoka 3977cc9752 am c7f8d54d: Merge "Prepare for changing text color for functional keys"
* commit 'c7f8d54d6eaa0a0ebfe156ebe426eeab080a82dc':
  Prepare for changing text color for functional keys
2013-10-03 00:16:47 -07:00
Satoshi Kataoka c7f8d54d6e Merge "Prepare for changing text color for functional keys" 2013-10-03 07:15:03 +00:00
Satoshi Kataoka 194e004e81 Prepare for changing text color for functional keys
Bug: 10786040

Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
2013-10-03 15:54:46 +09:00