The Android Automerger
f60ed63370
merge in ics-release history after reset to master
2011-06-27 06:51:06 -07:00
satok
b2d1967e1c
Merge remote-tracking branch 'goog/master' into HEAD
...
Conflicts:
java/res/values/keyboard-icons-ics.xml
Change-Id: I8b9b0758a81efd984cc9af52280ef75a807cd991
2011-06-27 22:47:11 +09:00
Tadashi G. Takaoka
8aee759262
Remove reference to system theme
...
This change also introduces
* Background for space key preview
* Tune stone theme
Change-Id: I84fca0baf2392582da870d2ff77b3e99c28faf7b
2011-06-27 22:36:04 +09:00
satok
387293ddf5
Merge remote-tracking branch 'goog/master' into merge
2011-06-27 20:35:06 +09:00
Tadashi G. Takaoka
281e180c33
Fix NPE
...
Change-Id: Ie4b8b657fc6cc5a819d4ea3a0ca4536e6fdf6825
2011-06-27 20:30:40 +09:00
satok
a12292f053
Merge remote-tracking branch 'goog/master' into merge
2011-06-27 20:19:50 +09:00
Tadashi G. Takaoka
d8850ae1ab
Merge "Draw phone/number keyboard layout witout icon"
2011-06-27 04:17:51 -07:00
Tadashi G. Takaoka
b47319867e
Show long suggestion in condensed and ellipsized text
...
Bug: 4903845
Change-Id: I75d58fb55f81594ebb2628ea21d00c2eb59fa70e
2011-06-27 20:17:08 +09:00
Tadashi G. Takaoka
520a297ad1
Draw phone/number keyboard layout witout icon
...
This change introduces:
* New KeyboardView attribute
* keyLargeLetterRatio to specify large letter text size.
* keyHintLabelRatio to specify hint label text size.
* keyHintLabelColor to specify hint label text color.
* keyPreviewTextRatio to specify key preview text size.
* New Key.keyLabelOption flags
* alignLeftOfCenter, align the key label slightly left of the key center.
* largeLetter, use keyLargeLetterRatio to draw key letter.
* hasHintLabel, draw keyHintLabel at the right of key letter.
* followKeyHintLabelRatio, draw the key label following keyHintLabelRatio size.
* Renames
* Key.keyHintLetter to keyHintLabel.
* Key.keylLabelOption fontFixedWidth to fontMonoSpace.
* Key.keylLabelOption popupHint to hasPopupHint.
* Removes
* number icon releted attributes and declarations.
Change-Id: I2f456737e3a46209e5f48b5155951b2b21a33859
2011-06-27 20:04:34 +09:00
Tadashi G. Takaoka
717a8f50ae
Use dedicated layout for "touch to save word" feature
...
Change-Id: Ie8c948476740a645d8b2d9a9d821236941d27adf
2011-06-27 18:04:22 +09:00
Tadashi G. Takaoka
7fb04fe007
Fix ragged suggestion strip baseline
...
Change-Id: I5fa9e2ad0993602e24f436e1d8ad0999209e5180
2011-06-26 02:07:07 +09:00
Ken Wakasa
4f0d290c5d
Avoid memory leak by by non-static Handler inner classes
...
bug: 4901934
Change-Id: I870ab2e621ef3640a84468f09c074cdd726dc963
2011-06-26 00:14:40 +09:00
The Android Automerger
eb2863a020
merge in ics-release history after reset to master
2011-06-24 14:22:52 -07:00
The Android Automerger
db8b896b0a
merge in ics-release history after reset to master
2011-06-24 13:30:30 -07:00
Ken Wakasa
e7de39ac42
Merge "Tiny string fix."
2011-06-24 08:23:40 -07:00
Ken Wakasa
c79aa482a8
Tiny string fix.
...
Change-Id: I56dd023b770ffbb85d7be1440301596b77c8d8c2
2011-06-25 00:16:55 +09:00
The Android Open Source Project
b0d7edd452
Reconcile with gingerbread-release
...
Change-Id: I31accda200f9a95127e977ecefaa92090e37709d
2011-06-24 08:08:52 -07:00
satok
49043b841a
Merge remote-tracking branch 'goog/master' into merge
2011-06-24 21:50:08 +09:00
Tadashi G. Takaoka
87a32135ab
Merge "Remove spacebar preview and arrows"
2011-06-24 05:45:09 -07:00
Tadashi G. Takaoka
14daf66fc5
Remove spacebar preview and arrows
...
Change-Id: I07f1b7bbf222d90e95919304e82d7d054df2868d
2011-06-24 21:41:27 +09:00
satok
07a62cf3d6
Added very aggressive
...
Bug: 4905916
Change-Id: I7365dd417855c980a56ab3bc513e9bc824b3182e
2011-06-24 21:31:10 +09:00
satok
0a6eab1791
Fix build
...
Change-Id: I158bd0dafac83ed9576a236813875e6c37513860
2011-06-24 21:11:32 +09:00
Jean Chalard
bbda98dc3e
Merge "Add a link from Latin IME to the dictionary pack."
2011-06-24 04:27:12 -07: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
Ken Wakasa
52344a0788
Fix NPE with the unit test
...
Change-Id: I0836f8b7191287bcff65cdc8a8ce0ff7484e9f65
2011-06-24 15:31:09 +09:00
Tadashi G. Takaoka
2442e77985
Display suggested word info in debug mode
...
Bug: 4686782
Change-Id: I0e5bef33aa39c3d6f75edda7818524965aa40b79
2011-06-24 14:19:59 +09:00
Tadashi G. Takaoka
703e7252ba
Fix popup key preview on 7/11 inch tablet
...
Change-Id: I42b4c0c7a554089baa778205da0627daaff667c6
2011-06-24 08:44:11 +09:00
Tadashi G. Takaoka
2b9eb15c0d
Fix extract mode visual
...
Bug: 4850051
Change-Id: Id30e15c6c1c341d3a7712165bd4fb0875d1ad8f1
2011-06-24 07:52:35 +09:00
Tadashi G. Takaoka
1bca5b6e83
Revert "Remove extra spacing from candidate strip to fix extract mode layout"
...
This reverts commit 177fc54d8c
.
Bug: 4904733
Change-Id: I7ab48ea559a9aafa58b1a2847f4398d24e9b1cfb
2011-06-24 07:51:49 +09:00
Adam Powell
177fc54d8c
Remove extra spacing from candidate strip to fix extract mode layout
...
Change-Id: Icb2b7d66196cd7d36bedb11eadad0d743f7c048e
2011-06-23 13:18:11 -07:00
Tadashi G. Takaoka
c83d0f0c85
Fix stale key style reference
...
This is a followup change of Ie7413852.
Bug: 4586882
Change-Id: I3472b1dc718b0fd24f419cb559553f9133ed84f9
2011-06-24 02:21:33 +09:00
Tadashi G. Takaoka
80b79bf9a2
Merge "Fix "Show settings key" option on 7" device"
2011-06-23 08:35:21 -07:00
Tadashi G. Takaoka
cd96a691b1
Fix "Show settings key" option on 7" device
...
Cherry-pic I993ac772 from Honeycomb-MR2.
Bug: 4586882
Change-Id: Ie74138523a3ae7958c7bec674c49aa0ab1a72d05
2011-06-24 00:08:42 +09:00
Tadashi G. Takaoka
da9b132513
am ef0d2123
: (-s ours) am 20ffde8d
: (-s ours) am 52fbad88
: Support Turkish keyboard (DO NOT MERGE)
...
* commit 'ef0d2123871d18813bab796672e92a169a4fcaf2':
Support Turkish keyboard (DO NOT MERGE)
2011-06-23 07:47:10 -07:00
Tadashi G. Takaoka
35bda743ed
Merge "Move Key class out of internal package"
2011-06-23 07:22:58 -07:00
Tadashi G. Takaoka
e7759091dd
Move Key class out of internal package
...
Bug: 4903326
Change-Id: I2493d6dae613d2e37dfa8ce96b4cddc9a038160c
2011-06-23 22:59:12 +09:00
The Android Automerger
64bd892ee1
merge in ics-release history after reset to master
2011-06-23 06:44:42 -07:00
Tadashi G. Takaoka
75d7fb6675
Remove unused argument from PopupPanel.showPanel
...
Change-Id: I726b98001042c8b874113ed964b7230fdd525abe
2011-06-23 21:14:55 +09:00
Tadashi G. Takaoka
9116bf18f9
New IceCreamSandwich assets and theme
...
This change instroduces new IceCreamSandwich assets and renames
Honeycomb theme to IceCreamSandwich. Though checked only on
hdpi-phone and mdpi-10"-tablet.
File another bug (Bug: 4852048) to fine tune keyboard layout for all
possible combination of devices and themes.
Bug: 4436327
Change-Id: I4f8dc1dd6b798a39204702bbcbebf17a199dc82f
2011-06-23 21:06:17 +09:00
Alan Viverette
44f8dc3132
Fixing build error due to refactored import.
...
Change-Id: I7ed51fa4373fd5d1ebc6ebe52c6e93b27b43cff5
2011-06-22 12:08:10 -07:00
Svetoslav Ganov
8521781fd7
Merge "Added support for touch exploration to Latin IME."
2011-06-22 11:50:28 -07:00
Freeman Ng
ae706548d6
Merge "move setup wizard package name into google namespace"
2011-06-22 11:03:43 -07: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
3edc97b275
Merge "Remove colorScheme attribute from KeyboardView"
2011-06-22 08:51:36 -07:00
The Android Automerger
45424d4ff3
merge in ics-release history after reset to master
2011-06-22 06:48:38 -07:00
Tadashi G. Takaoka
a93d27d6b8
Remove colorScheme attribute from KeyboardView
...
Change-Id: I9de118e8be60b9a6fe1aecc00332ba08872db918
2011-06-22 22:45:03 +09:00
Tadashi G. Takaoka
a7eed902f1
Make CandidateView backward compatible
...
Up to version 10 (Gingerbread) of the API, FrameLayout doesn't handle
margin properly. This change inserts RelativeLayout to FrameLayout as
placer to set margin and place children views absolutely.
Change-Id: Iee785bc2da77677738caf456bcd2bbf57b89f007
2011-06-22 20:16:21 +09:00
Tadashi G. Takaoka
b947c73dcc
Merge "Add German QWERTY keyboard"
2011-06-22 01:52:17 -07:00
Tadashi G. Takaoka
e90fae82d6
Add German QWERTY keyboard
...
Bug: 3268561
Change-Id: I56a74dc04d337d8d5701d99e5c92493dbcc06e41
2011-06-22 17:46:56 +09:00