Commit graph

88 commits

Author SHA1 Message Date
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
1dac5d491f resolved conflicts for merge of ac777128 to master
Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391
2010-10-16 04:57:53 +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
Ken Wakasa
39004972b1 resolved conflicts for merge of fd64e47c to master
Change-Id: I07434c251fafa5eee548a54dae30d91df3a24085
2010-10-12 03:15:36 +09: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
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
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
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
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
a48d298d10 resolved conflicts for merge of b9c0ed59 to master
Change-Id: Ib42164a5889eb9792b5e94de1e0ffd4c1924e29d
2010-09-27 15:33:24 +09:00
satok
bf96661d33 Add Debug Settings Activity
Bug:3033472

Change-Id: I311c66ac3c612a30d7da3be8ee35a352f49016ac
2010-09-27 14:07:10 +09:00
Tadashi G. Takaoka
051511fa09 am 1d82ee9a: am 56cd6df9: Merge "Space key will no longer auto-repeat" into gingerbread
Merge commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d'

* commit '1d82ee9a13b1e57af80d2bd0e3f879305bda137d':
  Space key will no longer auto-repeat
2010-09-21 10:43:52 -07:00
Tadashi G. Takaoka
aaa163b2b7 Space key will no longer auto-repeat
Bug: 3014225
Change-Id: I94d4904726985d5e17b665d4042c873ea07221f1
2010-09-21 13:00:13 +09:00
Ken Wakasa
86fa29ade9 DO NOT MERGE. Get rid of the user feedback preference from Gingerbread.
Change-Id: I2f0dc3b0cba78c85249cb6cecc9b5c588de4f26b
2010-09-17 18:12:03 +09:00
Tadashi G. Takaoka
b40ca031b7 am 525776b6: am ed8eabcc: Cleanup keyboard layout files
Merge commit '525776b681a0548fa6f98ee22a74ae4225c7fa07'

* commit '525776b681a0548fa6f98ee22a74ae4225c7fa07':
  Cleanup keyboard layout files
2010-09-16 04:16:36 -07:00
Tadashi G. Takaoka
ed8eabcc39 Cleanup keyboard layout files
Change-Id: I095c1294b9e826b503ff741eeff9dc93ad39f060
2010-09-16 20:02:04 +09:00
Tadashi G. Takaoka
5d007ef380 am 89e21ee1: am 08cfebda: Move comma as default position of mini keyboard
Merge commit '89e21ee1f5be55ac3db224ab54b27cc604087efa'

* commit '89e21ee1f5be55ac3db224ab54b27cc604087efa':
  Move comma as default position of mini keyboard
2010-09-15 21:43:19 -07:00
Tadashi G. Takaoka
08cfebda8b Move comma as default position of mini keyboard
Bug: 3000978
Change-Id: I0369b3dc6ae58b77e7af112e446ae8189f5bbfc9
2010-09-16 12:22:53 +09:00
Ken Wakasa
2b90a1adcb am 13a6c8c1: am 1508c0e8: Add a new preference item to show/hide the settings key.
Merge commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac'

* commit '13a6c8c1f8691b753cd1a6b7a77d99af4f7d78ac':
  Add a new preference item to show/hide the settings key.
2010-09-15 16:49:53 -07:00
Ken Wakasa
1508c0e84f Add a new preference item to show/hide the settings key.
bug: 2998722

Change-Id: Iac1641c338388fd8f85e0cf47e31afdaeb34c0c0
2010-09-16 02:48:10 +09:00
Ken Wakasa
22a2215c1e am 2c424922: am 9717d5b1: Get rid of execution bit
Merge commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0'

* commit '2c42492224a2c4d9533fe9a8f4b994bc3f3a90e0':
  Get rid of execution bit
2010-09-15 07:06:58 -07:00
Ken Wakasa
9717d5b1ee Get rid of execution bit
Change-Id: I25b530c2ab50c045da321e00d905cbec19188ea3
2010-09-14 11:51:58 +09:00
Tadashi G. Takaoka
e5875d6d7e am ad20a70b: am 3c559110: Merge "Add digit alternates" into gingerbread
Merge commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e'

* commit 'ad20a70bd9241eb435dd6b5b5b142746f675fd9e':
  Add digit alternates
2010-09-08 21:36:40 -07:00
Tadashi G. Takaoka
62432ed453 am 42921b85: am c29ef3ec: Remove unnecessary android:codes attribute
Merge commit '42921b85d34985a7c819f3d4965f1819de2b2685'

* commit '42921b85d34985a7c819f3d4965f1819de2b2685':
  Remove unnecessary android:codes attribute
2010-09-08 10:38:03 -07:00
satok
938ba36710 am 6ee4e439: am 31e2a94a: Merge "Fix the bacground color for "/" in URL mode" into gingerbread
Merge commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592'

* commit '6ee4e43929bd18b7d617d921f3ec259ff2b81592':
  Fix the bacground color for "/" in URL mode
2010-09-08 10:37:53 -07:00
Tadashi G. Takaoka
163a5557ec am 2d5e34b7: am 3625c973: Remove unused azerty.xml keyboard layout
Merge commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347'

* commit '2d5e34b73095b724dab3ae8d1ef432c0779ca347':
  Remove unused azerty.xml keyboard layout
2010-09-08 10:37:50 -07:00
Tadashi G. Takaoka
716fb24a67 am c20193cc: am 232863ac: Re-formatting keyboard definition xml files
Merge commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a'

* commit 'c20193cc8471ab8c772aed2cf5f36da47c13ad7a':
  Re-formatting keyboard definition xml files
2010-09-08 10:34:52 -07:00
Tadashi G. Takaoka
012075a711 Add digit alternates
This also re-orders keyboard layout attribute and adds some
android:popupCharacters.

Bug: 2973749
Change-Id: I300fb4029a1844947731cb98a464d8d754cb03ef
2010-09-09 01:06:58 +09:00
Tadashi G. Takaoka
c29ef3ec15 Remove unnecessary android:codes attribute
If there is no android:codes specified, the first character of
keyLabel's code point will be used instead.

Also introduce readable codes as @integer/key_XXX resources

Bug: 2973749
Change-Id: If9021ca35f9a7b922817e2099186fce0cd993652
2010-09-08 18:16:30 +09:00
satok
31e2a94a09 Merge "Fix the bacground color for "/" in URL mode" into gingerbread 2010-09-08 01:36:24 -07:00
satok
007803c390 Fix the bacground color for "/" in URL mode
Change-Id: I832274244a9677ac98256ddfc4a25fdca517e228
2010-09-08 17:28:21 +09:00
Tadashi G. Takaoka
3625c97338 Remove unused azerty.xml keyboard layout
Change-Id: Ie94ee27bbfc0b894243063fced1e537aec3ed7ec
2010-09-08 16:02:07 +09:00
Tadashi G. Takaoka
232863ac1d Re-formatting keyboard definition xml files
Just re-formating with eclipse editor.

Bug: 2973749
Change-Id: I18bc682c68df6239e54dd71ed3797d55fd5a1552
2010-09-08 15:14:53 +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
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
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
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