6014f1c92b
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: I8a8c6d2c1f3bafb2f6e86a2381b88933b6ac3718
2011-01-14 19:14:36 +09:00
e5585c1854
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/src/com/android/inputmethod/latin/BinaryDictionary.java
java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
Change-Id: Ib2b4acc9dd570d5f37b6aa455e2f07b0a884944a
2011-01-14 13:45:21 +09:00
543334cc21
Fix descriptions for strings.
...
Bug: 2876541
Bug: 2988169
Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
2011-01-14 11:06:59 +09:00
eead8c8311
Add discription for keyboard/voice subtype string resources
...
Bug: 3197096
Change-Id: I9dafcbf4d5775b3b928be54e546ac38042ece685
2011-01-13 11:52:15 +09:00
d12def6dc8
Merge remote branch 'goog/master' into merge
...
Conflicts:
java/res/values-cs/strings.xml
java/res/values-da/strings.xml
java/res/values-de/strings.xml
java/res/values-el/strings.xml
java/res/values-es-rUS/strings.xml
java/res/values-es/strings.xml
java/res/values-fr/strings.xml
java/res/values-it/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-nb/strings.xml
java/res/values-nl/strings.xml
java/res/values-pl/strings.xml
java/res/values-pt-rPT/strings.xml
java/res/values-pt/strings.xml
java/res/values-ru/strings.xml
java/res/values-sv/strings.xml
java/res/values-tr/strings.xml
java/res/values-xlarge/dimens.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
java/res/values/bools.xml
java/res/xml/kbd_qwerty_rows.xml
java/res/xml/method.xml
java/res/xml/prefs.xml
Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86
2010-12-27 20:13:16 +09:00
c59009648c
Add description and CHAR LIMIT to string resources
...
Bug: 3290252
Change-Id: I1978e132de0280bec5c90bd14d9f4823d742bada
2010-12-17 17:40:04 +09:00
183fbbb0db
Revise language string size on spacebar
...
bug: 3290290
Change-Id: I09694392d7fa447796c56a1f74b5b719ca28e466
2010-12-16 16:53:02 +09:00
246acc5033
Make "Tab" and "ALT" and "123" as donottranslate resources
...
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
2010-12-14 15:33:24 +09:00
1b1f7f907f
Cleanup unused string resources
...
This change also renames some "completion" to "correction".
Change-Id: I156dd7ccafe99a632721f20769d5f0ea5915a564
2010-12-12 21:55:00 +09:00
2e4b1bdb7f
Prefer United Kingdom to Great Britain as locale string
...
bug: 3256252
Change-Id: I19a0b763e9314a69f054b1b0996317325d6a4661
2010-12-06 23:53:45 +09:00
e18bd3e323
Fix voice key on phone device
...
This change,
- changes voice key code back to -102
- renames some key code names and method names
- adds mic_slash_holo to drawable-hdpi
Change-Id: I8be3a20921f472ece4298edad2d275f29a7e4955
2010-12-06 12:29:59 +09:00
b80f171623
Merge remote branch 'goog/master' into merge6
...
Change-Id: If021cd2074cd4c4f6755a7ceaec0e90ea122956c
2010-12-03 13:08:21 -08:00
7215c3bd40
Add [CHAR LIMIT] comment to strings
...
Bug: 3245533
Change-Id: If4dc017f302b6a0e960818d4db6d616988bf802f
2010-12-02 11:57:40 +09:00
6569b400fe
Update string for Ic0d5f862
...
bug: 3232408
Change-Id: I642e736190e63bdf1591d5d7f29ef05b7e82fe03
2010-12-01 22:57:14 +09:00
e6f8bb04b6
Add fr_CH keyboard subtype
...
Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
2010-12-01 21:26:16 +09:00
80e459f8c9
Update the voice input warning dialog message string.
...
Updated the relevant settings menu as well.
bug: 3194809
Change-Id: Ibcd00fcf32f82b7733da155ef6e15e389d53c645
2010-12-01 14:14:47 +09:00
842b3d4115
Support de,fr locale keyboard layouts for tablet
...
This change introduces,
- support de QWERTZ
- support fr AZERTY
- support fr_CA QWERTY layout
- support fr_CH QWERTZ layout
- refactor some common keyboard row layouts
Bug: 2334086
Change-Id: I3e01e841e0dc72419d55e29d426bdec70655459c
2010-12-01 10:17:16 +09:00
0ff78a1bae
Remove unused string for key label
...
Bug: 3230041
Change-Id: I1c3cc78157f30f43a5b4a32e413fb43df1db4907
2010-11-30 09:51:12 +09:00
0b60f83192
Support <key-style/> and keyStyle attribute for Keyboard XML
...
Change-Id: Ie052e989d0180eecfc8c244ba6c60594a46103d1
2010-11-22 18:33:47 -08:00
cd39f2adee
Add keyLabelAlign attribute to Keyboard XML
...
Bug: 3216592
Change-Id: I88f8055199f2cd0525faf9374114fbebba53b951
2010-11-20 18:48:55 -08:00
75fde64890
Cleanup drawable-xlarge resources into drawable-mdpi
...
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
2010-11-19 01:37:38 -08:00
95175d488b
Add an option for the userbility study mode
...
Change-Id: If41ddfa933f8ade58afa03acbd9536e0477baae8
2010-11-16 07:55:50 +09:00
7599cfea4a
Add showing suggestion only on portrait mode and fixing the state of suggestion strip
...
Change-Id: I7babd1400a3516c87506a3ea4bd46ddaf89e19b4
2010-11-16 07:30:08 +09:00
38976d5b96
Add labels for subtypes
...
- Also changed mode name
- Move the position of a subtype for "US Keyboard" to the top
Change-Id: I4dd7f869801d5efa775fe8a89dde233215f508d9
2010-11-05 11:44:31 +09:00
03728d6d0f
Add [CHAR LIMIT] to some strings for key top
...
Bug: 3147476
Change-Id: Ic3d898761b6953560dfec34813e96eddab351675
2010-11-04 17:22:30 +09:00
4d3a4dc211
Add phone keyboard layout
...
Change-Id: I97d146ef2756ffe5adb17fcbf04f5e91a0587aa5
2010-10-09 12:35:37 +09:00
ad289ae49b
am 2fd1de46: am 47a9c3f3: Additional string update for LatinIME\'s re-correction preference item.
...
Merge commit '2fd1de46010c9c7836fcae94180d067c50677bab'
* commit '2fd1de46010c9c7836fcae94180d067c50677bab':
Additional string update for LatinIME's re-correction preference item.
2010-10-08 14:36:47 -07:00
a7fda868d9
am 57108c2f: am 3425026d: Follow-up to Ia135eb92 . Shorten overflowed string.
...
Merge commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4'
* commit '57108c2f1c5b811a8b207ac53f4e3b4ef7ddcba4':
Follow-up to Ia135eb92 . Shorten overflowed string.
2010-10-08 14:36:25 -07:00
4d9add5482
am 2501d736: am 47383758: Fix bug 3063598, change "tap" to "touch" thrice.
...
Merge commit '2501d7363c3fec777956dd57a558c8bfe75e002c'
* commit '2501d7363c3fec777956dd57a558c8bfe75e002c':
Fix bug 3063598, change "tap" to "touch" thrice.
2010-10-06 17:09:06 -07:00
47a9c3f3d9
Additional string update for LatinIME's re-correction preference item.
...
Follow-up to I703054c9
bug: 3063598
Change-Id: Ic9d752b8588a620b3e256fe38f3a6a0c9c093053
2010-10-07 01:02:06 +09:00
3425026d51
Follow-up to Ia135eb92 . Shorten overflowed string.
...
bug: 3063598
Change-Id: I703054c930590ef62579183731935ec3362406cd
2010-10-06 17:40:40 +09:00
47383758fc
Fix bug 3063598, change "tap" to "touch" thrice.
...
Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42
2010-10-05 06:39:15 -07:00
66e306d01c
Add keyHintIcon attribute to BaseKeyboard.Key class
...
This keyHintIcon attribute is used to specify hint icon drawable at
top right corner of Key.
Change-Id: Icaa91e63c4473b2513396bd3fbeb8ed6fd73586c
2010-10-05 20:28:04 +09:00
b1abda8d62
Add an auto complete's threshold option.
...
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
2010-10-05 14:44:00 +09:00
a48d298d10
resolved conflicts for merge of b9c0ed59 to master
...
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
bf96661d33
Add Debug Settings Activity
...
Bug:3033472
Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
2b90a1adcb
am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key.
...
Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'
* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
Add a new preference item to show/hide the settings key.
2010-09-15 16:49:53 -07:00
1508c0e84f
Add a new preference item to show/hide the settings key.
...
bug: 2998722
Change-Id: Iac1641c338388fd8f85e0cf47e31afdaeb34c0c0
2010-09-16 02:48:10 +09:00
8f8581e5c0
am aada63bd: am 12b6fef3: Merge "Extract alternates_for_X from strings.xml into altchars.xml" into gingerbread
...
Merge commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90'
* commit 'aada63bd751b061a03b7d9e8e9af7920e4ab3a90':
Extract alternates_for_X from strings.xml into altchars.xml
2010-09-08 10:37:59 -07:00
5555f900b1
Extract alternates_for_X from strings.xml into altchars.xml
...
For some locales, donottranslate.xml were split or renamed.
Bug: 2973749
Change-Id: Ic7f9cebe70a116b735bebc988778104bb1a40954
2010-09-08 18:08:48 +09:00
3dbc3a0afa
Merge remote branch 'goog/master' into merge6
2010-09-08 00:47:05 +09:00
85d85c2026
DO NOT MERGE. Fix a string for the sharedpreference for re-correction
...
Change-Id: I0f8b45cf4604aeed31ecb53f60ff52e0f337bbdd
2010-09-08 00:45:32 +09:00
7385b4af91
Fix a string for the preference for re-correction
...
Change-Id: I1d0adcf72450441c3657995cc17550a078845f0e
2010-09-08 00:24:09 +09:00
eca9637390
Merge remote branch 'goog/master' into merge4
...
Conflicts:
java/res/values/strings.xml
Change-Id: Iee1abd3c11e07f681b9f7a280c3621a0c33ffc90
2010-09-07 22:37:39 +09:00
fa12d86cb5
am dacc927a: am c1ff2846: Update strings for the settings access - based on the latest GB IME spec (ver 03). Please refer to bug: 2979069 for the latest mock.
...
Merge commit 'dacc927a57b0c7adfbdf244441b9b2495c959980'
* commit 'dacc927a57b0c7adfbdf244441b9b2495c959980':
Update strings for the settings access - based on the latest GB IME spec (ver 03).
2010-09-07 05:35:02 -07:00
c1ff28462e
Update strings for the settings access - based on the latest GB IME spec (ver 03).
...
Please refer to bug: 2979069 for the latest mock.
Got rid of obsolete string too.
Change-Id: Ic02d1651b288f24f9c3a9da5d0dcf09055256ab0
2010-09-07 21:28:44 +09:00
41aa565480
Merge remote branch 'goog/master' into merge
2010-09-07 15:48:43 +09:00
e1cb2e4977
resolved conflicts for merge of 36d2d0e7 to master
...
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
2010-09-07 15:37:32 +09:00
66b42a1c2d
Add shared preference for re-correction
...
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
2010-09-07 15:23:10 +09:00
4d67480fe2
Merge remote branch 'goog/master' into mastermerge
...
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
Change-Id: I8fe443f434ced0cf18b1aa86e38fb8913a5b75c2
2010-09-03 22:57:28 +09:00
satok
Tadashi G. Takaoka
Ken Wakasa
Roy West
Mitsuhiro Shimoda