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

991 commits

Author SHA1 Message Date
Tadashi G. Takaoka
448b28beff am ed0d1156: am 30f102e2: Move some attributes of setup wizard layouts to style files 
* commit 'ed0d1156f7c95666b22e10284d8f985a5e83f283':
  Move some attributes of setup wizard layouts to style files
 2013-05-15 10:52:33 -07:00
Tadashi G. Takaoka
8b085e7f87 am 7158438a: am 88ee052c: Merge "Update strings of setup wizard" 
* commit '7158438a64d3f224590c484c989251d82b7fb5fa':
  Update strings of setup wizard
 2013-05-15 10:52:30 -07:00
Tadashi G. Takaoka
0474d725b4 am e85e3c64: am 46420204: Add user feedback to setup action labels and icons 
* commit 'e85e3c64767552461debc0b1989f09033f7e3054':
  Add user feedback to setup action labels and icons
 2013-05-15 10:36:18 -07:00
Tadashi G. Takaoka
76cc6abc3a am 0206339a: am 47a78aeb: Merge "Finalize setup wizard strings and mark as translatable" 
* commit '0206339a2664d1cb05fff3ff20352cf04871bef1':
  Finalize setup wizard strings and mark as translatable
 2013-05-15 10:36:16 -07:00
Tadashi G. Takaoka
8b56ad7814 Merge "Revise welcome screen video and still image" 2013-05-14 12:01:47 +00:00
Tadashi G. Takaoka
7348d9fb72 Revise welcome screen video and still image 
Bug: 8159728
Change-Id: Ief8d7197879d24ccef529e975c23d6f11c7aa458
 2013-05-14 20:56:09 +09:00
Ken Wakasa
5a6827dbff Adjust sampling interval for gesture stroke drawing a bit. 
bug: 7167303

Change-Id: I45ca9d31cf4f8492dde367f997d8e36f4a07cffe
 2013-05-14 20:53:12 +09:00
Tadashi G. Takaoka
b121538e0c Tune maximum keypress duration to 100 milliseconds 
Bug: 8556975
Change-Id: If7839c5764f7a269243a9570c0b7782b6f7ee73b
 2013-05-13 20:04:59 +09:00
Tadashi G. Takaoka
567a759b7b Fix keypress vibration duration of HTC One X 
Bug: 8556975
Change-Id: I793dd90223f4da091a212ff54a02d19f03e49d6c
 2013-05-13 19:49:47 +09:00
Tadashi G. Takaoka
b5f67e7faf Add device specific keypress vibration duration database 
Bug: 8556975
Change-Id: I11260a64dc13c102bac7a9742dc66f2b05fd32de
 2013-05-13 18:34:48 +09:00
Tadashi G. Takaoka
ec83457d72 Merge "Support multiple condition for getDeviceOverrideValue" 2013-05-13 06:13:20 +00:00
Tadashi G. Takaoka
d69fa0a09a Support multiple condition for getDeviceOverrideValue 
Bug: 8556975
Change-Id: I29d3a305b6ac3d8e3620c6d8592d85047d62bf48
 2013-05-13 14:38:21 +09:00
Ken Wakasa
cb3bba3c4e Rename GesturePreviewTrail.java -> GestureTrail.java 
Try reducing some confusions between GesturePreviewTrail.java and GestureTrailsPreview.java

Change-Id: I5fe2ee740cf1b32210530188153f6f6937e34b68
 2013-05-13 13:42:22 +09:00
Tadashi G. Takaoka
6d3d2ae064 Refactor StringUtils.findPrefixedString to findValueOfKey 
Bug: 8556975
Change-Id: I275c99db8a0d10594a5a8c0c27ebc1a87495c307
 2013-05-10 18:44:04 +09:00
Tadashi G. Takaoka
05124d0193 Move gesture preview trail parameters to resource 
Bug: 7167303
Change-Id: I22b56588dc5a1c9d5eaec3a39b5f32c9e5a8a5b4
 2013-05-08 17:51:45 +09:00
Tadashi G. Takaoka
9d71a6c968 Remove unused device form factor values 
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
 2013-05-07 18:52:22 +09:00
Satoshi Kataoka
d5781eef62 Fix Google spell checker tests 
Bug: 8613307

Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
 2013-05-01 18:21:56 +09:00
Satoshi Kataoka
5aa14c2636 Fix the title of the fragment of the personal dictionary 
This change is corresponding to I9b8bab21b144385bc2386e7fcb

Bug: 8600958
Change-Id: I0a0cf37d0a11c14a51dc63b2e4371facb34514d0
 2013-04-30 15:01:51 +09:00
Jean Chalard
9a98ef6968 Merge "[ZF3] Add the option to block potentially offensive words" 2013-04-26 08:25:10 +00:00
Jean Chalard
c03aaa1bde Merge "[ZF2] Read settings for profanity filtering." 2013-04-26 08:23:56 +00:00
Tadashi G. Takaoka
4bb312c7f3 Merge "Add strings-appname.xml to AOSP Android Keyboard project" 2013-04-26 06:46:07 +00:00
Tadashi G. Takaoka
57372fd3da Remove graying animation of alt-code keys while typing 
Bug: 8727807
Change-Id: Idcc76dade3ceba5649666d795b6e4f94a161d748
 2013-04-26 14:55:46 +09:00
Tadashi G. Takaoka
842e245e6f Add strings-appname.xml to AOSP Android Keyboard project 
Change-Id: I8dea5393ad3b12c2398bbeb7f1040b66d82c9c35
 2013-04-26 14:01:41 +09:00
Jean Chalard
d361dc841c [ZF3] Add the option to block potentially offensive words 
Bug: 7226877
Change-Id: I2171c946258468b0a39d6590c7af994ef25ba552
 2013-04-25 20:29:14 +09:00
Jean Chalard
bb61293675 [ZF2] Read settings for profanity filtering. 
Bug: 7226877
Change-Id: Ie0c713e1eba1529c0b288a1e5011023a79bedd6b
 2013-04-25 20:29:14 +09:00
Satoshi Kataoka
30f0f3a92a Merge "Implement a functionality to add an entry to the user dictionary" 2013-04-25 06:04:08 +00:00
Satoshi Kataoka
a79ba8a3d6 Implement a functionality to add an entry to the user dictionary 
Bug: 8600958

Change-Id: Ic472500406b9d54ec4052c490ee7cef62fc4e52a
 2013-04-25 14:55:07 +09:00
Tadashi G. Takaoka
46913aedb4 Merge "Add next axction to setup wizard" 2013-04-24 10:30:56 +00:00
Tadashi G. Takaoka
b5d33059e0 Add next axction to setup wizard 
Bug: 8159728
Change-Id: Ia37ab32b63e4eda29bf1411719d00846525c278f
 2013-04-24 19:22:41 +09:00
Tadashi G. Takaoka
b40a8c060f Merge "Tune setup wizard layout for landscape and tablet" 2013-04-24 09:30:59 +00:00
Tadashi G. Takaoka
5cd7211ce6 Tune setup wizard layout for landscape and tablet 
Bug: 8159728
Change-Id: Ic2206d50562d62578f8e5e50bbd3c36625dbafb7
 2013-04-24 18:22:47 +09:00
Satoshi Kataoka
70f2762e28 Make aggressive threshold really aggressive 
Bug: 8701480
Change-Id: If8242cfe61f3e56712fd6e25e36858cff7f0d177
 2013-04-24 17:49:56 +09:00
Tadashi G. Takaoka
81b4661f96 Add setup wizard indicator size resource 
This is a follow up of Ie8e058bc3c.

Bug: 8159728
Change-Id: I171fc99374789e69c15506c37970e6fcafbcb1e2
 2013-04-24 12:56:39 +09:00
Tadashi G. Takaoka
e55ae3424a am 0e5b6384: Disable shadow of gesture trail (DO NOT MERGE) 
* commit '0e5b6384f3f6daf9c05a25e60a900da4d24e3913':
  Disable shadow of gesture trail (DO NOT MERGE)
 2013-04-23 16:51:47 -07:00
Tadashi G. Takaoka
9a289c08f2 Merge "Use resources for dimensions of setup wizard" 2013-04-23 08:22:28 +00:00
Tadashi G. Takaoka
586578b730 Merge "Disable shadow of gesture trail" 2013-04-23 08:21:53 +00:00
Tadashi G. Takaoka
0e5b6384f3 Disable shadow of gesture trail (DO NOT MERGE) 
Bug: 8689880
Change-Id: I908c22d362f2f6f07e5e04be14d3aaa749a8ac8e
 2013-04-23 17:21:22 +09:00
Tadashi G. Takaoka
2deb898582 Disable shadow of gesture trail 
Cherry-picked from JB-MR2 I908c22d362.

Bug: 8689880
Change-Id: Ie759c5d63056509e3ca61d9fb6823ab04ddf41ed
 2013-04-23 17:20:21 +09:00
Tadashi G. Takaoka
0bff16155a Use resources for dimensions of setup wizard 
This is a ground work to fit the setup wizard to smaller phones and
larger tablets.

Bug: 8159728
Change-Id: Ie8e058bc3cba30cac3b31eb5a3ce975f2ee311d9
 2013-04-23 17:18:34 +09:00
Tadashi G. Takaoka
4b7e0c5ac2 Merge "Remove wording "wizard" from setup application" 2013-04-23 07:57:18 +00:00
Tadashi G. Takaoka
864aeb1f50 Remove wording "wizard" from setup application 
Bug: 8676811
Bug: 8662102
Change-Id: Ie234d8871651344b6815ae68c8b1f0663a9f6c79
 2013-04-23 16:44:42 +09:00
Tadashi G. Takaoka
480284e28a Merge "Add edit personal dictionary settings menu" 2013-04-23 06:01:45 +00:00
Satoshi Kataoka
9b4e3db1af Legal notice 
Bug: 8533258
Change-Id: I00e4916f86f29dd476c51a65e8fa5a6c136fd179
 2013-04-22 21:55:53 +09:00
Tadashi G. Takaoka
4f2535398a Add edit personal dictionary settings menu 
Bug: 8600958
Change-Id: I303adfbe25a56cc9b5ee9f3b5169a5bca0ad6c4a
 2013-04-22 19:59:12 +09:00
Tadashi G. Takaoka
0f07935e51 Centering setup wizard welcome video 
Bug: 8159728
Change-Id: Ia016c41dc39b87740ff57efe0e2fadd61f0da129
 2013-04-22 12:23:32 +09:00
Ken Wakasa
2a9b5447fa am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries 
* commit 'a56c702088055823bd755d2aafe13965b12785ed':
  Add translatable="false" for appropriate entries
 2013-04-19 10:11:40 -07:00
Ken Wakasa
a56c702088 am d4ab58a0: Add translatable="false" for appropriate entries 
* commit 'd4ab58a0f7bdf5aee51947607e1b17998912285c':
  Add translatable="false" for appropriate entries
 2013-04-19 10:09:50 -07:00
Tadashi G. Takaoka
b8ff89c809 Remove translatable="false" from setup wizard strings 
Change-Id: Ie2f53910ce91f8c288e83c4ea15dc51aafd4c6a2
 2013-04-19 21:07:17 +09:00
Tadashi G. Takaoka
42afa82d54 Support landscape orientation for setup wizard 
Bug: 8159728
Change-Id: Ic0f73a7ebfea6e5e98aa320eb1ebc2a677271665
 2013-04-19 20:53:40 +09:00
Tadashi G. Takaoka
fcefabf9ab Groundwork to implement landscape and welcome screen 
Bug: 8159728
Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
 2013-04-19 20:10:59 +09:00
Tadashi G. Takaoka
192743a6ae Add finish action to setup wizard 
Bug: 8159728
Change-Id: I1578fc31875a1edbfea213fb5e1a1b464d02e941
 2013-04-19 19:44:54 +09:00
Ken Wakasa
d4ab58a0f7 Add translatable="false" for appropriate entries 
bug: 8662567
Change-Id: I1ac9b4b8834f3b0ea537ad3142fa533dea10f23e
 2013-04-19 19:37:59 +09:00
Tadashi G. Takaoka
30f102e297 Move some attributes of setup wizard layouts to style files 
Change-Id: I7b5999253c959531212ee27ac1ddfe39de280e2c
 2013-04-19 12:43:40 +09:00
Tadashi G. Takaoka
411fd9bd02 Update strings of setup wizard 
Bug: 8159728
Change-Id: I34ef461410f4ebd4a3869c3614318581d48fdef5
 2013-04-19 11:16:06 +09:00
Tadashi G. Takaoka
38046a0a4e am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail" 
* commit '7abeccfa2753806086c083b3ba7b5b96c40b387a':
  Add shadow to gesture preview trail
 2013-04-17 19:47:34 -07:00
Ken Wakasa
441fbbaf1d am 9a0e877c: am e3aa7f10: Adjust CHAR_LIMITs 
* commit '9a0e877cfbdeabee64949b28db274093d0d5a9de':
  Adjust CHAR_LIMITs
 2013-04-17 19:47:18 -07:00
Jean Chalard
5875362b70 am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override" 
* commit '9613be01de32ca276104c8c69b44c764d9e66a45':
  Move some values to a place where they are easier to override
 2013-04-17 19:41:12 -07:00
Tadashi G. Takaoka
dfc8135941 am 3d6b7431: am cd692be1: Merge "Change the default vibration duration to 20msec" 
* commit '3d6b7431893aa6aa6d0086e44b85f35057c5b87d':
  Change the default vibration duration to 20msec
 2013-04-17 19:41:09 -07:00
Tadashi G. Takaoka
464202047d Add user feedback to setup action labels and icons 
Bug: 8159728
Change-Id: I46c77c31973ae492c2a12291f2e0b154f64d26c9
 2013-04-17 19:57:46 +09:00
Tadashi G. Takaoka
8712ac7945 Finalize setup wizard strings and mark as translatable 
Bug: 8159728
Change-Id: I9f6f04b09b2cefdb7ece76a4f3c39ab56d0c8fab
 2013-04-17 19:52:50 +09:00
Tadashi G. Takaoka
c71dde9cb5 Add shadow to gesture preview trail 
Bug: 7167303
Change-Id: I8f76fe0aec6cb32388e7c85d04516d1dd7d28c29
 2013-04-16 16:50:59 +09:00
Ken Wakasa
e3aa7f10d0 Adjust CHAR_LIMITs 
bug: 8589156
bug: 8588538
bug: 8588746

Change-Id: I14050dc3542946c1bae2e1dc8b63b99758d5f9aa
 2013-04-15 22:47:08 +09:00
Jean Chalard
d0623ad7f3 Merge "Move some values to a place where they are easier to override" 2013-04-12 02:53:41 +00:00
Jean Chalard
7ad078e89c Move some values to a place where they are easier to override 
Bug: 8418765
Change-Id: Iff0edd4ed8da9d0d1a6fb9545224b232ba374469
 2013-04-11 17:35:23 +09:00
Tadashi G. Takaoka
e1416b4399 Change the default vibration duration to 20msec 
Bug: 8556975
Change-Id: Ia6a0fe230585c9826199a0696fb0c1367e917134
 2013-04-11 16:30:32 +09:00
Tadashi G. Takaoka
9620943cc8 am d9a22235: Hide Setup Wizard icon for stock keyboard 
* commit 'd9a2223570759d622c690b007369cf32f437f7e5':
  Hide Setup Wizard icon for stock keyboard
 2013-04-10 19:35:51 -07:00
Ken Wakasa
4c896a2fe8 am f71b9640: am d17c8bd9: Update comments 
* commit 'f71b96406391fc00c1d3dc45e6b3e827f3595842':
  Update comments
 2013-04-10 19:35:44 -07:00
Ken Wakasa
34cff46a9c am ed8fd94e: am 370461ef: Clean up a few option strings under the Advanced settings 
* commit 'ed8fd94e3c4fd16c0c767c1a45f46461313bdcb8':
  Clean up a few option strings under the Advanced settings
 2013-04-10 19:35:37 -07:00
Tadashi G. Takaoka
d9a2223570 Hide Setup Wizard icon for stock keyboard 
Bug: 8581647
Change-Id: Id530f1a33a5c919f4a732ec0d545dfbe76e56316
 2013-04-09 21:39:18 -07:00
Tadashi G. Takaoka
f606fd8554 Hide Setup Wizard icon for stock keyboard 
Bug: 8581647
Change-Id: Id530f1a33a5c919f4a732ec0d545dfbe76e56316
 2013-04-10 12:24:40 +09:00
Ken Wakasa
d17c8bd929 Update comments 
Change-Id: I6aef328ec9041666cc168c8323bed04d39591b71
 2013-04-08 23:05:45 +09:00
Ken Wakasa
370461ef9f Clean up a few option strings under the Advanced settings 
Change-Id: If41ac016128fce401dedcab0fa7d6c23edaca158
 2013-04-08 01:16:32 +09:00
Jean Chalard
844e5014fa Merge "Increase string limits" 2013-03-28 04:07:24 +00:00
Jean Chalard
eda69e5272 Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144

Change-Id: I7062e533e5d4521d2866a6c5f947c8f25b790675
 2013-03-28 13:03:49 +09:00
Satoshi Kataoka
3c8117c88f Fix appname 
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
 2013-03-22 16:19:44 +09:00
Satoshi Kataoka
4f6804e5b4 Fix appname 
Bug: 6789579
Change-Id: I224bd1b734f74db31c006601129339c099616ed6
 2013-03-22 11:54:35 +09:00
Satoshi Kataoka
a462cd80ae Support feedback 
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
 2013-03-19 17:25:55 +09:00
Jean Chalard
0cc0544a29 Merge the dictionary pack in Latin IME. 
Bug: 8161354
Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
 2013-03-19 15:40:14 +09:00
Alan Viverette
c2ee72a214 Announce keyboard mode changes as a WINDOW_STATE_CHANGED event. 
Bug: 8165295
Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
 2013-03-07 10:39:55 -08:00
Tadashi G. Takaoka
2e1b55f796 Add show setup wizard icon preference settings 
Bug: 8239067
Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
 2013-03-05 14:56:41 +09:00
Tadashi G. Takaoka
419e3e5261 Add translatable="false" to setup wizard's string resources 
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
 2013-03-01 13:31:57 +09:00
Tadashi G. Takaoka
e359789593 Revert "Fix description of setup wizard 1st step" 
This reverts commit b5f4cac532

Change-Id: Ic5787fcf63663885285c20403534572d5e7d7696
 2013-02-28 10:25:42 +00:00
Tadashi G. Takaoka
b5f4cac532 Fix description of setup wizard 1st step 
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
 2013-02-28 16:55:11 +09:00
Tadashi G. Takaoka
46878544ec Add preliminary setup wizard 
Bug: 8159728
Change-Id: I30d9cd637fb1d2e64588550e0aa4387bc1f7e6e5
 2013-02-21 09:54:02 +09:00
Tadashi G. Takaoka
0b49191797 Add translatable="false" for dictionary-pack.xml 
This is a follow up of I770335a2.

Change-Id: If0c021f4fb630bda7e8985591094488e11917e9b
 2013-02-12 12:07:03 +09:00
Tadashi G. Takaoka
b0767dd499 Separate resource file for dictionary pack metadata 
Change-Id: I770335a25c3db12ec8440c4fcb208ca1d9c1fa32
 2013-02-08 12:00:16 -08:00
Jean Chalard
6ecb4c4dcc [B11] Implement reset and passing of the URL to the dict pack 
Bug: 7601410
Bug: 7595195
Change-Id: I78cf04dce7c1e64de6725d32317de288a83bd39d
 2013-02-06 15:21:33 -08:00
Jean Chalard
afe889a83d Merge "[B9] Pass the client id parameter for dict info requests" 2013-02-06 04:38:44 +00:00
Kurt Partridge
97135c29c5 Merge "[Rlog79c] Cleanup of feedback strings and text entry" 2013-02-05 20:11:24 +00:00
Kurt Partridge
6a4d218f69 [Rlog79c] Cleanup of feedback strings and text entry 
Change-Id: I97457ea8033a011c37e5970eb91d1a3273b81e2a
 2013-02-04 14:42:08 -08:00
Tadashi G. Takaoka
70c63049d3 Make CHAR LIMIT to 66 for some strings 
Bug: 8112520
Change-Id: Ia7303e9bae651a3990b781341002fae950997dc1
 2013-02-04 14:18:07 -08:00
Jean Chalard
8192b4a6ef [B9] Pass the client id parameter for dict info requests 
Bug: 6789534
Change-Id: Ie3ea75b19ae4da2dea531e0077c58742a9502bc6
 2013-02-02 18:23:40 +09:00
Kurt Partridge
ceffa0bec9 Merge "[Rlog79a] Disallow empty feedback messages" 2013-02-01 17:15:07 +00:00
Kurt Partridge
d3f718fccd [Rlog79a] Disallow empty feedback messages 
Change-Id: I30f7c07606e466c3c9538adad94024d00f0901de
 2013-02-01 07:08:32 -08:00
Kurt Partridge
588d9b5c8d [Rlog47] Replayer service, inspect-researchLog.py 
multi-project commit with Ia2dd81afb4ea124094a20a39e31ffd193edff3d2

Change-Id: I80fe8f2ce137fedf48038955d5f3d9deed04f763
 2013-01-31 12:13:08 -08:00
Kurt Partridge
9c18a47162 Merge "[Rlog29] User interface for recording" 2013-01-30 16:40:03 +00:00
Tadashi G. Takaoka
e1f091c5d4 Add keyboardLetfPadding and keyboardRightPadding attributes 
This change splits keyboardHorizontalEdgesPadding attributes of
Keyboard into two attributes.

Change-Id: Iefdb358783b81af4027e8d9e991db36a6c429cf1
 2013-01-30 15:01:33 +09:00
Tadashi G. Takaoka
5ee2d79e41 Remove "dimension|fraction" format from Key and Keyboard attributes 
Change-Id: Ieec8b7f5ccdf2a57bcc539dcb5313b6353f926d7
 2013-01-30 13:01:14 +09:00
Kurt Partridge
faf35c323b [Rlog29] User interface for recording 
- Also, internal flag for automatically replaying after a recording is made (off by default)
- RLog key to "Bug?"

multi-project commit with I0c2fababd73eed5a341af487bca04ddd650d4cc2

Change-Id: I162c96a715de7180f276e08b4686a20f29dabafb
 2013-01-29 15:46:16 -08:00
Tadashi G. Takaoka
83f173cccd Merge "Remove {max,min}keyboardHeight attribute from Keyboard" 2013-01-29 09:34:19 +00:00
Tadashi G. Takaoka
17dae3057c Remove {max,min}keyboardHeight attribute from Keyboard 
This change removes a DisplayMetrics reference from KeyboardBuilder.

Change-Id: I512694274e69e5281d5be47c3f938bcfd6571152
 2013-01-29 18:32:04 +09:00
Tadashi G. Takaoka
84106a776b Add summary text to sliding key input preview settings 
Bug: 8089491
Change-Id: I15801281a95b01c67ef23a9c1558d6cdf457d375
 2013-01-29 17:53:38 +09:00
Tadashi G. Takaoka
ce875664e0 Clean up Settings and SettingsFragment a bit 
Change-Id: I93bf3cb1ea7e8fc09f4ad34b0bdd74f5f5ff1a68
 2013-01-25 16:23:29 +09:00
Tadashi G. Takaoka
52a0d491b4 Merge "Add preliminary graphics of sliding key input preview" 2013-01-24 09:23:28 +00:00
Tadashi G. Takaoka
ff961ddf8c Add preliminary graphics of sliding key input preview 
Bug: 7548583
Change-Id: Idde6a62f9e64458055c99c893b71c02d1adc7b04
 2013-01-24 18:14:20 +09:00
Tadashi G. Takaoka
8203f7afe7 Display custom input style name in system locale 
Bug: 8032166
Change-Id: Ib9a6b63c4d540ce377892fb865e53abdd8adec16
 2013-01-24 17:44:49 +09:00
Tadashi G. Takaoka
cc5e4a4445 Configurable key long press timeout 
The default long presss timeout is 300msec (previous timeout was
400ms).

Bug: 7600340
Change-Id: Ia8b64784ac03588631cfcbad30e021d74f3fd0d8
 2013-01-23 17:12:28 +09:00
Tadashi G. Takaoka
c053293484 SeekBarDialogPreference supports minValue and stepValue 
Change-Id: I7aaeeb2db85103708747ae318610bd4896ef96fd
 2013-01-22 16:35:59 +09:00
Kurt Partridge
4cb853191c [Rlog15] ResearchLogger option to include account name in feedback 
multi-project commit with I0a293f392bd605c8203dc9a62993345ad58dcfbe

Change-Id: Ief5b940a62dbaeaecdf1c55f2ffdd1e0fdaea2b9
 2013-01-21 12:18:43 -08:00
Jean Chalard
b56260b891 [AD4] Actually copy the file in place. 
This finally makes it work.

Bug: 7702011

Change-Id: I3508c88567f79598e4d1dff561b6ba7dc5c3808f
 2013-01-21 17:58:38 +09:00
Tadashi G. Takaoka
f3c4cd45a5 Move dimming keyboard to MainKeyboardView 
Change-Id: Id44d4b758c8b92d1120d3a8b06812dc1fc26390c
 2013-01-21 16:54:08 +09:00
Jean Chalard
bde94dd96f Merge "[AD3] Implement the interface to choose a local dictionary" 2013-01-21 07:41:48 +00:00
Tadashi G. Takaoka
9c968b62d1 Move gesture related XML attribute to MainKeyboardView 
Change-Id: Ia12f73a3d7d26596ee14a0aff23244ef72753d68
 2013-01-21 16:16:48 +09:00
Tadashi G. Takaoka
375982106b Move PointerTracker.DrawingProxy to MainKeyboardView (step 2) 
Change-Id: If15d5ee683b8026d1871a3fe438dba498944faa7
 2013-01-21 16:09:25 +09:00
Tadashi G. Takaoka
0e4f0da449 Move PointerTracker.DrawingProxy to MainKeyboardView (step 1) 
Change-Id: I86014de147416453503b6412eb862a2d172426aa
 2013-01-21 16:06:50 +09:00
Jean Chalard
fbc5e9b334 [AD3] Implement the interface to choose a local dictionary 
Bug: 7702011
Change-Id: Id3b9c58dbbf5097e4d6ce986d20924eae19f9690
 2013-01-21 15:40:46 +09:00
Tadashi G. Takaoka
d9449ccf3c Move MoreKeysPanel.Controller implementation to MainKeyboardView 
Change-Id: Iffa298d51ca21a7dcd1e77c633217532d96d2cf5
 2013-01-21 15:28:17 +09:00
Jean Chalard
9058bc0df4 [AD1] Add an option to read an arbitrary dictionary. 
Bug: 7702011
Change-Id: I76f52dd3fdb22824fc243ab3845ceec610469c81
 2013-01-18 20:18:06 +09:00
Tadashi G. Takaoka
5d894dcfaa Merge "Correct GesturePreviewTrail.getWidth() implementation" 2013-01-18 10:26:05 +00:00
Tadashi G. Takaoka
f420e506a0 Merge "Add SeekBarDialogPreference" 2013-01-18 10:25:13 +00:00
Tadashi G. Takaoka
2df0cf2c5a Add SeekBarDialogPreference 
This change removes SeekBarDialog class.

Change-Id: I437b1e554a5af264b8031ebe05b8250a831c8d3b
 2013-01-18 19:10:55 +09:00
Tadashi G. Takaoka
cc2636b4e1 Remove automatic switch back to alphabet feature 
Change-Id: I4600c808f2ec31c18d3698a43afa7f4be9407e3e
 2013-01-18 18:44:27 +09:00
Tadashi G. Takaoka
9e63ef89e3 Correct GesturePreviewTrail.getWidth() implementation 
Bug: 7981153
Change-Id: I20785b7f82329ce6f19c883e77a9716772cda290
 2013-01-18 17:55:24 +09:00
Kurt Partridge
937877b877 Merge "[Rlog14] Increase feedback buffer to cover whole session" 2013-01-17 21:21:49 +00:00
Jean Chalard
15ea1d4096 Merge "Simplify the space-before and space-after logic." 2013-01-17 09:07:20 +00:00
Jean Chalard
ae3b96b26e Simplify the space-before and space-after logic. 
Bug: 7889078
Bug: 7268000
Change-Id: I6c77b8c9e60ef69f02526b407124d2f5d02818ee
 2013-01-17 17:52:46 +09:00
Kurt Partridge
14b800d858 [Rlog14] Increase feedback buffer to cover whole session 
Change-Id: I55b61d9ca6eecd56181b8d2913f71559555cd89e
 2013-01-15 18:34:13 -08:00
Tadashi G. Takaoka
a7a7f4e002 Add default button to vibration/volume settings dialog 
Change-Id: I7beb4517314efdefeb47d91b14a6b02c3075c19f
 2013-01-10 15:11:30 +09:00
Tadashi G. Takaoka
fa7f08b373 Set default audio and haptic feedback settings 
- Default keypress volume is set to 0.2f in resource.
- Default keypress vibration duration is set to 10 msec in resource.

Bug: 7055329
Change-Id: I83bd6288d171d9787d52e2b02e4e5305f1435681
 2012-12-28 19:24:32 +09:00
Tadashi G. Takaoka
a2982dd5a7 Refactor to add SeekBarDialog 
Change-Id: Id8e08a1d5ec5efb2baf96a2634111619fcb9fd4e
 2012-12-28 15:49:36 +09:00
Tadashi G. Takaoka
8eaf75aa7b Fix label of switch to symbols key when symbols has shortcut key 
This change fixes the labels of switch to symbols key and switch back
from more symbols key when symbols layout has shortcut key.

Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
 2012-12-13 17:44:40 +09:00
Tadashi G. Takaoka
ac3720ce6d Fix layout switch keys' label of no language subtype keyboard 
This change moves the following string from resources to
KeyboardTextsSet.
- label_to_alpha_key
- label_to_symbols_key
- label_to_symbols_with_microphone_key

Bug: 7697799
Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
 2012-12-13 17:44:10 +09:00
Tadashi G. Takaoka
12939572f3 Remove unused suggestion preview stuffs 
Change-Id: Ida5668f4eba1783d96e02001a64ae713f98176b7
 2012-12-07 17:47:09 -08:00
Ken Wakasa
2d4d64d914 Increase the char limit for a string resource 
bug: 7687252
Change-Id: I73fb13572b198baac0bc21437b2362d87b16acbb
 2012-12-08 10:17:46 +09:00
Jean Chalard
2da8866518 Remove a couple Eclipse and Android Lint warnings 
Change-Id: I0c29c5d2abcbf80759b996d34b534deb083cd7d3
 2012-12-06 21:30:51 +09:00
Ken Wakasa
2b6a1fed76 Method/variable/resource names clean up for the double-space period 
bug: 7664717
Change-Id: I914aa588b863c442c2d360221e3fa0f4c42640e7
 2012-12-05 12:40:10 +09:00
Ken Wakasa
139bd83f0c Add a new option for the double-space period functionality 
bug: 6934756

Change-Id: I94b2d08cac6533e96031d8e97f347e9b5fd72859
 2012-12-04 15:27:22 +09:00
Satoshi Kataoka
6ae8dd4343 Tweak beeline speed 
Change-Id: I77bbd5e1888281e838d87824dc04a574b1a7ecb7
 2012-11-30 02:02:59 +09:00
Tadashi G. Takaoka
72fd0968e5 Provide gesture data even if the finger stays still 
Bug: 7595187
Change-Id: I6f85124815f18706b2b2b5b5da2783dffd246e8c
 2012-11-27 18:33:16 +09:00
Tadashi G. Takaoka
ebbb586693 Fix Gingerbread theme color for gesture typing 
Change-Id: I96a660ce8ee35fe90dc29e6d7f52528c0b34b7cb
 2012-11-27 12:17:25 +09:00
Jean Chalard
40f7b43b3f am 82cc7349: am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev 
* commit '82cc7349254e1ca3722ead1f108b6c53820432d5':
  Correctly add double quote to the space strippers
 2012-11-20 20:14:13 -08:00
Jean Chalard
c5653daf72 Correctly add double quote to the space strippers 
...without removing space, this time.
Also add a test to make sure it is working.

Bug: 7531719
Change-Id: I3afcc433c6cdc2774e7deeb6d358356db5035d35
 2012-11-19 17:48:19 +09:00
Tadashi G. Takaoka
76d4ffeebf Add Spanish United States keyboard 
The subtype locale name on the spacebar will be suppressed when only
one subtype is enabled and
 - Subtype locale is equal to the system locale.
or
 - Subtype language is equal to the system language but the subtype is
   implicitly enabled.

Thus the "es_ES" system locale chooses "es" subtype keyboard
implicitly but the keyboard doesn't have the subtype name on its
spacebar.

This change also removes Spanish Latin America keyboard.

Bug: 7531804
Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
 2012-11-19 15:39:44 +09:00
Ken Wakasa
9904c9ebbd am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev 
* commit '333881c434f3905763dd92a585b17f9c515dd8a8':
  Revert "Correctly add double quote to the space strippers"
 2012-11-16 18:38:02 -08:00
Ken Wakasa
86e554739f Revert "Correctly add double quote to the space strippers" 
This reverts commit af7264abb7

Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877
bug: 7561815
 2012-11-16 18:17:10 -08:00
Jean Chalard
2feb6b5b52 am 12c2e437: am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev 
* commit '12c2e437949414ce52b7e40ad191f15c844726e9':
  Correctly add double quote to the space strippers
 2012-11-16 10:36:12 -08:00
Jean Chalard
af7264abb7 Correctly add double quote to the space strippers 
This is a format error >.>

Bug: 7531719
Change-Id: I34b4c496192a32862c1ecb85bb6f6f38a06d6c61
 2012-11-14 13:00:15 +09:00
Tadashi G. Takaoka
dd7db83423 am a13087e1: am 9c318bc5: am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev 
* commit 'a13087e1abf48f8599795b9abb4f49a596a6f32c':
  Detect bogus down-move-up event and add workaround
 2012-10-12 11:14:00 -07:00
Tadashi G. Takaoka
b0952888eb Detect bogus down-move-up event and add workaround 
Bug: 7032858
Change-Id: I2e76bf49f1e07b436d05c19881e2f2c4fed21621
 2012-10-12 20:45:08 +09:00
Tadashi G. Takaoka
4020289147 am 6b0fa314: am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters 
* commit '6b0fa314d780ea77bd2c65b9bdd87297d50a0f6b':
  Tuning gesture detection parameters
 2012-10-09 07:48:45 -07:00
Tadashi G. Takaoka
f9aa99c1c9 Disable touch position correction of MoreKeysKeyboard 
Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
 2012-10-09 19:20:28 +09:00
Tadashi G. Takaoka
7a17c1fcb5 Tuning gesture detection parameters 
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
 2012-10-09 19:06:10 +09:00
Tadashi G. Takaoka
f731eb1760 Add separate key hysteresis distance for sliding modifier input 
Bug: 7294402
Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
 2012-10-07 01:19:01 +09:00
Tadashi G. Takaoka
3623b9767b Fix detecting fast typing algorithm and parameter 
Bug: 7032858
Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
 2012-10-05 18:23:39 +09:00
Tadashi G. Takaoka
80bcb99632 Move gesture detection and recognition paramters to resources 
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
 2012-10-05 14:39:44 +09:00
Tadashi G. Takaoka
bf538ab2c0 Remove dead code for disabling gesture input after fast typing 
Bug: 7218902
Change-Id: Iccc1d4cf0dd3ac84b30c68e11eee9a6ad89f14c4
 2012-09-28 16:15:51 +09:00
Tadashi G. Takaoka
1775201671 Calculate default touch position correction data for keys on 4th row 
This change also disables touch position correction for Phone/Dvorak
keyboard.

Bug: 7243101
Change-Id: Idfcc7ad1feabbe6a81635dceba5be087401fa18b
 2012-09-27 17:55:58 +09:00
Tadashi G. Takaoka
9458e71c0c Update keyboard settings wording 
Bug: 7129441
Change-Id: I1130b322126ad7c400845c1257a785ccbc7dff81
 2012-09-26 11:09:15 +09:00
Tadashi G. Takaoka
9f09c6fbc8 Disable gesture input while fast typing 
Bug: 7032858
Change-Id: I0f9f92c712dbe45f4ba0b3cf331fbe11426c1db4
 2012-09-24 13:14:47 +09:00
Tadashi G. Takaoka
bfcd2b3fc0 Merge "Change to "Show language switch key" option" into jb-mr1-dev 2012-09-19 19:56:59 -07:00
Tadashi G. Takaoka
1a4aa7e307 Change to "Show language switch key" option 
This change deprecates "Suppress language switch key".

Bug: 7037410
Change-Id: I1bc90877b4d2ee9364728959fd680dcb5b22ecbf
 2012-09-20 11:33:40 +09:00
Tadashi G. Takaoka
f1ee564897 Smaller gesture preview trail 
Bug: 7195987
Change-Id: Ibcd4b7a00b4e89070c4dfad88bb39ac1f7e4bd9a
 2012-09-20 10:47:54 +09:00
Brian Muramatsu
331a5e7d66 mako: adjust default keybpress vibration 
Bug 7049944

mako's vibrator has been recalibrated so reduce this to 5.

Change-Id: Ia53df175f5389e5fd1dc198e4877c4a4e7301559
 2012-09-19 14:40:30 -07:00
Jean Chalard
8d35b203ca Make the arrobase sign a space stripper. 
Gestures offer much more opportunity to enter e-mail user names,
so this should now be the dominant use case for arrobase use. In
this use case, the arrobase sign should be a space stripper.

Bug: 7164981
Change-Id: I736ac56dab81cd2c97275ec80dbb0ec0bc159006
 2012-09-14 17:31:46 +09:00
Tadashi G. Takaoka
82902e7671 Add boolean resource isDefault=true for all supported locales 
Bug: 7115368
Change-Id: I390d52d10d6c7d1639f73255ace9985886ea2157
 2012-09-13 15:56:35 +09:00
Tadashi G. Takaoka
c54614d9f3 Cosmetic change to remove trailing space 
Change-Id: If8c00c763f815d5eb97e18b19060c63d321ccd61
 2012-09-13 15:21:54 +09:00
Tadashi G. Takaoka
c1780c16a7 Revise gesture preview trail design 
Bug: 7042741
Change-Id: I99e3b3a6fc52afaee3cc5daf371131c3afebb3ae
 2012-09-06 20:09:12 +09:00
Tadashi G. Takaoka
15496ec4d7 Merge "Revise gesture floating preview design" into jb-mr1-dev 2012-09-05 20:35:40 -07:00
Tadashi G. Takaoka
71e2e8152f Revise gesture floating preview design 
Bug: 7043127
Change-Id: Ibf9a6d57279263d9b60753e0eb734b658eeda9f2
 2012-09-06 12:29:57 +09:00
Ken Wakasa
aa7cc7beed Merge "Cosmetic cleanup" into jb-mr1-dev 2012-09-05 19:07:45 -07:00
Ken Wakasa
d3a9b70307 Cosmetic cleanup 
Change-Id: I5e95440019f58c606ac2e947c6e0cbd4d51f6522
 2012-09-06 01:13:12 +09:00
Tadashi G. Takaoka
e8c6d5a480 Utilize StateListDrawable for key preview background 
Change-Id: I268550a185701caecefc27ebaec40fb2c940d883
 2012-09-05 20:38:00 +09:00
Tadashi G. Takaoka
848331222e Use string-array resource to define predefined-subtypes 
Bug: 6809603
Change-Id: Icafe4652ec17844838b28c04977deb88bcb9aa8f
 2012-09-04 17:18:39 +09:00
Tadashi G. Takaoka
8624a0a186 Use normal font for Thai 
This change also adds workaround to display Thai composing letters
correctly.

Bug: 6753168
Change-Id: Ibd42ebb40df08b5de32b3500f10003c4a5de4897
 2012-09-03 14:05:10 +09:00
Tadashi G. Takaoka
aa54607246 Merge "Support per-Key and per-Keyboard key visual attributes" into jb-mr1-dev 2012-08-31 04:24:48 -07:00
Tadashi G. Takaoka
dc34da218a Support per-Key and per-Keyboard key visual attributes 
This change refactors KeyDrawParams and KeyPreviewDrawParams to
separate KeyVisualAttributes.

Change-Id: I4de549eef303e1debe4b8f84668e042445fc18da
 2012-08-31 20:23:21 +09:00
Tadashi G. Takaoka
518838b778 Use resource to specify 5-rows keyboard parameters 
Change-Id: I67b290c4600dee43a81ba975ffc93a32a6d060b4
 2012-08-31 19:14:33 +09:00
Kurt Partridge
9bbc7ec052 Merge changes Ifb983c35,I0b947421 into jb-mr1-dev 
* changes:
  ResearchLogger clean up splash screen
  ResearchLogger no longer offers option to disable logging
 2012-08-30 22:56:53 -07:00
Kurt Partridge
25405eafb0 ResearchLogger clean up splash screen 
- simpler text
- AlertDialog implementation
- declining users are redirected to regular IME

Bug: 6188932
Change-Id: Ifb983c3511125f8919f4a8b25aeee7de66dbb0cb
 2012-08-30 22:52:00 -07:00
Tadashi G. Takaoka
71b52a84e2 Move key label padding attributes back to KeyboardView 
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394

Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
 2012-08-31 10:35:54 +09:00
Tadashi G. Takaoka
749cc18751 Move some key top visual attributes from KeyboardView to Key 
Change-Id: I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
 2012-08-30 16:14:32 +09:00
Tadashi G. Takaoka
61bc66b324 Revert "Revert "Fix key letter size of 5-rows Thai keyboard"" 
This reverts commit 7a5ca9982f.
Depends: Ia4fa5046b3106e2710b9d5df1a6cc5f2cf995ec7

Change-Id: I0b9d0125380efe898943dc26ae884378145c44a3
 2012-08-30 11:30:13 +09:00
Jason Chen
85cb45c80f Merge "Add defaults for manta" into jb-mr1-dev 2012-08-29 15:40:41 -07:00
Jason Chen
3b54385d61 Add defaults for manta 
Change-Id: I8784a126b02e3e6618ac845a32a894ceb58ea39e
 2012-08-29 09:10:26 -07:00
Ken Wakasa
7a5ca9982f Revert "Fix key letter size of 5-rows Thai keyboard" 
This reverts commit ac621d1527

Change-Id: I17b1d17c773c2fe89c0cdef2c423c8ccd1d2c9c8
 2012-08-29 04:32:24 -07:00
Tadashi G. Takaoka
ac621d1527 Fix key letter size of 5-rows Thai keyboard 
The key text size can be specified in each keyboard layout in addition
to by KeyboardView theme.

Bug: 6473915
Change-Id: Icd2d436fa1d8fc7bd1deb9e4b799d4f624376fb2
 2012-08-29 19:04:49 +09:00
Tadashi G. Takaoka
d20652c878 Use non-bold text for Arabic and Thai keyboard 
The key text style can be specified in each keyboard layout in
addition to by KeyboardView theme.

Bug: 6753168
Change-Id: I4b5abda9322600eb8c6421f20ceef136ef103c05
 2012-08-29 17:33:44 +09:00
Charles Chen
78527e4dbb Merge "Adjust accessibility edge slop." into jb-mr1-dev 2012-08-28 10:28:55 -07:00
Tadashi G. Takaoka
9fa0736d6a Consolidate KeyboardView.keyLetterSize and keyLetterRatio 
This change also consolidates keyboardView.keyLabelSize and
keyLabelRatio.

Change-Id: I4a45bcb6e7fc104ae4a9ae3ecdae9842d813840e
 2012-08-28 16:04:59 +09:00
Tadashi G. Takaoka
ef2bfad590 Use TypedArray.getFraction to read percentile values in resource 
Change-Id: Ifc8b024d190efba4cd536fd639621e841eb9970e
 2012-08-28 15:18:40 +09:00
alanv
e76a9b36ca Adjust accessibility edge slop. 
Bug: 6969558
Change-Id: Ie33f444e085e5c01326bdf9396eabee5c04ee81e
 2012-08-27 18:05:21 -07:00
Tadashi G. Takaoka
1c2f332239 Optimize gesture preview trail drawing a bit 
This change also change the fading out duration of the gesture
preview trail to 800msec from 1,000msec

Change-Id: Icfd5b1ecad66db4f978249486f5fe362a3ae9640
 2012-08-27 14:43:39 +09:00
Brian Muramatsu
43da9ce041 Add mako keypress vibration and volume settings 
This prevents -1 and -1000 from appearing as the defaults in
Advanced Settings.

Change-Id: I42938782077a0a3dfb5ec2125c0266b6712bcf63
 2012-08-24 18:08:05 -07:00
Tadashi G. Takaoka
333a300586 Add multiple gesture preview trails animation 
Change-Id: I533e6de9b138317472565be82c8ba5e422472888
 2012-08-24 17:04:20 +09:00
Kurt Partridge
b5ace11a2e ResearchLogging upload via service 
Upload using an intent service rather than just a thread.  More robust in case the keyboard
is closed and the upload hasn't finished yet.

multi-project commit with Id515c2b1b0d6f85be50f92a661a2d32ebaeaa143

Bug: 6188932
Change-Id: I64a9fab92ff89ee09df877db4e5f7f0ec0ffb3b6
 2012-08-22 11:27:46 -07:00
Kurt Partridge
bf653996ea ResearchLogging capture full n-gram data 
- Captures complete motion data for all words in an n-gram.
- Also filters n-grams properly; if any word in the n-gram is not
  in the dictionary, it is not included.
- Simplify ResearchLog to not require explicit state
- Added LogBuffer class MainLogBuffer class to allow n-gram-level decisions
  about privacy.
- Moved LogUnit out from ResearchLogger

multi-project change with Ic70ccb6c2e11eb02d887821434b44daa3eb7a3e2

Bug: 6188932
Change-Id: I731d6cff6539e997874f723b68bdb0d9b651b937
 2012-08-21 22:37:33 -07:00
Kurt Partridge
adb591e75b Merge "Revert "ResearchLogging capture full n-gram data"" into jb-mr1-dev 2012-08-20 10:18:30 -07:00
Kurt Partridge
f1c3e53b23 Merge "Revert "ResearchLogging upload via service"" into jb-mr1-dev 2012-08-20 10:18:10 -07:00
Kurt Partridge
3d35908749 Revert "ResearchLogging capture full n-gram data" 
This reverts commit 221e756fd7

Change-Id: Iefc4e4e27ddc925d4a4634627b0467bd4ee2a66e
 2012-08-20 10:17:40 -07:00
Kurt Partridge
96da633582 Revert "ResearchLogging upload via service" 
This reverts commit baf1f0bd61

Change-Id: I7d959b9b626c8fb69a57788e243752952258fa80
 2012-08-20 10:17:29 -07:00