Commit graph

34245 commits

Author SHA1 Message Date
satok
1869d13742 am 15a7e837: Merge "Dim previously suggested words" into honeycomb
* commit '15a7e837ab619df1e3844cd59b337c6ac56a0daf':
  Dim previously suggested words
2011-01-20 22:23:45 -08:00
satok
15a7e837ab Merge "Dim previously suggested words" into honeycomb 2011-01-20 22:22:13 -08:00
Tadashi G. Takaoka
d47237aed2 am 6e7dcd75: Merge "Use simple smiley for the emoticon key" into honeycomb
* commit '6e7dcd755eb4292b0b92cbba8237174b6317da05':
  Use simple smiley for the emoticon key
2011-01-20 22:21:52 -08:00
Tadashi G. Takaoka
6e7dcd755e Merge "Use simple smiley for the emoticon key" into honeycomb 2011-01-20 22:20:22 -08:00
satok
6f7218627e Dim previously suggested words
Change-Id: Id673c03bfa22ea9ce1bedb5174d8309a37a2a460
2011-01-21 15:20:21 +09:00
Tadashi G. Takaoka
6fe297a905 Use simple smiley for the emoticon key
This change uses keyLable to show simple smiley on the key top and
removes sym_keyboard_smiley_holo drawable.

Bug: 3350296
Change-Id: I7d28db8a6f74936f932f250a70991a1bd1ff4ddd
2011-01-21 15:17:09 +09:00
satok
b14fc8822b am 58d6d061: Disable touchable region until we come up with correct implementation
* commit '58d6d0615d62c45c390bb4c5c0e3d2efabac814d':
  Disable touchable region until we come up with correct implementation
2011-01-20 21:58:30 -08:00
Tadashi G. Takaoka
795de14a91 am a2ad96d9: Make settings dialog cancel-able by touching outside
* commit 'a2ad96d95986eb61c3d2d5abce154fb4c3803cac':
  Make settings dialog cancel-able by touching outside
2011-01-20 21:45:10 -08:00
satok
58d6d0615d Disable touchable region until we come up with correct implementation
bug: 3373640

Change-Id: I22448b779b0adc60f590aaef916075c7847dcdc9
2011-01-21 14:41:20 +09:00
Tadashi G. Takaoka
a2ad96d959 Make settings dialog cancel-able by touching outside
Bug: 3374426
Change-Id: I6ba9b82d4481c43c78b59e78dcf22cd9875a8240
2011-01-21 14:07:05 +09:00
Tadashi G. Takaoka
4eb52e6e08 am 2fa21f58: Add input method subtype selector and IME settings dialog
* commit '2fa21f5854e1565deb139e0bf22719fecc5340bc':
  Add input method subtype selector and IME settings dialog
2011-01-20 17:14:34 -08:00
Tadashi G. Takaoka
2fa21f5854 Add input method subtype selector and IME settings dialog
Bug: 3351762
Change-Id: Ic1767faac6d4470a89cacb851d449ac53b2f8205
2011-01-21 02:30:52 +09:00
Ken Wakasa
d9243baa81 am 6a12b693: am fefda4e6: Refine InputMethodInfo API
* commit '6a12b693ee4916c70387a5c937c2e438ab0dafe4':
  Refine InputMethodInfo API
2011-01-20 08:16:13 -08:00
Ken Wakasa
6a12b693ee am fefda4e6: Refine InputMethodInfo API
* commit 'fefda4e6df5c2f8e2b2730dfe5b88644a1caaa6b':
  Refine InputMethodInfo API
2011-01-20 08:14:22 -08:00
Ken Wakasa
fefda4e6df Refine InputMethodInfo API
bug: 3370297
Change-Id: I16073e6b8b90a06a20e506dac66e3ca25b4712d0
2011-01-20 23:29:53 +09:00
satok
c4d4d838d7 am f4a5be4b: am 6845da8d: Add touchable region
* commit 'f4a5be4ba1f37280857fc84c566504f0e5408b96':
  Add touchable region
2011-01-20 05:10:59 -08:00
satok
f4a5be4ba1 am 6845da8d: Add touchable region
* commit '6845da8d7b940018c4ef77646f0028d131ed2753':
  Add touchable region
2011-01-20 05:09:06 -08:00
satok
6845da8d7b Add touchable region
Bug: 3238092

Change-Id: I3cda3106a61c40c3b66741dc38c9ff4cc55f487b
2011-01-20 22:04:42 +09:00
satok
094dfb497f am 01a0cd66: am 439f2dbe: Change the order of subtypes list
* commit '01a0cd6624e65ce7454f6224a6d8c727c80b1906':
  Change the order of subtypes list
2011-01-19 09:10:19 -08:00
satok
01a0cd6624 am 439f2dbe: Change the order of subtypes list
* commit '439f2dbe1b5b7c7e227122ae465defaf31f4a7a8':
  Change the order of subtypes list
2011-01-19 09:08:08 -08:00
satok
439f2dbe1b Change the order of subtypes list
Change-Id: I748ed8e8a280832c1e3170ed070c2ae22ee7d5c1
2011-01-20 02:02:56 +09:00
satok
913f9919d2 am 56169dcf: am 4022a799: Merge "Add subtype languages" into honeycomb
* commit '56169dcf6a4d0d84a0a3699427e2e593effec5bc':
  Add subtype languages
2011-01-19 08:22:15 -08:00
satok
56169dcf6a am 4022a799: Merge "Add subtype languages" into honeycomb
* commit '4022a79957476450647b4c1c32c02a2d725e5589':
  Add subtype languages
2011-01-19 08:20:01 -08: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
b7b8312554 Merge "Merge remote branch 'goog/master' into merge" into froyo-ub-latinimegoogle 2011-01-19 03:34:48 -08: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
86497c88d2 am 16dc76af: am 89764ad4: Simplify text correction settings in latin IME.
* commit '16dc76af4d73838fd5a5148a91a0a47fe2c56906':
  Simplify text correction settings in latin IME.
2011-01-19 03:14:53 -08:00
Jean Chalard
16dc76af4d am 89764ad4: Simplify text correction settings in latin IME.
* commit '89764ad4ac5415fb9753c38671b1fa18b9cdd390':
  Simplify text correction settings in latin IME.
2011-01-19 03:13:44 -08:00
Jean Chalard
89764ad4ac Simplify text correction settings in latin IME.
Conditionally remove the "Quick fixes", "Bigram suggestions" and
"Usability study mode" options, depending on configuration.
When disabled, have the quick fixes and bigram option become
false if autocorrect is off, and true otherwise.
Also reorder options to bring "Auto correction" above "Show
suggestions".

bug: 3282448

Change-Id: Ib7fd928be417a816ef9e21423a531773069b7468
2011-01-19 20:08:46 +09:00
Jean Chalard
19bca2a227 am aa4e054d: am ce9c4171: Change separator titles in settings screen.
* commit 'aa4e054dd69ffe597f9e06aa0d6eeb2c30585184':
  Change separator titles in settings screen.
2011-01-19 03:00:43 -08:00
Jean Chalard
aa4e054dd6 am ce9c4171: Change separator titles in settings screen.
* commit 'ce9c4171842d37fccb2cc5fe0cbcba06998ddf32':
  Change separator titles in settings screen.
2011-01-19 02:59:37 -08: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
029511cc04 am 1e6d3910: am ce4b2d2d: Merge "Add a safety net for auto-correction." into honeycomb
* commit '1e6d39104814083011d556376974f241e51a8bed':
  Add a safety net for auto-correction.
2011-01-19 01:08:00 -08:00
satok
1e6d391048 am ce4b2d2d: Merge "Add a safety net for auto-correction." into honeycomb
* commit 'ce4b2d2daba8005c2c07a995c8a145ee812f56ff':
  Add a safety net for auto-correction.
2011-01-19 01:05:39 -08:00
satok
ce4b2d2dab Merge "Add a safety net for auto-correction." into honeycomb 2011-01-19 01:02:28 -08:00
satok
82411d47ba Add a safety net for auto-correction.
Bug: 3353956

Change-Id: I6a32632b2f986f0d9a07aa72f256a2c41cc09873
2011-01-19 17:54:22 +09:00
Ken Wakasa
c11184638e am 53746972: am 86f189fd: Fix NPE
* commit '53746972d0dda9cbbf3d49cfa71271eaeb5cfe5b':
  Fix NPE
2011-01-19 00:51:48 -08:00
Ken Wakasa
53746972d0 am 86f189fd: Fix NPE
* commit '86f189fd969de7259a0e0fcc1cf868ba667f3e3b':
  Fix NPE
2011-01-19 00:50:18 -08:00
Ken Wakasa
86f189fd96 Fix NPE
bug: 3364217
Change-Id: If6a2514a8feac509d7b6716c8574521a0ec0fa3e
2011-01-19 17:44:51 +09:00
Tadashi G. Takaoka
35abc2d89a am d2e931f7: am 08ca36d0: Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb
* commit 'd2e931f782f53d26bde25e5436030ae50e641a26':
  Pressing shift could turn off shift state while auto capitalize mode
2011-01-18 22:02:52 -08:00
Jean Chalard
25952f8d96 am b66c0c2a: am 8b0febc6: Merge "Simplify latin IME settings page." into honeycomb
* commit 'b66c0c2a18874cd215408d1a5e872ee0db5f38b9':
  Simplify latin IME settings page.
2011-01-18 22:02:50 -08:00
Tadashi G. Takaoka
d2e931f782 am 08ca36d0: Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb
* commit '08ca36d0383a7d222d58709f55c497f3432dc229':
  Pressing shift could turn off shift state while auto capitalize mode
2011-01-18 19:19:46 -08:00
Tadashi G. Takaoka
08ca36d038 Merge "Pressing shift could turn off shift state while auto capitalize mode" into honeycomb 2011-01-18 19:18:01 -08:00
Jean Chalard
b66c0c2a18 am 8b0febc6: Merge "Simplify latin IME settings page." into honeycomb
* commit '8b0febc6f0b6c2bd2a7b135fe1e1b7ff296727c1':
  Simplify latin IME settings page.
2011-01-18 19:10:46 -08:00
Jean Chalard
8b0febc6f0 Merge "Simplify latin IME settings page." into honeycomb 2011-01-18 19:08:15 -08:00
Tadashi G. Takaoka
d01ae897d3 Pressing shift could turn off shift state while auto capitalize mode
Bug: 3363137
Change-Id: I442c1fbb185ad9ea16ee9bab70649f2b9f89400c
2011-01-19 11:59:45 +09:00
Luca Zanolin
7c3a7616d2 am fb3183ef: am bbd651a0: Change the UI of Voice IME to be more like Voice Search.
* commit 'fb3183efe049798b7dbecdfcbb049009d44b5a66':
  Change the UI of Voice IME to be more like Voice Search.
2011-01-18 08:49:57 -08:00
satok
17e7849214 am 934e3e5f: am da9eb594: Merge "Disable auto-correct when previous suggestion candidates are shown" into honeycomb
* commit '934e3e5fbd31fa45a3e37a9a1b71dcf58b07d1e6':
  Disable auto-correct when previous suggestion candidates are shown
2011-01-18 08:49:56 -08:00
Tadashi G. Takaoka
ee18c00e83 am fa9e2595: am 26df6b50: Merge "Load keyboard correctly when subtype has been changed to keyboard" into honeycomb
* commit 'fa9e2595f5e173fb45af8431e7a339a1a00aceaa':
  Load keyboard correctly when subtype has been changed to keyboard
2011-01-18 08:49:51 -08:00