Commit graph

7644 commits

Author SHA1 Message Date
satok
a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
satok
b9c0ed59d0 am 3a2b9035: Merge "Add Debug Settings Activity" into gingerbread
Merge commit '3a2b90357ce056765d5c9d6dec0335c308e21717' into gingerbread-plus-aosp

* commit '3a2b90357ce056765d5c9d6dec0335c308e21717':
  Add Debug Settings Activity
2010-09-26 22:26:26 -07:00
satok
3a2b90357c Merge "Add Debug Settings Activity" into gingerbread 2010-09-26 22:15:57 -07:00
satok
bf96661d33 Add Debug Settings Activity
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Eric Fischer
d316b900b0 am b3671b58: (-s ours) am 89711080: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'b3671b58280b13337533bba385296810e81ff7be'

* commit 'b3671b58280b13337533bba385296810e81ff7be':
  Import revised translations.  DO NOT MERGE
2010-09-24 15:21:45 -07:00
Eric Fischer
30dd9b5d48 Import revised translations.
Change-Id: I38532015c089c0a5c6c1b98fe44f282918aebe5e
2010-09-24 12:28:30 -07:00
Eric Fischer
b3671b5828 am 89711080: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '89711080dcf41d97d731dd1c5d6615ce087bc501' into gingerbread-plus-aosp

* commit '89711080dcf41d97d731dd1c5d6615ce087bc501':
  Import revised translations.  DO NOT MERGE
2010-09-24 11:09:17 -07:00
Eric Fischer
89711080dc Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-09-24 10:39:07 -07:00
Eric Fischer
5deb1678b2 Import revised translations. DO NOT MERGE
Change-Id: I1bf6a9e39adbe7d8e938f6dd5fe12227f8da4053
2010-09-24 10:26:49 -07:00
Ken Wakasa
760e7b24ad am ca2fba71: am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread
Merge commit 'ca2fba71086b3832998ee9039723b66cce3be300'

* commit 'ca2fba71086b3832998ee9039723b66cce3be300':
  Keep addWordToDictionary from doing disk I/O on main thread
2010-09-24 08:40:48 -07:00
Ken Wakasa
ca2fba7108 am 6ee1bd42: Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread
Merge commit '6ee1bd425bc44d91dbb151e999e9781bc301e632' into gingerbread-plus-aosp

* commit '6ee1bd425bc44d91dbb151e999e9781bc301e632':
  Keep addWordToDictionary from doing disk I/O on main thread
2010-09-24 08:36:07 -07:00
Ken Wakasa
6ee1bd425b Merge "Keep addWordToDictionary from doing disk I/O on main thread" into gingerbread 2010-09-24 08:33:31 -07:00
Ken Wakasa
336bc6bfeb Keep addWordToDictionary from doing disk I/O on main thread
bug: 2999524

Change-Id: Id8b04d38079cfa1dadd5955eb7f83085e60eb8e2
2010-09-25 00:14:24 +09:00
Tadashi G. Takaoka
05ebb2e511 am bf03559f: am 64e5a194: Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread
Merge commit 'bf03559f7e38cd51cb5fd6b0afa937982cbffc67'

* commit 'bf03559f7e38cd51cb5fd6b0afa937982cbffc67':
  Add enter/exit animation style to prevew and mini keyboard
2010-09-24 06:27:24 -07:00
Tadashi G. Takaoka
bf03559f7e am 64e5a194: Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread
Merge commit '64e5a1940f69d3640ab5ca49bc62004625e73f4e' into gingerbread-plus-aosp

* commit '64e5a1940f69d3640ab5ca49bc62004625e73f4e':
  Add enter/exit animation style to prevew and mini keyboard
2010-09-24 06:17:36 -07:00
Tadashi G. Takaoka
64e5a1940f Merge "Add enter/exit animation style to prevew and mini keyboard" into gingerbread 2010-09-24 06:07:23 -07:00
Tadashi G. Takaoka
0ae817c9ae Add enter/exit animation style to prevew and mini keyboard
TODO This animation style API of PopupWindow can be called only in
Gingrebread or later.  We should refactor this using reflection to be
able to be compatible with Froyo.

Bug: 3004787
Bug: 2973989
Change-Id: I2abfcc853b1a0af2bccee7bdf5fbd723456b7d34
2010-09-24 20:51:13 +09:00
satok
3da22f8146 am 27bddbe6: am 1bebdcb4: Move RingCharBuffer as a singleton in Util
Merge commit '27bddbe67f00953dc82a8543fe610c9010f7077c'

* commit '27bddbe67f00953dc82a8543fe610c9010f7077c':
  Move RingCharBuffer as a singleton in Util
2010-09-24 00:36:20 -07:00
satok
27bddbe67f am 1bebdcb4: Move RingCharBuffer as a singleton in Util
Merge commit '1bebdcb4e422c0d9e52833dfd3bc0a8b9e07a266' into gingerbread-plus-aosp

* commit '1bebdcb4e422c0d9e52833dfd3bc0a8b9e07a266':
  Move RingCharBuffer as a singleton in Util
2010-09-24 00:32:45 -07:00
satok
1bebdcb4e4 Move RingCharBuffer as a singleton in Util
Change-Id: I08d09555a99a64038374e62019777d331c48319b
2010-09-24 16:27:36 +09:00
Ken Wakasa
e76fad939b am 5521d06f: am 5339950b: Update mdpi visual assets of upper-right number hint
Merge commit '5521d06fe582c4b4b0d653544c0d0847029b5f1c'

* commit '5521d06fe582c4b4b0d653544c0d0847029b5f1c':
  Update mdpi visual assets of upper-right number hint
2010-09-23 23:44:07 -07:00
Ken Wakasa
5521d06fe5 am 5339950b: Update mdpi visual assets of upper-right number hint
Merge commit '5339950bbcb4ed281d7c5eec7e3c9aa0ff1106c0' into gingerbread-plus-aosp

* commit '5339950bbcb4ed281d7c5eec7e3c9aa0ff1106c0':
  Update mdpi visual assets of upper-right number hint
2010-09-23 23:36:33 -07:00
Ken Wakasa
5339950bbc Update mdpi visual assets of upper-right number hint
Change-Id: I77e2b70f4ec954ea2a0822f7bdb92d8a4d405f7f
2010-09-24 15:03:02 +09:00
Tadashi G. Takaoka
ae7e550662 am bc63621f: am 9d44411a: Fixed popup mini-keyboard position
Merge commit 'bc63621fcf1db2933f708bf3dd81b2b2f2211c5e'

* commit 'bc63621fcf1db2933f708bf3dd81b2b2f2211c5e':
  Fixed popup mini-keyboard position
2010-09-23 04:14:55 -07:00
Tadashi G. Takaoka
bc63621fcf am 9d44411a: Fixed popup mini-keyboard position
Merge commit '9d44411a82f93e46b4691b446163aa0c77a20e87' into gingerbread-plus-aosp

* commit '9d44411a82f93e46b4691b446163aa0c77a20e87':
  Fixed popup mini-keyboard position
2010-09-23 04:11:38 -07:00
Tadashi G. Takaoka
9d44411a82 Fixed popup mini-keyboard position
This change reverts I28bf3e4deb46a428dc8422a3a165183e00608604 partly

Bug: 3029284
Change-Id: I0701ab9dfa1cfddbecbef3d32e525c0a143fc297
2010-09-23 20:04:13 +09:00
Tadashi G. Takaoka
6721b98b5c am ec8b7360: am 77542988: Tune left and right padding of popup mini keyboard
Merge commit 'ec8b7360161f37d00d178bef37c30352982cd007'

* commit 'ec8b7360161f37d00d178bef37c30352982cd007':
  Tune left and right padding of popup mini keyboard
2010-09-23 00:13:48 -07:00
Tadashi G. Takaoka
ec8b736016 am 77542988: Tune left and right padding of popup mini keyboard
Merge commit '77542988b809fba6a59aa86982eb4d9e4269477e' into gingerbread-plus-aosp

* commit '77542988b809fba6a59aa86982eb4d9e4269477e':
  Tune left and right padding of popup mini keyboard
2010-09-23 00:05:15 -07:00
Tadashi G. Takaoka
77542988b8 Tune left and right padding of popup mini keyboard
This change also fix popup window display position calculation.

Bug: 3029284
Change-Id: I28bf3e4deb46a428dc8422a3a165183e00608604
2010-09-23 15:53:05 +09:00
Tadashi G. Takaoka
48ef8f4a25 am a8f77c36: am 23f7fb03: Merge "Disable invoking VoiceIME using swipe right action" into gingerbread
Merge commit 'a8f77c36ca985cb356b03b25f5cd30fd3b25dc9a'

* commit 'a8f77c36ca985cb356b03b25f5cd30fd3b25dc9a':
  Disable invoking VoiceIME using swipe right action
2010-09-22 22:57:15 -07:00
Tadashi G. Takaoka
fc66213d9e am 4fab9f2f: am b75dee4b: Merge "Fix ArrayIndexOutOfBoundsException in WordComposer" into gingerbread
Merge commit '4fab9f2fee9cfb1a67d805c1598deae02fa4d8cc'

* commit '4fab9f2fee9cfb1a67d805c1598deae02fa4d8cc':
  Fix ArrayIndexOutOfBoundsException in WordComposer
2010-09-22 22:57:13 -07:00
Tadashi G. Takaoka
a8f77c36ca am 23f7fb03: Merge "Disable invoking VoiceIME using swipe right action" into gingerbread
Merge commit '23f7fb035da7c00c51002fde94053aa304a437bb' into gingerbread-plus-aosp

* commit '23f7fb035da7c00c51002fde94053aa304a437bb':
  Disable invoking VoiceIME using swipe right action
2010-09-22 22:54:16 -07:00
Tadashi G. Takaoka
4fab9f2fee am b75dee4b: Merge "Fix ArrayIndexOutOfBoundsException in WordComposer" into gingerbread
Merge commit 'b75dee4b00b31524ab73684a948b82b90bae7ba1' into gingerbread-plus-aosp

* commit 'b75dee4b00b31524ab73684a948b82b90bae7ba1':
  Fix ArrayIndexOutOfBoundsException in WordComposer
2010-09-22 22:54:14 -07:00
Tadashi G. Takaoka
23f7fb035d Merge "Disable invoking VoiceIME using swipe right action" into gingerbread 2010-09-22 22:51:11 -07:00
Tadashi G. Takaoka
b75dee4b00 Merge "Fix ArrayIndexOutOfBoundsException in WordComposer" into gingerbread 2010-09-22 22:50:36 -07:00
Tadashi G. Takaoka
d1a8e3088b Fix ArrayIndexOutOfBoundsException in WordComposer
Bug: 3028277
Change-Id: I1c4d8dca4db8a70f851589d1fbd45a16ea1bfc1b
2010-09-23 14:47:26 +09:00
Tadashi G. Takaoka
437cabe0df am 1241be7e: am a96d8a11: Use SystemClock.uptimeMillis() for event time
Merge commit '1241be7e8498b8cca348d74363ece68b3ade730c'

* commit '1241be7e8498b8cca348d74363ece68b3ade730c':
  Use SystemClock.uptimeMillis() for event time
2010-09-22 22:07:58 -07:00
Tadashi G. Takaoka
1241be7e84 am a96d8a11: Use SystemClock.uptimeMillis() for event time
Merge commit 'a96d8a11e84ef9219eb40a815e82ad8a3d852ca5' into gingerbread-plus-aosp

* commit 'a96d8a11e84ef9219eb40a815e82ad8a3d852ca5':
  Use SystemClock.uptimeMillis() for event time
2010-09-22 21:57:28 -07:00
Tadashi G. Takaoka
a96d8a11e8 Use SystemClock.uptimeMillis() for event time
Change-Id: If20f289992f829ae3a0a2a1eb60a4fc9b35c308a
2010-09-23 13:06:03 +09:00
Tadashi G. Takaoka
abd7bba981 Disable invoking VoiceIME using swipe right action
Bug: 3028268
Change-Id: I4bcf35051d5e82b60bb6a346a80ad6c3c03c31cb
2010-09-23 12:55:44 +09:00
Tadashi G. Takaoka
36f64d2bba am 84af4309: am 8493e431: Use constant for keycode.
Merge commit '84af4309f8a2d030bfd042d8363669cc477c676f'

* commit '84af4309f8a2d030bfd042d8363669cc477c676f':
  Use constant for keycode.
2010-09-22 02:42:59 -07:00
Tadashi G. Takaoka
84af4309f8 am 8493e431: Use constant for keycode.
Merge commit '8493e43148e1ec7b004e624f5f79183e167fad1d' into gingerbread-plus-aosp

* commit '8493e43148e1ec7b004e624f5f79183e167fad1d':
  Use constant for keycode.
2010-09-22 02:40:17 -07:00
Tadashi G. Takaoka
8493e43148 Use constant for keycode.
This is follow up change of Idb3adcb6fac1a23836510912d35312fa11b4f259

Change-Id: I130e381b0d5ac01176a746a4a915e2fc9d54587b
2010-09-22 18:29:19 +09:00
Tadashi G. Takaoka
99d6a248ef am 8957296f: am 9d1cb899: Merge "Choose smaller or shorter language name for space bar" into gingerbread
Merge commit '8957296f066b1f624dc4fae71d3eeb5a0fec1b4f'

* commit '8957296f066b1f624dc4fae71d3eeb5a0fec1b4f':
  Choose smaller or shorter language name for space bar
2010-09-22 02:21:20 -07:00
Tadashi G. Takaoka
8957296f06 am 9d1cb899: Merge "Choose smaller or shorter language name for space bar" into gingerbread
Merge commit '9d1cb89939a102872b964612c9735d5ef5d6ab53' into gingerbread-plus-aosp

* commit '9d1cb89939a102872b964612c9735d5ef5d6ab53':
  Choose smaller or shorter language name for space bar
2010-09-22 02:18:43 -07:00
Tadashi G. Takaoka
9d1cb89939 Merge "Choose smaller or shorter language name for space bar" into gingerbread 2010-09-22 02:17:06 -07:00
Tadashi G. Takaoka
8243c7a5e5 Choose smaller or shorter language name for space bar
To fit a language name to the space bar or the language switcher, this
change chooses smaller text size or shorter language name
appropriately.

This change also tunes the vertical position of a language name in the
space bar by parameter SPACEBAR_LANGUAGE_BASELINE.

Bug: 3004640
Bug: 3001021

Change-Id: Idb3adcb6fac1a23836510912d35312fa11b4f259
2010-09-22 18:03:46 +09:00
satok
a1f7df874b am b2570e76: am fd56a14c: Merge "Remove unnecessary assets for LatinIME in GingerBread" into gingerbread
Merge commit 'b2570e76efdb0362805798437dddcfc01b5fd00d'

* commit 'b2570e76efdb0362805798437dddcfc01b5fd00d':
  Remove unnecessary assets for LatinIME in GingerBread
2010-09-22 01:37:26 -07:00
satok
b2570e76ef am fd56a14c: Merge "Remove unnecessary assets for LatinIME in GingerBread" into gingerbread
Merge commit 'fd56a14c6b537a836d16a7110a523d98e3a41401' into gingerbread-plus-aosp

* commit 'fd56a14c6b537a836d16a7110a523d98e3a41401':
  Remove unnecessary assets for LatinIME in GingerBread
2010-09-22 01:33:12 -07:00
satok
fd56a14c6b Merge "Remove unnecessary assets for LatinIME in GingerBread" into gingerbread 2010-09-22 01:30:14 -07:00