Jean Chalard
8b0febc6f0
Merge "Simplify latin IME settings page." into honeycomb
2011-01-18 19:08:15 -08:00
Luca Zanolin
bbd651a008
Change the UI of Voice IME to be more like Voice Search.
...
There has been a bit of refactoring in RecognitionView in particular to fix the portrait layout.
The main issues found were:
- the size of the keyboard is specified in inches, and
(cm)(inches + inches) != ((cm) inches) + ((cm) inches))
- the height of keyboard background is high as the landscape keyboard, but it higher than
the portrait keyboard. This is not an issue on LatinKeyboard, as it overwrite the
onMeasure method. However, if I use the same image background in RelativeLayout
the Relative layout height is set to the height of the background, thus higher than the keyboard
- the change configuration was not propageted correctly
Change-Id: Id5dca425826997c573ccae7a085d5ddc9719733b
2011-01-18 15:49:17 +00:00
Jean Chalard
fd7d814c81
Simplify latin IME settings page.
...
Do not show the recorrection option on xlarge terminals,
and make it true by default. Also, bring the Auto-capitalization
at the top of the settings page.
Issue: 3282448
Change-Id: I51a9ae6c7e496be2970107277f0a4ac65b12821e
2011-01-18 18:41:15 +09:00
Tadashi G. Takaoka
4e73674943
Merge "Add settings key to table keyboard" into honeycomb
2011-01-18 00:50:51 -08:00
Tadashi G. Takaoka
7ab9f601cc
Add settings key to table keyboard
...
Bug: 3351762
Change-Id: Ibee1cf42af2f53017d83034f069b19be6657acbb
2011-01-18 16:27:40 +09:00
Jean Chalard
6c381b38cc
Remove the keyboard popup option by default.
...
Add an option to mask the sound on keypress preference, and
make it false on xlarge terminals by default.
bug: 3282448
Change-Id: I747272d9edf854dc229aa620836cfa35a437d13f
2011-01-18 16:26:11 +09:00
Tadashi G. Takaoka
90a916170f
Disable suggestion strip by default for tablet
...
Bug: 3352374
Change-Id: Ic2fed4ecd6d73f6c2d0ad81061ecd266f4704b10
2011-01-17 19:59:33 +09:00
Tadashi G. Takaoka
66432cfc9b
Place language name at center of spacebar if no space icon
...
This change also leaves the language name as light grayed after fading out.
Bug: 3290290
Change-Id: I71adf80c9a3b77d2fd34bca458845d85d55cbee7
2011-01-17 17:04:53 +09:00
Tadashi G. Takaoka
5a88787e67
Merge "Add SubtypeLocale class" into honeycomb
2011-01-14 05:25:47 -08:00
Tadashi G. Takaoka
c99c0ed939
Merge "Notify keyboard language on space bar when it has changed" into honeycomb
2011-01-14 05:25:35 -08:00
Tadashi G. Takaoka
de0c8874a4
Notify keyboard language on space bar when it has changed
...
This change also introduces the following.
* space bar language switcher is enabled for phone device.
* get rid of spcae key icon from number keyboard of tablet.
* slightly lower the position of language name on space bar of tablet.
Bug: 3290290
Change-Id: I432be8f757bcc84c257770112ff1f6fa7970c584
2011-01-14 20:11:52 +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
48f6ac68b7
Merge "Fix descriptions for strings. Bug: 2876541 Bug: 2988169" into honeycomb
2011-01-13 23:32:38 -08:00
Tadashi G. Takaoka
e276d8ddaa
Add SubtypeLocale class
...
Change-Id: Ic4c73c313f976ad6df1b4ddf48b914d05a08d283
2011-01-14 16:12:36 +09:00
Tadashi G. Takaoka
212368e877
Merge "Support "nm" (no mic) privateImeOptions" into honeycomb
2011-01-13 23:09:38 -08:00
Tadashi G. Takaoka
41f7fb51b0
Make input language selection settings work
...
This change also tweaks the padding of candidate strip for phone.
Change-Id: Iefe4dfeb7015e11d5b2d1566121f719d60b1377e
2011-01-14 14:21:12 +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
0f901aab36
Support "nm" (no mic) privateImeOptions
...
Bug: 3331635
Change-Id: Ide160b9317c8f7d966f879dd460640fc4f894e9b
2011-01-14 10:02:26 +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
Tadashi G. Takaoka
e332d45253
Merge "Fix text color of main key labels in shifted state" into honeycomb
2011-01-11 03:56:23 -08:00
Tadashi G. Takaoka
5f35a89182
Merge "Remove stale suggestion divider drawable" into honeycomb
2011-01-11 03:51:34 -08:00
Tadashi G. Takaoka
926a110fd0
Fix text color of main key labels in shifted state
...
Bug: 3322539
Change-Id: Ib9bc54da8d3725f64c86dbe6d9700e386f74de5e
2011-01-11 20:41:40 +09:00
Tadashi G. Takaoka
7c6ffbc648
Remove stale suggestion divider drawable
...
Bug: 3329543
Change-Id: If96648bf88e1a69e01ebe00d31ddd46df1fca45c
2011-01-11 20:15:15 +09:00
satok
e72a57deae
Tweak keyboard icon
...
Change-Id: I2c802c1c0c5f7e173285656ac47e3251ff97e44d
2011-01-11 17:28:27 +09:00
Eric Fischer
7a42a46069
Merge "Import some unabbreviated translations for large screens." into honeycomb
2011-01-07 12:58:09 -08:00
Eric Fischer
f73e76de00
Mark configuration strings untranslatable.
...
Change-Id: If8a35fe33e2091bcf95cc543e76df1184d52ce2b
2011-01-07 10:42:26 -08:00
Ken Wakasa
715189fe6e
Get rid of the space bar symbol on the tablet.
...
bug: 3290290
Change-Id: I4c57151197989375e6e9f36f508e6e875f856654
2011-01-08 00:15:14 +09:00
Eric Fischer
e494e4d13e
Import some unabbreviated translations for large screens.
...
Change-Id: Ifa1c25a7b2eb40fcaaddca06e3df1a66587cd3e3
2011-01-06 18:18:22 -08:00
Tadashi G. Takaoka
f16028b92e
Remove digit popup characters from mini keyboard of tablet
...
Bug: 3321376
Change-Id: I38d963952d3c6d2cf1ad19a69b32f90191f17178
2011-01-07 01:12:15 +09:00
Tadashi G. Takaoka
cc55d947ad
Calculate mini keyboard key width from labels
...
Change-Id: I4259753bd10fdf488fcffacb6b131e30511e780f
2011-01-06 22:40:20 +09:00
Ken Wakasa
458249e703
Consolidate main dictionary files.
...
This change is a preparation for upcoming optimizations on dictionary file loading.
* We can consolidate dictionary files because we are no longer relying on Asset Manager.
* Stopping compressing dictionary files as planning to use mmap() on the region in the apk file.
* Probably we won't rely on Asset Manager. Instead we'll probably use offset and size obtained from AssetFileDescriptor.
Change-Id: Id57dce512fd3d2397a58628f8264bd824194da76
2011-01-05 11:31:58 +09:00
Tadashi G. Takaoka
05ddb9a5d2
Add config_default_keyboard_theme_id resource
...
Change-Id: Ie4e9e85694cfd43fcd1fdfeeaa477f13c372a8a6
2010-12-28 21:06:45 +09:00
Tadashi G. Takaoka
bfe2b53445
Import new drawable assets
...
Change-Id: Ie74bd49921cca4aee69f9e7bfc8ef93e13d3c4d9
2010-12-24 11:26:26 +09:00
Eric Fischer
9cfb874f7f
Import revised translations.
...
Change-Id: I3d92d46d7683c07e455ba15c0befee9199a442bc
2010-12-23 14:37:28 -08:00
Tadashi G. Takaoka
363cd6ef0f
Make dismissing keyboard by swiping down as configurable
...
Bug: 3306370
Change-Id: If4e258ce4db05fb75dcd3b23fefa422c1287955b
2010-12-23 12:44:40 +09:00
Tadashi G. Takaoka
baf83886be
Filter out too short noisy touch events
...
Bug: 3294017
Change-Id: I1769eab1d096d16bfa9d6f23b973483ee6e7a478
2010-12-21 23:46:15 +09:00
Tadashi G. Takaoka
c4f71668d7
Remove multi-tap feature
...
Change-Id: Ife44b3f9d420d77d2cfb51044a8356f02ed63e8b
2010-12-20 21:58:31 +09:00
Tadashi G. Takaoka
67a4ecacc7
Disallow sliding key input
...
This feature is configurable by R.bool.config_sliding_key_input_enabled.
Bug: 3294076
Change-Id: I0225a6ce19d9b911c9d9543a106ab57ee0b7de75
2010-12-18 20:41:53 +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
Tadashi G. Takaoka
f0ab0b4e86
Merge "Add popupKeyboardTemplate attribute to Keyboard"
2010-12-17 00:21:51 -08:00
Tadashi G. Takaoka
9b6d1d52d9
Add popupKeyboardTemplate attribute to Keyboard
...
This change
- introduces the popupKeyboardTemplate attribute of Keyboard to
specify XML Keyboard file for popup mini keyboard.
- introduces the maxPopupKeyboardColumn attribute of Keyboard to
specify the maximum column of popup mini keyboard.
- changes the content format of the popupCharacters attribute of Key.
It now represents keyLabel, codes and keyTextOutput of each key of
popup mini keyboard using CSV format.
Bug: 2214959
Change-Id: I539e310f7e38a049ee193de0b4ad5d7afdce37b1
2010-12-17 17:18:28 +09:00
Tadashi G. Takaoka
7dc190f6a1
Updated contrast in keys
...
This change also makes the keyboard top gutter slightly taller.
Bug: 3293748
Change-Id: I574a2fea6440c7ad78f8ef51c87b221838b6df13
2010-12-17 16:56:49 +09:00
Ken Wakasa
014f4883c7
Merge "Revise language string size on spacebar"
2010-12-16 00:50:42 -08:00
Tadashi G. Takaoka
a8baf5701f
Merge "Tweak base line of key top letter"
2010-12-16 00:22:23 -08:00
satok
24e1f28f25
Changed Icon for a US English keyboard subtype temporary
...
Change-Id: I422b9a1c055177c35e4dd9564b408179cf82f21e
2010-12-16 16:58:00 +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
98935836f0
Tweak base line of key top letter
...
Bug: 3285380
Change-Id: Idf6b9b7e000d87df924742634188d193f948130f
2010-12-16 16:07:40 +09:00
Tadashi G. Takaoka
160d2ec445
Merge "Update suggestion strip drawables"
2010-12-15 22:56:31 -08:00
Ken Wakasa
5cc2416c6a
Update the spacebar visual.
...
bug: 3290290
Change-Id: I7f48911bf75e1a54b74e500d5d9603e1015b51ae
2010-12-16 12:42:38 +09:00
Tadashi G. Takaoka
e9311bc893
Update suggestion strip drawables
...
Bug: 3286297
Change-Id: I51d4051ea22c465f81852e4fb98e48bad9cf57f1
2010-12-16 12:38:43 +09:00
Eric Fischer
68b6932024
Import revised translations.
...
Change-Id: I65a87452bbd35b850def20bc37eedf3698f4e931
2010-12-14 13:59:57 -08:00
Tadashi G. Takaoka
9cb9f33f0c
Merge "Make "Tab" and "ALT" and "123" as donottranslate resources"
2010-12-13 22:55:48 -08: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
Justin Ho
1a878ffe1f
Merge "Integrating updated LatinIME keyboard assets"
2010-12-13 09:10:59 -08:00
Tadashi G. Takaoka
a893ac38f5
Merge "Tune padding of candidate word"
2010-12-13 01:01:54 -08:00
Tadashi G. Takaoka
4700a6f2b0
Tune padding of candidate word
...
Change-Id: I980e568f9b4b87b0f414aa7ce0197dba39a7708f
2010-12-13 17:46:11 +09:00
satok
7f1d3fa5d8
Remove language settings from preference activity
...
Bug: 3268561
Change-Id: Ia910f0a090dc66c7dd9176999930d8cb763203b0
2010-12-13 15:27:33 +09:00
Tadashi G. Takaoka
9ecad8c2e8
Fix auto correction threshold values array reference
...
This change also removes unused argument from Suggest.getSuggestions().
Change-Id: I512f8695d22898bb906e136a66e0ee6b521cd1d1
2010-12-13 14:40:49 +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
Tadashi G. Takaoka
3ef38b2907
Merge "Introduce SuggestedWords class to represent suggestions list"
2010-12-12 03:58:50 -08:00
Tadashi G. Takaoka
7e181fe101
Introduce SuggestedWords class to represent suggestions list
...
Change-Id: I81677a785640d37296be8b42c7a74bd0c00edf46
2010-12-12 16:44:42 +09:00
Tadashi G. Takaoka
e7f9a2221c
Merge "Swap ",." and "[]" in symbol layout of tablet"
2010-12-11 06:54:32 -08:00
Tadashi G. Takaoka
0459387604
Swap ",." and "[]" in symbol layout of tablet
...
Bug: 3275623
Change-Id: I28c5830f294596810ff747cdbfa467992b2a9a0b
2010-12-11 16:28:29 +09:00
Justin Ho
62f3317e8f
Integrating updated LatinIME keyboard assets
...
Change-Id: I0bddfb452548eccac27586e9837285745da14918
2010-12-10 16:19:50 -08:00
Eric Fischer
a83cfd2923
Import revised translations.
...
Change-Id: Id1e6d52b266966e02f8adf1ae6583e0551868bc7
2010-12-09 16:09:31 -08:00
Tadashi G. Takaoka
9502cc177c
Remove LatinIME prefix from classes
...
This change also cleanups preference key string constants
Change-Id: I58510f220a90d00d71a935731abeab87384675bb
2010-12-09 21:54:51 +09:00
Tadashi G. Takaoka
89c58745d6
Tweak candidate view height and etc.
...
Change-Id: I91963d0be122baf2274ea03b5028a66259a2cdb6
2010-12-08 20:05:34 +09:00
Tadashi G. Takaoka
9f01ed51d7
Support keyboardHeight and maxKeyboardHeight to Keyboard XML
...
This change introduces,
- new attribute keyboardHeight to specify default keyboard height.
- new attribute maxKeyboardHeight to specify maximum keyboard height,
usually specified by percentage to the screen height.
- keyHeight attribute is obsoleted
- new attribute rowHeight to specify a row height, can be specifed as
percentage of the keyboard height. And verticalGap is included to
the row height (row height = key height + vertical gap).
Change-Id: I48a2f2661e8a91a998503a847437c1baf1de9b9c
2010-12-08 17:43:29 +09:00
Tadashi G. Takaoka
e49bd1c43a
Implement CandidateView using HorizontalScrollView
...
This change re-implements CandidateView using HorizontalScrollView and
customized Button, so that the candidate strip can be flingable.
This change also introduces the following features.
- Highlighting candidate strip and space bar is configurable by
@bool/config_candidate_highlight_enabled.
- Candidate strip can be centered with left/right padding if
@dimen/candidate_strip_padding size is greater than 0.
- Candidate text size is configurable by @dimen/candidate_text_size.
Bug: 1575885
Bug: 3230726
Change-Id: Iedf78ff31bc9f2f6291a8e8fb7faa0e6b961dd6d
2010-12-08 16:55:36 +09:00
Tadashi G. Takaoka
ada7ad2b0d
New gutter for tablet keyboard layout
...
Bug: 3253559
Change-Id: I4d5a54ab7664ff090b33aeabe981e0ed24ea21b2
2010-12-07 16:07:12 +09:00
Tadashi G. Takaoka
405daf9c8d
Merge "Add search mode keyboard layout"
2010-12-06 22:16:31 -08:00
Tadashi G. Takaoka
5b146f9ee9
Add some new symbols key to symbols/more keyboard
...
Bug: 3253559
Change-Id: I3c4a546a9c7597d7f85866e7179587132c9eea32
2010-12-07 14:45:05 +09:00
Tadashi G. Takaoka
bafba47a40
Add search mode keyboard layout
...
Bug: 3194695
Change-Id: I602f350882d6e3cb68ae971c1891b887b1f5a510
2010-12-07 14:38:09 +09:00
Tadashi G. Takaoka
2ff2a0410f
Add a mic key to tablet keyboard tentatively for implementation
...
Bug: 3253559
Change-Id: Iba0b7488e112d5f136f6c1a7bfbeab0dac298d54
2010-12-07 14:18:13 +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
Eric Fischer
2aebcf3549
Rename Indonesian and Hebrew translations to match Locale.java conventions
...
Change-Id: I979b2f70e49e96dfdaf0f1ea2f9e1724bb5b60de
2010-12-02 14:12:51 -08:00
Tadashi G. Takaoka
5a309f5715
Move some inner static class to top class in new package
...
This change introduces new package com.android.inputmethod.keyboard
which hosts keyboard related classes.
Also adds missing @Override and @SuppressWarning("unused") annotation
Change-Id: I0317f5cfa317e13f3c77815f48ffc69b5d1ade05
2010-12-02 20:06:01 +09:00
Tadashi G. Takaoka
9b89f6571b
Merge "Add back-slash key"
2010-12-01 20:04:34 -08:00
Tadashi G. Takaoka
560497c765
Add back-slash key
...
This change also moves some keys,
- Infinite is moved to popup char of plus-minus.
- not-equal and nearly-equal are moved to popup chars of equal.
Bug: 3224679
Change-Id: I7c95ab5a7cd78e4dae13fb511edad607dcaed8da
2010-12-02 13:03:33 +09:00
Tadashi G. Takaoka
7215c3bd40
Add [CHAR LIMIT] comment to strings
...
Bug: 3245533
Change-Id: If4dc017f302b6a0e960818d4db6d616988bf802f
2010-12-02 11:57:40 +09:00
Eric Fischer
af63f0663a
Import revised translations.
...
Change-Id: Ib71ada990e23e1c48a2f52f893e294bc27560329
2010-12-01 15:19:27 -08:00
Ken Wakasa
f9ab63edd2
Merge "Update string for Ic0d5f862"
2010-12-01 06:02:52 -08:00
Tadashi G. Takaoka
58baaea9dc
Add ru and sr keyboard layout for tablet
...
Bug: 3210174
Change-Id: Iea515345093027099689642946da505ddc6e53c6
2010-12-01 22:58:23 +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
dedb26f639
Merge "Add Scandinavia keyboard layout for tablet"
2010-12-01 05:48:18 -08:00
Tadashi G. Takaoka
748e107203
Add Scandinavia keyboard layout for tablet
...
Bug: 3243405
Change-Id: I84ee566a14fcb802d38ed37223f303d80c8de3f2
2010-12-01 22:33:02 +09:00
Tadashi G. Takaoka
e6f8bb04b6
Add fr_CH keyboard subtype
...
Change-Id: I3977f9e201e77a682c1c8bed221cca32204dafbe
2010-12-01 21:26:16 +09:00
Tadashi G. Takaoka
bd20db25be
Merge "Tweak tablet keyboard design"
2010-12-01 02:07:26 -08:00
Tadashi G. Takaoka
5d04042663
Tweak tablet keyboard design
...
This change introduces,
- center align "More" key label
- remove drop shadow from key label
- darker key label color when manual temporary upper case
- narrower pop up mini keyboard
- remove unnecessary key background from pop up mini keyboard
- smaller key label in portrait
Bug: 3216592
Change-Id: I77e0733f467a88aa32e09fcbace56fe08f755229
2010-12-01 18:51:38 +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
Justin Ho
c205237314
Merge "Integrating updated LatinIME assets"
2010-11-30 18:17:21 -08:00
Tadashi G. Takaoka
98cdfe643e
Merge "Fix subtype icons in method.xml"
2010-11-30 18:12:39 -08:00
Tadashi G. Takaoka
6b1e5fd260
Fix subtype icons in method.xml
...
Change-Id: I1b157254483446e86d577cdc010b92761754dbb7
2010-12-01 11:09:53 +09:00
Tadashi G. Takaoka
ab2a1e213d
Merge "Fix ".com" output of tablet keyboard"
2010-11-30 17:35:50 -08: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
Justin Ho
be5f09f098
Integrating updated LatinIME assets
...
Change-Id: I232f874c6dd8f60bd0634111e2f7fc60b6082c14
2010-11-30 16:44:55 -08:00
Tadashi G. Takaoka
4ee6dc884f
Fix ".com" output of tablet keyboard
...
Bug: 3241174
Change-Id: I6e40d6623890b7bbbd91175649b1f28b4f327621
2010-12-01 09:38:58 +09:00
Justin Ho
b30fa723f0
Adding drawable-land-hdpi into LatinIME
...
Change-Id: I21c4223151b89da9c4edd423fdb1bb7bee023ce1
2010-11-30 11:41:12 -08:00
satok
dc2a41ff4e
Add icons for each subtype
...
Change-Id: I0a86a781e3b30a8355ccc8083f3ac66af84a05b7
2010-11-30 14:17:01 +09:00
Tadashi G. Takaoka
d20208361b
Merge "Remove unused string for key label"
2010-11-29 17:51:34 -08:00
Tadashi G. Takaoka
0ff78a1bae
Remove unused string for key label
...
Bug: 3230041
Change-Id: I1c3cc78157f30f43a5b4a32e413fb43df1db4907
2010-11-30 09:51:12 +09:00
Justin Ho
e92ab0569e
Merge "Integrating updated LatinIME keyboard assets"
2010-11-29 16:16:29 -08:00
Justin Ho
8fb22a5d97
Integrating updated LatinIME keyboard assets
...
Change-Id: I5bc137892ea82e08d5b65e1e124f0de69d0a77c5
2010-11-29 15:25:55 -08:00
Eric Fischer
d5da121471
Import revised translations.
...
Change-Id: I0cabf9fceb714a9ffd5180f9d9a0234ec92e5f71
2010-11-29 15:18:20 -08:00
Tadashi G. Takaoka
f2d7c4599e
Merge "Remove unused bool configuartion value"
2010-11-29 03:51:45 -08:00
Tadashi G. Takaoka
0e7c31febb
Remove unused bool configuartion value
...
This change is follow up of Ie5494601.
Change-Id: I20911479e2942695384200e2cc732abfed7bd140
2010-11-29 18:30:08 +09:00
Tadashi G. Takaoka
fa086c9076
Cleanup unused Java import
...
This change also fixes wrong file mode.
Change-Id: Ifcf4c9444ddcdc62d2e4b394891d6eee135c1e8f
2010-11-29 17:57:48 +09:00
Tadashi G. Takaoka
7f0befe1f0
Update tablet keyboard layout to the latest design
...
This change introduces shiftedIcon attribute for Key which specifies
icon to draw the shift key while the key is in shifted state.
This change also intriduces new configurable dimension value
key_label_horizontal_alignment_padding which represents horizontal
padding for left or right alignment of key label.
Bug: 3216592
Bug: 3201839
Change-Id: I3aa7392227ce573c404517678e6340a8d1fcb328
2010-11-25 00:11:21 -08:00
Tadashi G. Takaoka
2c60d6e28e
Support dedicated number/date keyboard layout
...
Bug: 3009716
Change-Id: Idc12cc9d8ee4f5febfae4e11712e2aaca327a6ea
2010-11-24 00:16:00 -08:00
Tadashi G. Takaoka
6624fd8736
Support imeOptions condition in <case>
...
Change-Id: Ie5494601efb29cf65363c4aa3bf5a9ab04a0109a
2010-11-23 23:13:39 -08:00
Tadashi G. Takaoka
59c9930ca9
Support colorScheme <case/> condition in Keyboard XML
...
Change-Id: Ibbfb99e0e2b15df301f83af6739b7bca01ebf490
2010-11-23 18:07:27 -08:00
Tadashi G. Takaoka
a963d0b2e4
Merge "Fix odd "more" key behavior on tablet phone number keyboard"
2010-11-23 15:59:10 -08:00
Tadashi G. Takaoka
90ebff1323
Add "@" key to email mode tablet keyboard layout
...
Bug: 3222319
Change-Id: Ibc56cd69c30aee19f26fe11e7ea176ff01e21dbe
2010-11-23 13:30:14 -08:00
Tadashi G. Takaoka
4b8bbbadac
Fix odd "more" key behavior on tablet phone number keyboard
...
Bug: 3176540
Change-Id: Iaa1f3776d5ac236b2655910ede7522ceac36a9a1
2010-11-23 09:52:59 -08:00
Tadashi G. Takaoka
fab243a183
Use normal font for functional key label instead of italic font
...
This change also uses slightly larger font size for functional key
label according to the v4 keyboard design.
Bug: 3216592
Change-Id: I027f109b7748ade8564dc808487d9a6ce1da9761
2010-11-23 00:38:09 -08: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
04448c2978
Make F1 and Symbol keys static in XML file
...
Change-Id: If869f5ad4fe8f192f89a8679a4abde99a25e02e6
2010-11-21 03:00:53 -08:00
Tadashi G. Takaoka
7c25ad473f
Update tablet keyboard layout to version 4
...
Bug: 3216592
Change-Id: I9950292184d9d0e131f76498067b0a6cb462a0ab
2010-11-21 02:13:30 -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
satok
3757d16083
Merge "Open settings of input method subtype enabler when users are trying to change language."
2010-11-19 16:37:11 -08:00
satok
b6c1255f2d
Open settings of input method subtype enabler when users are trying to change language.
...
Change-Id: Id13926a87d43a3972f2a57128379c17b70b50da2
2010-11-20 09:35:05 +09:00
Tadashi G. Takaoka
1d8196cd41
Use "flag" feature of attr.xml to represent keyboard mode
...
Change-Id: Ibc317ada5167a119477fe8ea2994df6c6462afd0
2010-11-19 14:57:24 -08:00
Tadashi G. Takaoka
75fde64890
Cleanup drawable-xlarge resources into drawable-mdpi
...
Change-Id: I2db335a601ddb0062a637a71289e14cf1d375a1e
2010-11-19 01:37:38 -08:00
Eric Fischer
0dec431f18
Import initial translations for 20 new locales.
...
Change-Id: I7bd8f9596ebc2922c63717a63cef7cfdf68c919e
2010-11-17 16:43:50 -08:00
Eric Fischer
3a4d9b420f
Import revised translations.
...
Change-Id: If29e9f29b1500c92989c1d224ebd4eaa69e3737a
2010-11-17 11:41:41 -08:00
Tadashi G. Takaoka
10227a71a0
Implement temporary upper case hint icon
...
This change partially implements the requested feature. The following
are not supported yet.
- Non-letter key handling on automatic temporary upper case layout.
- Non-letter key handling on shift chording in caps lock layout.
- Hint icons for manual temporary upper case layout are not final ones.
Bug: 3193390
Change-Id: I636da99d1be05b1337935d87c6f4d140661e1cc8
2010-11-16 13:45:49 -08:00
Tadashi G. Takaoka
e3f0ca3848
Merge "Fix tablet url mode keyboard layout"
2010-11-15 23:45:48 -08:00
Tadashi G. Takaoka
cf5e68b862
Fix tablet url mode keyboard layout
...
This is follow up change of I0d92e513757e765d9de98561205754af5a143650
Change-Id: Ibfe8835bb184636e5fb06473cc864852b573fbd4
2010-11-15 23:19:57 -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
Tadashi G. Takaoka
6a567370ce
Merge "Add more symbol characters to popup mini-keyboard"
2010-11-12 14:41:43 -08:00
Tadashi G. Takaoka
b0465116bd
Keyboard XML supports switch-case-default tags to select rows and keys
...
Change-Id: I0d92e513757e765d9de98561205754af5a143650
2010-11-12 14:30:25 -08:00
Tadashi G. Takaoka
f12023c7fb
Add more symbol characters to popup mini-keyboard
...
Bug: 3124752
Change-Id: I6b6f5bfd57a58db7273c4db461095413892552ae
2010-11-12 14:26:38 -08:00
Tadashi G. Takaoka
3e99aa0f71
Slightly shorten tablet keyboard height
...
Now key top height is slightly shorter 13.0mm compared to previous 14.0mm.
Bug: 3181068
Change-Id: Ib6f9cfb9269020166e5037467d18133d342d47ec
2010-11-10 15:03:46 -08:00
Tadashi G. Takaoka
e302b19ddd
New xlarge keyboard layout (v2)
...
Bug: 3109804
Change-Id: I1afd022d553785acd50b3104374bbec291206c1e
2010-11-09 11:07:48 +09:00
Tadashi G. Takaoka
59b7bd0730
Using distance to the edge of key as proximity detection
...
Because there may be very long key, such as space bar on tablet, we
should not use the distance between the touch point and the center of
key as proximity detection. Instead of that, this change uses the
distance between the point and the nearest edge of key as proximity
detection.
Also this change fixes the bug that space key (code 32) was not
counted in proximity detection.
Bug: 3164020
Bug: 3168138
Change-Id: I687f1ce94a8e944c3f6eea0fe00e18ed6e68e278
2010-11-06 01:10:55 +09:00
Tadashi Takaoka
68864723cf
Rename LatinKeyboardBaseView class to KeyboardBaseView
...
Change-Id: I496ecbfa7d398583d01f821398f49f75d17311d8
2010-11-05 18:36:19 +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
9d34f2c72e
Merge "Add [CHAR LIMIT] to some strings for key top"
2010-11-04 03:09:09 -07: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
satok
5890ae11f1
Merge "Updated icons for the input method subtype"
2010-11-03 23:09:40 -07:00
satok
3b075346b1
Updated icons for the input method subtype
...
Change-Id: Ib92666357a6921cb7e068c63353b8b3d997c80b2
2010-11-02 23:11:42 +09:00
satok
fe05848e50
Change the size of preview for priventing preview from being clipped
...
Change-Id: I6f9fb2c8c0e98ede14729e7cb602bfb4b2672159
2010-11-02 19:29:41 +09:00
satok
6936edbfcd
Adjust the gap of keys on a tablet layout
...
Bug: 3155782
Change-Id: Icefe654874e58ee2fcbeab353690bfe15f54ab61
2010-11-02 15:06:37 +09:00
Ken Wakasa
c1fe5bf19d
Merge "Get rid of number hints on Stingray"
2010-10-29 04:17:24 -07:00
Ken Wakasa
89e841c85b
Get rid of number hints on Stingray
...
bug: 3145786
Change-Id: Ifc2dcdb06d7a056b38ad574c65ef7fcbddcbb6aa
2010-10-29 20:14:10 +09:00
Ken Wakasa
e6d171ab0b
Add vertical correction for Stingray
...
bug: 3145773
Change-Id: I3ac1953b00367d3bf487a4186afe4150b039b05b
2010-10-29 20:01:26 +09:00
satok
74103ee1b9
Increased the size of GRID in Keyboard
...
Bug: 3122894
- Changed width 10 -> 32
- Changed height 5 -> 16
Change-Id: I07354cf5c942974cc25a5e043f41e0f13a09351b
2010-10-29 18:50:18 +09:00
Eric Fischer
566c45eddf
Import revised translations.
...
Change-Id: If1dd926a84f861cdf8bbd24bad264a8a6facbde3
2010-10-27 14:37:12 -07:00
satok
832ebbec14
Merge "Update assets for LatinIME"
2010-10-26 20:31:45 -07:00
satok
3739770095
Update assets for LatinIME
...
Bug: 3109804
Change-Id: I07b5b0ff32228a6d10b92575f916b058e4ac26b7
2010-10-27 12:03:07 +09:00
Ken Wakasa
276845c7a9
Follow-up change to revise Caps Lock sequence.
...
bug: 3122877
Change-Id: I44c539d7c041443f3ad027de4b75a67adf6b2c87
2010-10-26 20:00:21 +09:00
satok
e767595da5
Add an icon for US keyboard subtype
...
- TODO: add other icons
Change-Id: Ie958b9d59bb33bd6dbfc78a403bfda022bfaf790
2010-10-25 16:58:30 +09:00
Tadashi G. Takaoka
4189eb2308
Revise caps lock sequences
...
This change also fixes that the popup preview of ALT on symbol
keyboard is not showing.
Bug: 3122877
Bug: 3127255
Change-Id: I978cb30a0d05298274d8ab6541b91323a0fef211
2010-10-25 00:03:46 +09:00
Tadashi G. Takaoka
36af0880c3
Tablet keyboard should always show "?123" as symbol key
...
Bug: 3118554
Change-Id: Ib609799f28dee56a4ded2e8144ac4a0c0d113ad6
2010-10-22 23:59:21 +09:00
Tadashi G. Takaoka
d0ed8ec933
Merge "Make mini-keyboard narrower on tablet landscape mode"
2010-10-22 03:34:59 -07:00
Tadashi G. Takaoka
1397cbab76
Make mini-keyboard narrower on tablet landscape mode
...
This change narrows mini-keyboard key width from 7.5% to 5.0%
of the screen width.
Bug: 3122769
Change-Id: I4ae0e79262ec3fadab8f86aa57a8a6cec5cb4670
2010-10-22 18:42:26 +09:00
Tadashi G. Takaoka
4f6060b8b7
Table keyboard should always show return icon on enter key
...
Bug: 3122750
Change-Id: I75d2b5adff3a349d29d8a56e7b761c26b04683c0
2010-10-22 18:27:59 +09:00
Tadashi G. Takaoka
503797ae0e
Make "show settings key option" dependent to device configuration
...
Bug: 3095814
Change-Id: I73b8a5023b398621a910c953eade252dc6412923
2010-10-22 17:04:14 +09:00
Tadashi G. Takaoka
d329795d91
Merge "Make common qwerty keyboard layout files and include these"
2010-10-20 22:43:45 -07:00
Ken Wakasa
f5df46f0e0
Add ; to list of punctuation
...
bug: 3034792
Change-Id: I8e5f3907840fa2ddc2b5ac99328525313465ea35
2010-10-21 01:56:18 +09:00
Tadashi G. Takaoka
c9bf5c005e
Make common qwerty keyboard layout files and include these
...
Change-Id: I0cb8de748c4365e42d015078daf686ed76ca105b
2010-10-21 00:00:43 +09:00
Ken Wakasa
e354a85ef4
Manual merge of the following Gingerbread changes logically
...
I8b38e280
Ia3929bb0
If925b546
I1062763d
I901e36aa
bug: 3100311
Change-Id: Ic7e01277ec816e77d34732599b2b9552668b81c2
2010-10-20 22:51:33 +09:00
Tadashi G. Takaoka
58bfa35072
Update xlarge drawable of Keyboard
...
Bug: 3109804
Change-Id: I316f9cfcec377a7d0ea1417e1e3cea55cbdb9e2b
2010-10-19 21:59:17 +09:00
Tadashi G. Takaoka
cd7b7d3e8f
Specify keyboard metrics with physical unit "inch"
...
Cherrypick I44f3b2eef8086d6e0b0db53d38f08487549060c6 from Gingerbread
This change also introduces the key background drawables which has no
fixed bottom padding. Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit. Other keyboard related length, distance and size are
also specified by physical unit.
Bug: 3066107
Change-Id: Ib38355ebfc2f8d5b1d26c4e90eba87196fbeddfa
2010-10-17 18:19:42 +09:00
Tadashi G. Takaoka
65100ff39c
am c247df2d: am 0ccc4bfe: Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread
...
Merge commit 'c247df2d05932f36ca1ebbba34b57a92254f433e'
* commit 'c247df2d05932f36ca1ebbba34b57a92254f433e':
Reduce popup preview fading out animation duration to 70ms
2010-10-16 09:13:20 -07:00
Tadashi G. Takaoka
1dac5d491f
resolved conflicts for merge of ac777128
to master
...
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
2010-10-16 04:57:53 +09:00
Tadashi G. Takaoka
0ccc4bfe38
Merge "Reduce popup preview fading out animation duration to 70ms" into gingerbread
2010-10-15 02:27:02 -07:00
Tadashi G. Takaoka
62e3fafac6
Reduce popup preview fading out animation duration to 70ms
...
Bug: 3099331
Change-Id: I32c11bb25ebdb97af0c883c475d96fc8e2749101
2010-10-15 10:22:43 +09:00
Kenny Root
913730d6e7
Import revised translations
...
Change-Id: Iaf51da312caf84a58796714424fc8dd22df1f6d3
2010-10-14 09:46:48 -07:00
Ken Wakasa
179fa2c03e
DO NOT MERGE. Add visual indicator that long press , or mic key will bring up Settings
...
bug:3084022
Change-Id: I8b38e2803eb32469653484701882af35108eb69a
2010-10-14 19:52:46 +09:00
Tadashi G. Takaoka
3d20d99902
Specify keyboard metrics with physical unit "inch" (DO NOT MERGE)
...
This change also introduces the key background drawables which has no
fixed bottom padding. Instead of relying on bottom padding in
drawable, this change also specifies Keyboard.verticalGap with
physical unit. Other keyboard related length, distance and size are
also specified by physical unit.
Bug: 3066107
Change-Id: I44f3b2eef8086d6e0b0db53d38f08487549060c6
2010-10-14 13:40:31 +09:00
Tadashi G. Takaoka
0963c781f2
Make some keys in phone keyboard to darker color
...
Bug: 3088257
Change-Id: I36b1a0f147c1087a98b91f00d60bf15922861f9c
2010-10-13 14:06:21 +09:00
Tadashi G. Takaoka
50a61083d3
Add text variation keyboard layout
...
Change-Id: I4c6df8197b734feb998da78478a4d9a41f6d92b2
2010-10-12 14:01:28 +09:00
Ken Wakasa
39004972b1
resolved conflicts for merge of fd64e47c
to master
...
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09:00
Kenny Root
6f6dd71862
resolved conflicts for merge of 23d50bfb
to master
...
Change-Id: Ia3fd85bd0c231f7b910b14caad38fa453a2336f6
2010-10-10 15:19:53 -07:00
Ken Wakasa
c2d7ac79bd
Tweak key width for 'o'-popup chars.
...
We'll merge this to master for now, but we should have new attr (such as popupCharWidth) to handle this reasonably in the newly created BaseKeyboard class.
bug: 3082178
Change-Id: I024b946aafbbeb07b865a09f489dacb56f0478d0
2010-10-11 04:32:54 +09:00
Tadashi G. Takaoka
4ee2a56f07
Make keyboard vertical correction configurable
...
cherry-pick: I72c2448894a1084c582c2f1fb942b5fa8353f028
Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen. This change defines the
verticalCorrection by absolute unit "in".
Bug: 3066107
Change-Id: If71419dcfc18be3e5e87afea078fa15d3c31d908
2010-10-09 13:03:00 +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
Tadashi G. Takaoka
cb0046288d
Merge "Make keyboard vertical correction configurable (DO NOT MERGE)" into gingerbread
2010-10-08 03:23:53 -07:00
Tadashi G. Takaoka
ff49b79dfb
Make keyboard vertical correction configurable (DO NOT MERGE)
...
Before this change, the verticalCorrection value was defined by "dpi"
that is relative to device screen. This change defines the
verticalCorrection by absolute unit "in".
Bug: 3066107
Change-Id: I72c2448894a1084c582c2f1fb942b5fa8353f028
2010-10-08 19:15:54 +09:00
Tadashi G. Takaoka
5e02930a7f
Reduce delay before mini popup keyboard is shown
...
Before this change, the delay was 500 ms that came from
ViewConfiguration.getLongPressTimeout(). This change reduces the
delay to 400 ms.
Bug: 3074984
Change-Id: Ia5af5e877a3c4bb29211ef4040c728ac09a9fe85
2010-10-08 19:05:16 +09:00
Tadashi G. Takaoka
ff4d21bd29
Share 4th row of non-xlarge qwerty keyboard using <include>
...
Change-Id: Iff337e1c6ef3a17fd96a5e5f1c3c4a21190aac1c
2010-10-08 01:24:28 +09:00
Tadashi G. Takaoka
d663555c9f
Keyboard XML file supports include and merge tag
...
Keyboard XML file can include other keyboard XML file using directive
<include keyboardLayout="@xml/...">. The keyboard XML file which is
included must have <merge> tag as root element.
Change-Id: I06c35fe7b3db5232acdb33f73a79f38d31261b32
2010-10-07 23:51:38 +09:00
Eric Fischer
e13a301328
Import revised translations. DO NOT MERGE
...
Change-Id: Icf8fa9146cc4cbfb70d5069be5359d04c5ec2432
2010-10-06 17:15:27 -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
4fc510a789
Unbundle Keyboard.java to BaseKeyboard.java
...
Change-Id: I8b310c2c0cae1a151e53c22001c586697346982c
2010-10-02 00:02:00 +09:00
Tadashi G. Takaoka
932a1b756d
am c0fc4bf9: am 8e1f1be0: Long press mic/comma key bring mini keyboard with settings
...
Merge commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99'
* commit 'c0fc4bf9932caf536af5d5d86bb61ec6d8a44a99':
Long press mic/comma key bring mini keyboard with settings
2010-10-01 04:04:38 -07:00
Tadashi G. Takaoka
8e1f1be0f3
Long press mic/comma key bring mini keyboard with settings
...
Bug: 3050703
Change-Id: I090b2bfebfb48e5ec461615d4c911024ea6d130a
2010-10-01 19:27:37 +09:00
satok
d778ff20e7
am bd677880: am 88a04563: Make the background of keypopup transparent
...
Merge commit 'bd677880494f30d58913f1bac612a32410e6465b'
* commit 'bd677880494f30d58913f1bac612a32410e6465b':
Make the background of keypopup transparent
2010-10-01 02:29:58 -07:00
satok
88a045637a
Make the background of keypopup transparent
...
Change-Id: I5240ffdd8e48bcb99c2edf878d8efaba2cafeb07
2010-10-01 18:08:38 +09:00
Ken Wakasa
3d9d2b1b3c
am 7ed6b88c: am a0a60b37: Revert changes to keyboard_popup.xml for now.
...
Merge commit '7ed6b88cf6f090512953e3665e4ff5072c98560b'
* commit '7ed6b88cf6f090512953e3665e4ff5072c98560b':
Revert changes to keyboard_popup.xml for now.
2010-09-30 19:48:16 -07:00