nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
7527 commits 1 branch 0 tags 363 MiB
Commit graph

170 commits

Author SHA1 Message Date
Ken Wakasa
2ba975afb9 Turn off the Settings key by default 
bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
 2011-07-31 07:26:24 +09:00
Jean Chalard
f50aa19337 Purge quick fixes option. 
This change removes everything related to the quick fixes
Latin IME option item.
Note that Autotext is still used if the current subtype language
is the same as the system language.

Bug: 4985058
Change-Id: I51728a2190543ffb9e004470674ef6257b14f6c2
 2011-07-26 16:25:57 +09:00
satok
2c18ffb97f Merge "[step3] Add spell checker service." 2011-07-25 13:48:47 -07:00
satok
022c1cc203 [step3] Add spell checker service. 
Change-Id: Ib13b3a524e0f0b90de40a3e255040b3158d49258
 2011-07-25 11:05:24 +09:00
Ken Wakasa
8f98cdef0e Tidy up the subtype names 
Change-Id: I5dbdc6c006fab01fa389f0796b6c87aa2a90132e
 2011-07-23 17:42:23 +09:00
Tadashi G. Takaoka
ef5dfc480c Remove sliding spacebar language switcher 
Bug: 4971680
Change-Id: Ia3485ddcf8051bf7b7ba7f7a37fa75c3bc8a4798
 2011-07-19 23:24:49 -07:00
Tadashi G. Takaoka
bf9d8348d8 Support select input method dialog on pre-HC platform 
Bug: 4971680
Change-Id: I641b336da54813e13409bd7874aa22e51f790729
 2011-07-19 22:22:47 -07:00
satok
1a3bb54bb4 Use InputMethodSettingsFragment 
Bug: 4979539

Change-Id: I4f2010f785eb29ccd42b488c402ef9957633e0c2
 2011-07-09 11:25:54 +09:00
Tadashi G. Takaoka
a65d84ce81 Merge "Add key description for "fullwidth asterisk" used on phone/number layout" 2011-06-29 03:02:30 -07:00
Tadashi G. Takaoka
0464850e6c Add key description for "fullwidth asterisk" used on phone/number layout 
This change also removes non-ASCII comment from strings.xml to
suppress resource compiler warning.

Change-Id: I96d3e8e2c7072816f32a15564745f8cdc3f91ee9
 2011-06-29 18:51:22 +09:00
satok
8b0f34dbd3 Remove sliding explanation 
Change-Id: Iae35385a3fadd7acc8a67b6a8f9beda9cab96cc9
 2011-06-29 18:08:31 +09:00
satok
a12292f053 Merge remote-tracking branch 'goog/master' into merge 2011-06-27 20:19:50 +09:00
Ken Wakasa
c79aa482a8 Tiny string fix. 
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
 2011-06-25 00:16:55 +09:00
satok
49043b841a Merge remote-tracking branch 'goog/master' into merge 2011-06-24 21:50:08 +09:00
satok
07a62cf3d6 Added very aggressive 
Bug: 4905916

Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
 2011-06-24 21:31:10 +09:00
Jean Chalard
4f3d5d3733 Add a link from Latin IME to the dictionary pack. 
The link only shows up if the dictionary pack is installed.

Bug: 1752028
Change-Id: I4af0a0a63324c155609710064a25df0deeb82b4d
 2011-06-24 20:17:38 +09:00
satok
80a9ce76d8 Merge remote-tracking branch 'goog/master' into merge 
Conflicts:
	java/res/xml/method.xml

Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd
 2011-06-24 18:38:41 +09:00
Alan Viverette
5ac4638f99 Added support for touch exploration to Latin IME. 
Bug: 4379983
Change-Id: I97f22e54827c6229054b514801401ffa5b4ed3b8
 2011-06-22 10:54:06 -07:00
Tadashi G. Takaoka
e90fae82d6 Add German QWERTY keyboard 
Bug: 3268561
Change-Id: I56a74dc04d337d8d5701d99e5c92493dbcc06e41
 2011-06-22 17:46:56 +09:00
Tadashi G. Takaoka
35f20916e5 Support Turkish keyboard 
I left TODOs in Suggest.java because we must pay attention to locale
when changing character's case. Filed another Bug: 4769095 to track
that.

Bug: 4768050
Change-Id: I1ae2c4ffd2208403a8c2a25dd3a56b71dcefc826
 2011-06-21 17:50:17 +09:00
Tadashi G. Takaoka
2c43ed179e Support Croatian keyboard 
Basically Croatian keyboard is QWERTZ layout with extra letters such
as č, ć, đ, ž and š.  This change just introduces Croatian keyboard
subtype and QWERTZ layout which has the extra letters as popup mini
keyboard of base letter.

It might be great if we could have dedidated table layout.

Bug: 4309160
Change-Id: I0fc227295defa56029ca06e406f73833b992be0e
 2011-06-18 01:05:54 +09:00
Tadashi G. Takaoka
1b580e3f1a Add Finnish and Hungarian keyboard subtype 
There are already both languages keyboard layout. Finnish is based on
Scandinavian layout and Hungarian is based on QWERTZ.

Change-Id: I6c804495bf1ae56661bc5c714e0c500132cd55a8
 2011-06-17 22:31:04 +09:00
Jean Chalard
699094f9b6 Add an option to use or not the contacts dictionary. 
Bug: 4586840
Change-Id: If62cd57e5ab661e6a51a5442d09bf0af8f08f263
 2011-06-13 17:33:04 +09:00
Tadashi G. Takaoka
a645d88228 Remove unused resources 
Bug: 4436327
Change-Id: I2573786aac5fd8d543cf12d24c951b67c7353fd7
 2011-05-16 16:22:39 +09:00
satok
def6b35a9e Merge remote-tracking branch 'goog/master' into merge 
Conflicts:
	java/res/xml/method.xml

Change-Id: I455cb689f3a1baca7cc8b8ef88d9dbcdca8128a3
 2011-05-13 21:11:19 +09:00
Jean Chalard
240297d0ee Add advanced settings screen 
Also add an option for popup dismissal delay so as to inaugurate the
new screen.  Besides, remove a path for options to escape from
LatinIME and replace with a direct read from the settings.

Change-Id: I7ec6e724262871fa6523506ecc39f65c5fbe34da
 2011-05-13 20:40:21 +09:00
satok
cbcae9a6e8 Merge "Fix the available input locales and moved Recorrection" 2011-05-12 19:33:58 -07:00
satok
f733074aae Fix the available input locales and moved Recorrection 
Bug: 4409091

Change-Id: I6efd23ebb9528bf1bd35320057a0ea264c187451
 2011-05-12 20:26:24 +09:00
Tadashi G. Takaoka
101a00e3d4 Revert "Added support for speaking keys through accessibility service." 
This reverts commit dcade18113.

Bug: 4379983
Change-Id: I2448d8f03990a39a3e328a88904d82efc70241a2
 2011-05-12 00:14:55 +09:00
satok
55f38adab9 Merge remote-tracking branch 'goog/master' into merge 
Conflicts:
	java/res/xml/method.xml

Change-Id: I04a476465593d25105545b98607425d2978ff872
 2011-05-11 12:18:21 +09:00
satok
0d8a4eb367 Add pl keyboard layout 
Bug: 4394303

Change-Id: I0fa24829e1240549728d9b81af3e39a024725016
 2011-05-06 19:22:08 +09:00
satok
65a3fb01c1 Merge remote-tracking branch 'goog/master' into merge 2011-04-22 17:11:06 +09:00
satok
940b8d81f3 Merge "Add an debug option to use spacebar switcher" 2011-04-22 00:51:07 -07:00
satok
c5a2b51924 Add an debug option to use spacebar switcher 
Change-Id: Icc483f097696a1c5a2a7ab037afce19c9cfe837f
 2011-04-22 15:54:39 +09:00
Jean Chalard
b50591295d Add an option for using bigram prediction. 
This change adds the option for bigram prediction under the option
for bigram suggestion. The "prediction" option depends on the
"suggestion" option.
This change also reorders a tad bit the settings screen. Namely, it
sticks both bigram options under a "bigram" category, and groups the
options that did not have a group under a "other options", or misc,
category.
Finally this change also renames the internal name of the "text
corrections" option category to "correction_category" instead of
"prediction_category" which was misleading.

Change-Id: I2d8787c8a391fd8202ed3a686c613494b7260a1e
 2011-04-22 15:53:48 +09:00
satok
a511e0b432 Merge remote branch 'goog/master' into merge 
Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/deprecated/VoiceProxy.java
	java/src/com/android/inputmethod/keyboard/KeyboardId.java
	java/src/com/android/inputmethod/latin/BinaryDictionary.java
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/latin/Utils.java

Change-Id: Ic102a0fbfc3b8f9dd65dd6eabb421f9211f5d9a5
 2011-03-25 15:17:08 -07:00
Jean Chalard
e50add1fbd Add a first version of Hebrew and Arabic keyboard. 
The Arabic keyboard is more or less based on PC keyboard and other
sources. It has no means to input diacritics at the moment.
Some data for the Hebrew keyboard was already there, but not used.
This change splits phone and tablet layout and consolidates the
tablet one to something that seems sensible. It can't input diacritics
either at the moment.

Other shortcomings affect those keyboards. For example, normal
Hebrew keyboards switch to capital QWERTY keyboard with shift on,
as there are no capital Hebrew characters, but this version does not
feature this.

It should be mostly possible already to enter Arabic or Hebrew with
these keyboards however.

Change-Id: Ic4df2a9a77ffd03c4f9ee2c47e03c0f43f8e48ae
 2011-03-23 22:31:40 -07:00
Alan Viverette
dcade18113 Added support for speaking keys through accessibility service. 
Issue: 3366636

Change-Id: I70a2ebb4420782ba4d7d874ffc2259bb1b80446f
 2011-02-23 18:16:43 -08:00
satok
a7ea6cad82 Merge remote branch 'goog/master' into merge 
Conflicts:
	java/res/xml/method.xml
	java/src/com/android/inputmethod/latin/LatinIME.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: I9b62da120dcc08327fde92459ee5c7564a5eb6b8
 2011-02-10 17:31:37 +09:00
satok
0b0c522523 Added voice input languages 
bug: 3382825

Change-Id: Iec031dffb86e4b05a4a718d17afe20064d14633e
 2011-01-26 15:04:02 +09:00
Jean Chalard
2f4cc01e61 Clarify a settings summary text. 
Change-Id: I98ee8bbe312a1515199b9c5c56c390010e8ef616
 2011-01-25 17:31:34 +09:00
Tadashi G. Takaoka
156493cf66 Add description for auto correction threshold strings 
Bug: 3088802
Bug: 3091970
Change-Id: I6f0cdb9ec74824497ff5f9e3a2ca5d7d29de0dd7
 2011-01-24 14:51:39 +09:00
satok
4022a79957 Merge "Add subtype languages" into honeycomb 2011-01-19 08:17:05 -08:00
satok
be324535f6 Add subtype languages 
Change-Id: Ib251bd63f79281a4dc1739b213b16e8a936ea319
 2011-01-20 01:15:09 +09:00
satok
9c383385d5 Merge remote branch 'goog/master' into merge 
Conflicts:
	java/src/com/android/inputmethod/latin/Settings.java
	java/src/com/android/inputmethod/latin/SubtypeSwitcher.java
	java/src/com/android/inputmethod/voice/VoiceIMEConnector.java

Change-Id: If30410c4814c3224f87698c165312494c0efca23
 2011-01-19 20:33:55 +09:00
Jean Chalard
ce9c417184 Change separator titles in settings screen. 
Add a "General" category to enclose general settings, and rename
"Word suggestion settings" to "Text correction".

bug: 3282448

Change-Id: Ie695683af0646974da82e29e11d1c3a785ef46c7
 2011-01-19 19:50:14 +09:00
satok
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
Tadashi G. Takaoka
297d6619b3 Add CHAR LIMIT to string resources 
Bug: 2988183
Bug: 3276544
Change-Id: Ib5c2c86972b1ab32468cd0ab9370ec629255c54d
 2011-01-14 18:29:35 +09:00
satok
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
satok
543334cc21 Fix descriptions for strings. 
Bug: 2876541
Bug: 2988169

Change-Id: I80130aa258e38f638b226448ba53a7efaeb6c3d7
 2011-01-14 11:06:59 +09:00
Tadashi G. Takaoka
eead8c8311 Add discription for keyboard/voice subtype string resources 
Bug: 3197096
Change-Id: I9dafcbf4d5775b3b928be54e546ac38042ece685
 2011-01-13 11:52:15 +09:00
satok
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
Tadashi G. Takaoka
c59009648c Add description and CHAR LIMIT to string resources 
Bug: 3290252

Change-Id: I1978e132de0280bec5c90bd14d9f4823d742bada
 2010-12-17 17:40:04 +09:00
Ken Wakasa
183fbbb0db Revise language string size on spacebar 
bug: 3290290
Change-Id: I09694392d7fa447796c56a1f74b5b719ca28e466
 2010-12-16 16:53:02 +09:00
Tadashi G. Takaoka
246acc5033 Make "Tab" and "ALT" and "123" as donottranslate resources 
Bug: 3273889
Change-Id: I1bd47ffbc7bc92d66d421c5f2787acf14e08e0f7
 2010-12-14 15:33:24 +09:00
Tadashi G. Takaoka
1b1f7f907f Cleanup unused string resources 
This change also renames some "completion" to "correction".

Change-Id: I156dd7ccafe99a632721f20769d5f0ea5915a564
 2010-12-12 21:55:00 +09:00
Ken Wakasa
2e4b1bdb7f Prefer United Kingdom to Great Britain as locale string 
bug: 3256252
Change-Id: I19a0b763e9314a69f054b1b0996317325d6a4661
 2010-12-06 23:53:45 +09:00
Tadashi G. Takaoka
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
satok
b80f171623 Merge remote branch 'goog/master' into merge6 
Change-Id: If021cd2074cd4c4f6755a7ceaec0e90ea122956c
 2010-12-03 13:08:21 -08:00
Tadashi G. Takaoka
7215c3bd40 Add [CHAR LIMIT] comment to strings 
Bug: 3245533
Change-Id: If4dc017f302b6a0e960818d4db6d616988bf802f
 2010-12-02 11:57:40 +09:00
Ken Wakasa
6569b400fe Update string for Ic0d5f862 
bug: 3232408
Change-Id: I642e736190e63bdf1591d5d7f29ef05b7e82fe03
 2010-12-01 22:57:14 +09:00
Tadashi G. Takaoka
e6f8bb04b6 Add fr_CH keyboard subtype 
Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
 2010-12-01 21:26:16 +09:00
Ken Wakasa
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
0ff78a1bae Remove unused string for key label 
Bug: 3230041
Change-Id: I1c3cc78157f30f43a5b4a32e413fb43df1db4907
 2010-11-30 09:51:12 +09:00
Tadashi G. Takaoka
0b60f83192 Support <key-style/> and keyStyle attribute for Keyboard XML 
Change-Id: Ie052e989d0180eecfc8c244ba6c60594a46103d1
 2010-11-22 18:33:47 -08:00
Tadashi G. Takaoka
cd39f2adee Add keyLabelAlign attribute to Keyboard XML 
Bug: 3216592
Change-Id: I88f8055199f2cd0525faf9374114fbebba53b951
 2010-11-20 18:48:55 -08:00
Tadashi G. Takaoka
75fde64890 Cleanup drawable-xlarge resources into drawable-mdpi 
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
 2010-11-19 01:37:38 -08:00
satok
95175d488b Add an option for the userbility study mode 
Change-Id: If41ddfa933f8ade58afa03acbd9536e0477baae8
 2010-11-16 07:55:50 +09:00
satok
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
satok
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
Tadashi G. Takaoka
03728d6d0f Add [CHAR LIMIT] to some strings for key top 
Bug: 3147476
Change-Id: Ic3d898761b6953560dfec34813e96eddab351675
 2010-11-04 17:22:30 +09:00
Tadashi G. Takaoka
4d3a4dc211 Add phone keyboard layout 
Change-Id: I97d146ef2756ffe5adb17fcbf04f5e91a0587aa5
 2010-10-09 12:35:37 +09:00
Ken Wakasa
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
Ken Wakasa
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
Roy West
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
Ken Wakasa
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
Ken Wakasa
3425026d51 Follow-up to Ia135eb92 . Shorten overflowed string. 
bug: 3063598
Change-Id: I703054c930590ef62579183731935ec3362406cd
 2010-10-06 17:40:40 +09:00
Roy West
47383758fc Fix bug 3063598, change "tap" to "touch" thrice. 
Change-Id: Ia135eb926a5f2896a480cd478d40925d46041d42
 2010-10-05 06:39:15 -07:00
Tadashi G. Takaoka
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
Mitsuhiro Shimoda
b1abda8d62 Add an auto complete's threshold option. 
Change-Id: I3a6821ced8642ab8f954e79a25e31766e4a18eb8
 2010-10-05 14:44:00 +09:00
satok
a48d298d10 resolved conflicts for merge of b9c0ed59 to master 
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
 2010-09-27 15:33:24 +09:00
satok
bf96661d33 Add Debug Settings Activity 
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
 2010-09-27 14:07:10 +09:00
Ken Wakasa
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
Ken Wakasa
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
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
satok
3dbc3a0afa Merge remote branch 'goog/master' into merge6 2010-09-08 00:47:05 +09:00
satok
85d85c2026 DO NOT MERGE. Fix a string for the sharedpreference for re-correction 
Change-Id: I0f8b45cf4604aeed31ecb53f60ff52e0f337bbdd
 2010-09-08 00:45:32 +09:00
satok
7385b4af91 Fix a string for the preference for re-correction 
Change-Id: I1d0adcf72450441c3657995cc17550a078845f0e
 2010-09-08 00:24:09 +09:00
satok
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
Ken Wakasa
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
Ken Wakasa
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
satok
41aa565480 Merge remote branch 'goog/master' into merge 2010-09-07 15:48:43 +09:00
satok
e1cb2e4977 resolved conflicts for merge of 36d2d0e7 to master 
Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12
 2010-09-07 15:37:32 +09:00
satok
66b42a1c2d Add shared preference for re-correction 
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
 2010-09-07 15:23:10 +09:00
satok
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
6a36764a8d am e5ae8c62: am 1b09ac4f: Merge "Add a showing input method picker option by longpressing setting key" into gingerbread 
Merge commit 'e5ae8c62c83ad29d623562a74355bc619c216742'

* commit 'e5ae8c62c83ad29d623562a74355bc619c216742':
  Add a showing input method picker option by longpressing setting key
 2010-09-03 01:55:37 -07:00
satok
9a6a4d3d5f Add a showing input method picker option by longpressing setting key 
Bug: 2959271

Change-Id: I4b7e9a2de3cbe17b168ed8d0541a9b1cd9a9e107
 2010-09-03 17:48:44 +09:00
satok
132927f20e am 4d09b2e7: am 31adfa78: Add a new theme for Gingerbread 
Merge commit '4d09b2e78e68ef0f1b713b10e280e56d91592717'

* commit '4d09b2e78e68ef0f1b713b10e280e56d91592717':
  Add a new theme for Gingerbread
 2010-09-01 08:30:31 -07:00