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

188 commits

Author SHA1 Message Date
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
satok
c7e1642610 am 663bc844: am 1e51430e: Merge "Update assets for LatinIME" into gingerbread 
Merge commit '663bc8440e02318718b9175c7da7700c6a434623'

* commit '663bc8440e02318718b9175c7da7700c6a434623':
  Update assets for LatinIME
 2010-09-07 06:25:38 -07:00
satok
1e51430e66 Merge "Update assets for LatinIME" into gingerbread 2010-09-07 06:21:41 -07:00
satok
6627b95dde Update assets for LatinIME 
bug: 2974998

Change-Id: Ie98a023b65d34f08c9c66d04017e8877b31edb84
 2010-09-07 22:11:02 +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
0723056043 Merge "Add shared preference for re-correction" into gingerbread 2010-09-06 23:23:40 -07:00
satok
66b42a1c2d Add shared preference for re-correction 
Change-Id: Ie5b2e0d2f9739dd33524c2688e172e77aac1f243
 2010-09-07 15:23:10 +09:00
satok
6a454a9fa0 am ed34cd19: am d27c7aea: Add isModifier to the buttons in the lowest line 
Merge commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f'

* commit 'ed34cd19a93528c960380d57e024f49cb17d5e5f':
  Add isModifier to the buttons in the lowest line
 2010-09-06 23:08:23 -07:00
satok
d27c7aea7c Add isModifier to the buttons in the lowest line 
Change-Id: I2d5c9e753f0f6fa21fdcfa7b55e81e6a3e3ea64f
 2010-09-07 14:57:49 +09:00
satok
470a0c9e71 am ef40dd52: am f02e4208: Merge "Fix an asset for the feedback of delete key" into gingerbread 
Merge commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2'

* commit 'ef40dd52aa8eef0366586f80cbfe5cb0b63ad4f2':
  Fix an asset for the feedback of delete key
 2010-09-06 04:10:34 -07:00
satok
f02e42080b Merge "Fix an asset for the feedback of delete key" into gingerbread 2010-09-06 04:07:04 -07:00
satok
532471e357 Fix an asset for the feedback of delete key 
bug: 2977026

Change-Id: I4cdaaf49644d214b03a514a9104144250a024574
 2010-09-06 19:20:49 +09:00
Ken Wakasa
7ec731a7ee am b6e3cb8f: am a8d9702f: Fix layout issue of the bottom row in web entry mode 
Merge commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791'

* commit 'b6e3cb8f8de487f537bf8522ed4d494798e03791':
  Fix layout issue of the bottom row in web entry mode
 2010-09-05 06:46:35 -07:00
Ken Wakasa
a8d9702fc4 Fix layout issue of the bottom row in web entry mode 
bug: 2977061
Change-Id: I76e0f4a21480d10f79fd5dcbe58c63cc3516d5d7
 2010-09-05 22:26:55 +09:00
satok
7086f726c7 Re-add debug mode preference 
Change-Id: Ie7fbe53bd3e74ab0cd44954ab21e60b723e3ef60
 2010-09-03 23:48:24 +09:00
satok
b899be6b51 Enable theme switcher 
Change-Id: I8d20d7802ebfab61bb01eb399e10ec775536ef85
 2010-09-03 23:24:38 +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
133bad6b85 am 025bafb5: am 6f8ff3b9: Merge "Update delete key" into gingerbread 
Merge commit '025bafb5d4272323491eb90a845ead44de4d80b7'

* commit '025bafb5d4272323491eb90a845ead44de4d80b7':
  Update delete key
 2010-09-02 23:34:16 -07:00
satok
6f8ff3b971 Merge "Update delete key" into gingerbread 2010-09-02 23:30:40 -07:00
satok
ec8c4f0d37 am 66546535: am c5841994: Merge "Change symbol on space bar when autocompletion is activated" into gingerbread 
Merge commit '6654653562d0ec5d46a74f8c49eab2488e273cf2'

* commit '6654653562d0ec5d46a74f8c49eab2488e273cf2':
  Change symbol on space bar when autocompletion is activated
 2010-09-02 23:30:24 -07:00
satok
cf41bd392f Update delete key 
Change-Id: I0348e4846131f9913b4ab6c2c2a9427a9a53c74e
 2010-09-03 15:27:07 +09:00
satok
c5841994af Merge "Change symbol on space bar when autocompletion is activated" into gingerbread 2010-09-02 23:26:06 -07:00
satok
41feaaadb7 Change symbol on space bar when autocompletion is activated 
bug: 2959279

Change-Id: Icc70b7cce0c245ae2451d324debd346f226b8769
 2010-09-03 15:17:26 +09:00
Tadashi G. Takaoka
539fb1bc67 am 20052f34: am fe72f135: Remove close button from mini keyboard 
Merge commit '20052f34f987ab946d54cc405fa42cd0510fb94f'

* commit '20052f34f987ab946d54cc405fa42cd0510fb94f':
  Remove close button from mini keyboard
 2010-09-02 13:15:20 -07:00
Tadashi G. Takaoka
fe72f135b8 Remove close button from mini keyboard 
Bug: 2959169
Change-Id: I9c78f9417aaa448b8b23596bc3e748fe99085393
 2010-09-03 04:56:12 +09:00
Tadashi G. Takaoka
6c8109dc15 am a723409a: am f0fd5065: Merge "Add a number alternation to English popup mini keyboard" into gingerbread 
Merge commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00'

* commit 'a723409acfe9a2c32be2c3a0d6e5be9a0dd82f00':
  Add a number alternation to English popup mini keyboard
 2010-09-02 12:56:00 -07:00
Tadashi G. Takaoka
3b4ecdeb05 Add a number alternation to English popup mini keyboard 
This change is only for English locale.  For other locales we should
need specification because keyboard layout and alternations are
different by locale.

Bug: 2959169
Change-Id: Ib63f53ce6c30d75eff78777aa0049b05d58ce55f
 2010-09-02 21:06:30 +09:00
Ken Wakasa
5cb51224b2 am 3e6bd26f: am 83c6069b: Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed. 
Merge commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6'

* commit '3e6bd26f7d2d78c3c2ae123d0f34682d374371f6':
  Decrease LatinKeyboardBaseView_keyPreviewOffset.  Popup will be displayed closer to each key typed.
 2010-09-02 02:18:05 -07:00
Ken Wakasa
83c6069b98 Decrease LatinKeyboardBaseView_keyPreviewOffset. Popup will be displayed closer to each key typed. 
Change-Id: I863ade61cb4688214d90b24240743ee7fe16e491
 2010-09-02 18:07:50 +09:00
satok
0798443d3d am e66f3fbd: am 8f5b0ccc: Update assets for LatinIME 
Merge commit 'e66f3fbdfec8ceee127c47654dfbe227577ab484'

* commit 'e66f3fbdfec8ceee127c47654dfbe227577ab484':
  Update assets for LatinIME
 2010-09-02 00:17:10 -07:00
satok
8f5b0ccc50 Update assets for LatinIME 
Change-Id: Ia3027b68abcc9a51bc6a21320926b9c8b5c5975a
 2010-09-02 16:05:19 +09:00
satok
d5180e0401 am 81f7989c: am c175e80d: Merge "Add modifiers to functional keys" into gingerbread 
Merge commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0'

* commit '81f7989c1aa626f10e2ad8def6de7003b96dcef0':
  Add modifiers to functional keys
 2010-09-01 22:39:39 -07:00
satok
c175e80d57 Merge "Add modifiers to functional keys" into gingerbread 2010-09-01 22:36:06 -07:00
satok
d383364ee4 Add modifiers to functional keys 
- update assets for language switcher

Change-Id: I8f29d3d38fb73ab5673f9e58cf28ed37cc8b4004
 2010-09-02 14:18:46 +09:00
satok
11b448528b am c5363012: am a327485e: Change the preference name for a theme and remove a preference settings 
Merge commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc'

* commit 'c5363012b846733e9a3b7ce7de5b04e58644bedc':
  Change the preference name for a theme and remove a preference settings
 2010-09-01 22:07:20 -07:00
satok
a327485e59 Change the preference name for a theme and remove a preference settings 
Change-Id: I5ad980559477775eb44df022e54ce5ef32398601
 2010-09-02 13:54:30 +09:00
satok
ee01bf1408 am 308acfa7: am ac4f8e46: Merge "Change background color for functional keys in LatinIME" into gingerbread 
Merge commit '308acfa714a3a0aae073871e76e753b5a98096d1'

* commit '308acfa714a3a0aae073871e76e753b5a98096d1':
  Change background color for functional keys in LatinIME
 2010-09-01 20:06:05 -07:00
satok
dd8dd9fc1b Change background color for functional keys in LatinIME 
Change-Id: I45f13c1fd139ce43478e5d0b2cdb62e56e9f77a8
 2010-09-02 11:47:33 +09:00
Ken Wakasa
d7dba7c33d am fb82afd4: am 40ac45eb: Get rid of arrows in candidate view 
Merge commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400'

* commit 'fb82afd48b6882cbdbb6477dca9526cd22d69400':
  Get rid of arrows in candidate view
 2010-09-01 08:30:56 -07:00
satok
6f99ca9eaa am 103381eb: am d4f60bc8: Merge "Fix new theme assets and resources" into gingerbread 
Merge commit '103381ebf1a833ec478dd1bac41e67cf7d538f67'

* commit '103381ebf1a833ec478dd1bac41e67cf7d538f67':
  Fix new theme assets and resources
 2010-09-01 08:30:54 -07:00
satok
948ddac172 am fcba07ad: am 4de4d51d: Merge "Remove old unused delete key assets" into gingerbread 
Merge commit 'fcba07adb72962029d6d046301d471fc471af352'

* commit 'fcba07adb72962029d6d046301d471fc471af352':
  Remove old unused delete key assets
 2010-09-01 08:30:45 -07:00
satok
270db06604 am fbd2aaf5: am a8d5e6d3: Remove duplicated assets 
Merge commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70'

* commit 'fbd2aaf5ffb98035f6ed85589effa7a73b85fa70':
  Remove duplicated assets
 2010-09-01 08:30:36 -07: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
Ken Wakasa
40ac45ebdc Get rid of arrows in candidate view 
bug: 2959293
Change-Id: Ia5dcb29397f608846f865fabb3c696866b3687aa
 2010-09-01 17:59:12 +09:00
satok
d4f60bc8fc Merge "Fix new theme assets and resources" into gingerbread 2010-09-01 01:52:31 -07:00