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

1109 commits

Author SHA1 Message Date
Tadashi G. Takaoka
c2ea3f7dd9 Remove suggestion_word and suggestion_info layout files 
Change-Id: I37fea41cfc6e717ce7e5aa36ad331675fc9e8ce5
 2014-01-28 19:38:35 +09:00
Tadashi G. Takaoka
08ce454aa5 Fix newline string resource 
The newline string resource "\n" doesn't work off-device simulation.

Bug: 12623502
Change-Id: I3ad63d8afe50be174493d43f00f7191062c87cb7
 2014-01-20 19:36:20 +09:00
Tadashi G. Takaoka
7504913807 Move phrase gesture related string resources to AOSP 
This change must be checked in together with Ica8fc5135.

Change-Id: I288d7083391954f1266a9b77ee4ffc0bc9d4229d
 2014-01-14 17:15:41 +09:00
Keisuke Kuroyanagi
ba07df7fc1 Periodic wipe of the personalization dict. 
Bug: 12216453

Change-Id: Ie59dd19c044e9b1eb9b8bd805366200737ea506a
 2014-01-10 16:30:59 +09:00
Tadashi G. Takaoka
12ba821bfb Add description of disabled voice input key option 
Bug: 12377179
Change-Id: I44d35c6fa82883710674ecca6f630d09076472fe
 2014-01-06 12:11:55 +09:00
Keisuke Kuroyanagi
5c4bd20331 Remove "Boost personalization dictionary" from settings. 
Change-Id: Iab05e42e947610f358472cd95d0319d0ab3f0b31
 2013-12-25 19:02:49 +09:00
Tadashi G. Takaoka
9c4de1e5f7 Use config_screen_metrics resource in BogusMoveEventDetector 
Change-Id: I6b957b43c6dd7ce4f639e46d248179662c1ee669
 2013-12-20 17:35:19 +09:00
Keisuke Kuroyanagi
d4bb7df412 Add option to enable personalization dictionaries. 
Bug: 11757851

Change-Id: I4872c10793d4fd55c0bd9e5bc4650925de6d2c1d
 2013-12-16 19:17:31 +09:00
Tadashi G. Takaoka
a5b196e939 [FIX] Separate form factor dependent config resources 
This is a cherry-pick of I668b55a514.

Change-Id: I00e9a74812d622c12af0337ba50e1b2f1d675cf1
 2013-12-13 18:01:01 +09:00
Ken Wakasa
2fa3693c26 Reset to 9bd6dac470 
The bulk merge from -bayo to klp-dev should not have been merged to master.

Change-Id: I527a03a76f5247e4939a672f27c314dc11cbb854
 2013-12-13 17:13:32 +09:00
Tadashi G. Takaoka
db86a6f271 Add keyboard color switch option 
Bug: 11622614
Change-Id: I25aa1ff7376fe72fd94ab2cb7190c61d7a98a1af
 2013-11-22 17:26:33 -08:00
Tadashi G. Takaoka
51352009b5 Add JB/ICS resources from Azuki MR1 release 
Bug: 11622614
Change-Id: I126fc42dd31e912788db0446b67a9d4ea80f848e
 2013-11-22 17:26:26 -08:00
Tadashi G. Takaoka
fe5262a70d Rename KLP theme related resources 
Bug: 11622614
Change-Id: I4e390aa263349d730b47502d84e4d528e7f5ce71
 2013-11-22 17:26:17 -08:00
Tadashi G. Takaoka
d5e6044ded Rename KLP/JB/ICS common resource name suffixes to _holo 
Bug: 11622614
Change-Id: I53b5ff8b6627a38aef352855ad024213a450b40f
 2013-11-22 17:26:08 -08:00
Tadashi G. Takaoka
978e2f67f7 Add key press vibration value for Motorola DVX 
Bug: 10884131
Change-Id: Id6d5589f3528de05c7b346ce55e926c3e18f22cc
 2013-11-22 17:25:57 -08:00
Baligh Uddin
b4cc0ae075 Import translations. DO NOT MERGE 
This is a manual cherry-pick of Ib0c14a756a.  This change also copied
some missing locales' strings.xml and strings-action-keys.xml from
jb-ub-latinimegoogle branch.

Bug: 11622614
Change-Id: Ibc9cde4662b15da63b73ac2b545e0e94c358de67
 2013-11-21 11:28:47 +09:00
Jean Chalard
10581e68af Make the sentence separator a resource. 
This will help handing correctly the armenian full stop.

Bug: 10082781
Change-Id: Id7bb219ebd89daba203216eab362d1cc26a65a36
 2013-10-08 15:28:43 +09:00
Satoshi Kataoka
32cf6f85a2 Show Emoji key by longpressing the enter key 
Bug: 11074625
Change-Id: I5fc57a2b68d7dcfb8dbebf5821b76b0895a947f9
 2013-10-07 16:47:13 +09:00
Satoshi Kataoka
4deb824f3a Add navigateEmoji 
Bug: 11074625
Change-Id: I1ef6b81ef923684b502c24fddb4ced8fe1691733
 2013-10-07 15:28:39 +09:00
Satoshi Kataoka
d76b552979 Rename EmojiKeyboardView -> EmojiPalettesView 
Change-Id: I226bb8e21fd2b2b6639896a1cc433d19f3f431c2
 2013-10-07 12:28:13 +09:00
Satoshi Kataoka
1d188a28fb Merge "Fix emoji" 2013-10-04 12:00:39 +00:00
Satoshi Kataoka
0cf92aa826 Fix emoji 
Bug: 10538430

Change-Id: Ib11e29794216b54001806ab12fe440d157243dc1
 2013-10-04 20:58:09 +09:00
Ken Wakasa
fba1bd0ec4 Suppress exceptions that have always been happening. 
Change-Id: I5f85a7a0f94ea9ecbe0c4a8caebcf551fa9c9669
 2013-10-04 19:10:26 +09:00
Alan Viverette
afa565119c Merge "Update string comments for translation" 2013-10-03 20:34:24 +00:00
Satoshi Kataoka
194e004e81 Prepare for changing text color for functional keys 
Bug: 10786040

Change-Id: I0de7d4923ea13b44adcf1f4ea456796cd02ef27b
 2013-10-03 15:54:46 +09:00
Alan Viverette
1240d28e57 Update string comments for translation 
BUG: 11042719,11021829
Change-Id: I27c80d1a2489843a16bd2b055d2ae81797492d1c
 2013-10-02 17:07:20 -07:00
Alan Viverette
458fb52b98 Merge "Speak auto-corrections for accessibility" 2013-09-30 18:14:13 +00:00
Alan Viverette
67319f92f3 Speak auto-corrections for accessibility 
BUG: 8669376
Change-Id: Id71b2c2835daa7a8c9d6c92c57a7e302551c289d
 2013-09-27 14:15:53 -07:00
Satoshi Kataoka
b44efbdcc0 Reduce Emoji size 
Change-Id: Ie9dec82c0edde70a75fffeb7c86c14e05f468207
 2013-09-28 02:02:47 +09:00
Satoshi Kataoka
9204d11525 Implement delete key repeater 
Bug: 10810844
Change-Id: Idbfe2196e8f0f8cf6dd1b77574eefb395c12807a
 2013-09-24 18:23:38 +09:00
Ken Wakasa
2c4bbe2596 Keypress vibration default value for Xperia Z Ultra 
bug: 10832066
Change-Id: I9ed107f192d65e792529699b30bb88de73a5788a
 2013-09-23 18:01:22 +09:00
Satoshi Kataoka
d764a0a0ad Update resources: Colors 
bug: 10786040

Change-Id: Idee67e73096e1e31126dbf24e9608d3e6dba2b47
 2013-09-20 17:03:32 +09:00
Satoshi Kataoka
baa3121704 Update resources 
Change-Id: Ia66f7181514ee1471e181e16d15622174cf72e79
 2013-09-20 14:49:54 +09:00
Satoshi Kataoka
250a12f6c2 Show Emoji category page id indicator 
Bug: 10538430
Change-Id: I767fa8d41c789125af266f2203b4bad7452bc0a5
 2013-09-19 18:41:13 +09:00
Satoshi Kataoka
cf08ddbdb7 Fix test in SubtypeLocaleUtilsTests 
Change-Id: I4f7bf70ec7a0a67ad5d2129afed314b1b1a93a6c
 2013-09-19 11:45:11 +09:00
Jean Chalard
73d607fb70 Merge "[AC5] Introduce the setting for phrase gesture." 2013-09-17 03:42:38 +00:00
Satoshi Kataoka
c65f6c3001 Merge "Split Emoji categories fitting the pager" 2013-09-16 09:31:47 +00:00
Satoshi Kataoka
5dfbc8af24 Split Emoji categories fitting the pager 
Bug: 10538430
Change-Id: Ic023ac0b9db8a1fe16c73ab5fd12dfcd7cbbe6a3
 2013-09-16 18:27:20 +09:00
Ken Wakasa
187dd85a40 Additional fix for Lao; No spaces used between words 
bug: 6911140
Change-Id: I1b1141c203175b9f9a818564272c0aa49df33888
 2013-09-16 12:03:30 +09:00
Jean Chalard
a37bee2805 [AC5] Introduce the setting for phrase gesture. 
Bug: 9059617
Change-Id: I6fa0f675f4edac10bd19228cd2f0c8fca97cebd6
 2013-09-13 20:44:37 +09:00
Satoshi Kataoka
2d3d415826 Change space key height in Emoji keyboard view 
bug: 10538430

Change-Id: I724a8c92b49a64196c7da2af40f3d20758e0dbae
 2013-09-12 19:18:41 +09:00
Satoshi Kataoka
741831d322 Add margin to the label of language 
Change-Id: I48dc63475caf5cc1a1ac09b82b26fbeaef993fa1
 2013-09-06 17:21:44 +09:00
Satoshi Kataoka
e3150664ae Revert "Remove symbols shifted layout related code" 
This reverts commit 1cd027850b.

Bug: 9059539

Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
 2013-09-04 16:27:34 +09:00
Satoshi Kataoka
5169937dd4 Revert "Revert "Support Emoji keyboard"" 
Window resizing junkiness is addressed in I605e657c9468

This reverts commit aabc972338.

Change-Id: I0bc0f1ad9a90799e643fe9ec35f5b4bbe94eee0d
 2013-08-30 19:46:10 +09:00
Ken Wakasa
aabc972338 Revert "Support Emoji keyboard" 
This reverts commit d7791a93b0.

Change-Id: I5ca4c0227f97540e8a22b487b5056dfa3611082b
 2013-08-30 07:23:42 +00:00
Tadashi G. Takaoka
d7791a93b0 Support Emoji keyboard 
Bug: 6370846
Change-Id: I33ce8f952799c89929996a226ac17731a953ec2a
 2013-08-29 19:48:34 +09:00
Tadashi G. Takaoka
6c926a1d5e Add Nepali Traditional keyboard 
Bug: 9833890
Change-Id: I0af4a358cc1457dc08c32744b5c170bd2a3382c9
 2013-08-29 17:21:42 +09:00
Tadashi G. Takaoka
41745c4995 Add keyboardLayoutSet attribute to <case> condition 
Change-Id: I017c4a3c1c7b2e4c6f607940078f61e120042270
 2013-08-29 09:50:45 +09:00
Tadashi G. Takaoka
0861d67fd8 Fix unit test 
The breakage of the unit tests has been introduced by Id8caf5a972 that
emptied the default styles. This change reverts back some attributes
to the default.

Change-Id: I2748eefe50e34bbf908071e4a1a17a70aa32bdef
 2013-08-28 20:22:18 +09:00
Tadashi G. Takaoka
8e3a90e58f Merge "Add emoji keyboard related assets" 2013-08-28 07:55:22 +00:00
Tadashi G. Takaoka
c0f81463cb Merge "Add dummy Emoji subtype" 2013-08-28 07:42:29 +00:00
Tadashi G. Takaoka
803ea61d55 Add recents keyboard 
Bug: 6370846
Change-Id: I5dc235395fe9b3bd95711fee2fe9b678b4660760
 2013-08-28 16:33:54 +09:00
Tadashi G. Takaoka
34cbcc1aed Add dummy Emoji subtype 
Bug: 6370846
Change-Id: I4fa3a6832fa316d0c6312d434be3c3ff02b52402
 2013-08-28 16:26:00 +09:00
Tadashi G. Takaoka
d189d2a508 Add emoji keyboard related assets 
Bug: 6370846
Change-Id: I86c446665387b5ddf7de08189de306f2bc569262
 2013-08-28 16:21:44 +09:00
Tadashi G. Takaoka
26d3644434 Fix SuggetionStripView.ICS style 
This is a follow up of I06427e8886.

Change-Id: Ib33d64f4a4c4f08a80983b6ddf8d117aacbedccb
 2013-08-27 17:29:34 +09:00
Tadashi G. Takaoka
e94bbca39b Aggregate theme resources into one file 
Change-Id: I06427e88864bd9f644820dc8d755719cf2ac0ba6
 2013-08-27 17:18:39 +09:00
Tadashi G. Takaoka
08323cd597 Add _gb to Gingerbread resources 
Bug: 10415342
Change-Id: Id8caf5a972fe72b577dbf50dcd2cf739b2d35a32
 2013-08-27 17:05:22 +09:00
Tadashi G. Takaoka
adaaf9ffb8 Rename theme file names 
Bug: 10415342
Change-Id: I692b157953f77c610482b494cbaeed4430bcb629
 2013-08-27 14:41:54 +09:00
Tadashi G. Takaoka
1f4612fc54 Remove obsolete theme resources 
Bug: 10415342
Change-Id: I9073c54b037e0f7973710a9e24ca5044f8db6db0
 2013-08-27 12:47:26 +09:00
Tadashi G. Takaoka
2f5a933c04 Add GridRows tag to support emoji keyboard 
Bug: 6370846
Change-Id: Ia68284b2402e52d835040da900a51cca669add2f
 2013-08-26 17:19:24 +09:00
Tadashi G. Takaoka
c120199f72 Import emoji unicode point list from Hangouts 
Bug: 6370846
Change-Id: I14017f002a94647d2b3154f1f0805f194421b8b5
 2013-08-26 16:05:14 +09:00
Tadashi G. Takaoka
68b990e7ce Add emoji keyboard element ids 
Bug: 6370846
Change-Id: I0ac55bc06e1527bafad395f4a2b5059e1fed4b5d
 2013-08-26 12:48:07 +09:00
Tadashi G. Takaoka
1cd027850b Remove symbols shifted layout related code 
This is a follow up of I7fe6520e4e.

Bug: 9059539
Change-Id: Idb39906ddb1e2234a0d1c7c4d5e6fc728090e79e
 2013-08-24 00:07:23 +09:00
Tadashi G. Takaoka
1f39d36458 Remove unnecessary alpha attributes of SuggestionStripView 
Change-Id: I78701403d7bd21928c4b459bb336a565f386ebcc
 2013-08-21 12:44:30 +09:00
Satoshi Kataoka
d6ddb96ee8 Add a functionality to boost scores of personalization dictionary 
Bug: 9429906
Change-Id: I1518c5cbc7d41188e7dc6a35d226da277ed5913f
 2013-08-20 17:50:48 +09:00
Jean Chalard
c239a34262 Support languages that don't use spaces. 
Thai is an example.

Bug: 10138062
Change-Id: Ib9a8264c77ed42b4256432d7c8a60d08575dcdc7
 2013-08-16 21:01:08 +09:00
Tadashi G. Takaoka
e18439d5c7 Add empty key background type 
Change-Id: I9b07c58a9b70ae0228f87e1f066ca8cd959b4f03
 2013-08-14 18:12:11 +09:00
Jean Chalard
7f2cb76990 Increase CHAR_LIMIT to 29 to accommodate German. 
Bug: 10221961
Change-Id: Ib9967f7a258f499d24294da16a9191cc2dda4a32
 2013-08-08 15:00:33 +09:00
Jean Chalard
0f47d5163d Merge "Reword "No language"" 2013-08-06 11:11:21 +00:00
Tadashi G. Takaoka
cc38bfb5d3 Merge "Add emoji icon and code as a groundwork" 2013-08-06 05:35:14 +00:00
Tadashi G. Takaoka
b127d88285 Add emoji icon and code as a groundwork 
The emoji switching key icon asset should be updated. The icons in
this change are just borrowed from Hangout.

Bug: 10179862
Bug: 6370846
Change-Id: Icea26d2cf2ac6a6df9beb4c98f646dbe309bdcd9
 2013-08-06 14:16:15 +09:00
Tadashi G. Takaoka
52d220e71b Remove unnecessary suggestion strip container 
Change-Id: I3710e1fe1574c0f69f7f448619e939fb45e9b8d3
 2013-08-06 10:57:47 +09:00
Jean Chalard
c5beb522ed Reword "No language" 
Bug: 10064334
Change-Id: Ie4e6c333566eee9000fa5c8e59e9df8b9b56a5b3
 2013-08-05 18:16:35 +09:00
Jean Chalard
965b7266c2 Fix a typo 
Change-Id: Ie724a444ce056ee43b7ca2f10f30cce5843e61ad
 2013-08-05 18:13:29 +09:00
Satoshi Kataoka
d7491e6e81 Add a debug preference for using only personalization dictionary 
Bug: 9429906
Change-Id: I2003060c7065e736d42f3b3303fbba549358dd18
 2013-08-02 20:10:57 +09:00
Tadashi G. Takaoka
310ea9ab90 Remove sudden jump touch event hack 
This hack was for Nexus One and Droid that can't run on ICS or later.

Change-Id: I1f9cef2022b0bbb333235e6b7c311c9785a1d894
 2013-07-31 17:32:41 +09:00
Tadashi G. Takaoka
3029b25000 Add default keypress vibration duration of HTC J One 
This change also removes obsolete HTC One Google Play edition's model
name.

Change-Id: Ic396d1a2288c8926782c3f0bc930170d468c047b
 2013-07-23 19:38:29 +09:00
Jean Chalard
d6c621cd87 Don't put spaces before and after asterisks 
Change-Id: I3c87745c3d4e7a0c531f6c2e68120fada556b44b
 2013-07-12 13:37:40 +09:00
Tadashi G. Takaoka
7937f09264 Lengthen CHAR LIMIT of settings_system_default 
Bug: 9495443
Change-Id: Ib52d0ab357e79ae6004411f4b4201570a228bc71
 2013-06-20 12:08:37 +09:00
Tadashi G. Takaoka
c90181d6aa Use system default key press volume 
Bug: 9475973
Change-Id: I6ae825b161dde69e19b52d73fb9aa782e2aa7423
 2013-06-18 21:34:30 +09:00
Tadashi G. Takaoka
af69a14c96 Use system default vibration pattern 
Bug: 9468462
Change-Id: Ifa46a56873c10888da8eaa2782fe07ef138a141b
 2013-06-18 21:33:51 +09:00
Tadashi G. Takaoka
3be8263035 Get value text from ValueProxy 
As a preparation to show "system default" in the settings. LatinIME
can't know the actual system default value.

Bug: 9468462
Change-Id: I0b7898d1ca29ded7a619dd636d2ad16eb0db292e
 2013-06-18 18:27:17 +09:00
Tadashi G. Takaoka
eab37ec2e5 Add HTC One special edition 
Bug: 9109493
Change-Id: I6eb060a93d7afbcc5aaa2aaece242044db255829
 2013-06-06 17:33:23 +09:00
Tadashi G. Takaoka
a0c3e02d71 Refactor SuggestionStripLayoutHelper a bit 
Bug: 9059710
Change-Id: Ief12029bad75d4dc78090ab97555aece01b873de
 2013-05-31 18:14:47 +09:00
Tadashi G. Takaoka
70c2dcffa3 am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev 
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e':
  Add vibration override values for Galaxy S4 and HTC One
 2013-05-30 23:49:07 -07:00
Tadashi G. Takaoka
6f7e39a682 am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev 
* commit 'e7514a6a8a9e59ea5cde9f2c3a198f35d111cdc2':
  Add vibration override values for Galaxy S4 and HTC One
 2013-05-30 23:47:01 -07:00
Tadashi G. Takaoka
4c75ea858a Check all regexp patterns in ResourceUtils.getDeviceOverrideValue 
This change also fixes a regexp error of Galaxy S III.

Change-Id: I42a4780bbfd2b083f4e27e61ec513aa875907344
 2013-05-28 19:05:40 +09:00
Tadashi G. Takaoka
02088f4497 Add vibration override values for Galaxy S4 and HTC One 
Bug: 9109493
 2013-05-23 17:03:42 -07:00
Tadashi G. Takaoka
46bf9f493c am 4e3a8afd: am 8b56ad78: Merge "Revise welcome screen video and still image" 
* commit '4e3a8afd173b23f8f73fd18d0b23a3cc8f3226b4':
  Revise welcome screen video and still image
 2013-05-15 12:59:17 -07:00
Ken Wakasa
acb37023b2 am 23bfac83: am d78c776b: Merge "Adjust sampling interval for gesture stroke drawing a bit." 
* commit '23bfac83c25f7635d539cdb85d923a03c44c0a8d':
  Adjust sampling interval for gesture stroke drawing a bit.
 2013-05-15 12:59:11 -07:00
Tadashi G. Takaoka
2d86b73ffe am 035c68a1: am b121538e: Tune maximum keypress duration to 100 milliseconds 
* commit '035c68a19a4966fe1a0f5c4d1cc7990e41455f79':
  Tune maximum keypress duration to 100 milliseconds
 2013-05-15 12:53:14 -07:00
Tadashi G. Takaoka
7e52c35dce am 94c54eca: am e8336aa8: Merge "Fix keypress vibration duration of HTC One X" 
* commit '94c54eca391b82cd174a5e80c19078ff62556b66':
  Fix keypress vibration duration of HTC One X
 2013-05-15 12:53:13 -07:00
Tadashi G. Takaoka
c731457f8a am f6b5484d: am b5f67e7f: Add device specific keypress vibration duration database 
* commit 'f6b5484dcb2d69fe6a21a62fda31ff523936b492':
  Add device specific keypress vibration duration database
 2013-05-15 12:53:10 -07:00
Tadashi G. Takaoka
aaf7d70be7 am 6f647842: am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue" 
* commit '6f6478422f8881e7692c99e3a3925266980099d0':
  Support multiple condition for getDeviceOverrideValue
 2013-05-15 12:53:03 -07:00
Ken Wakasa
8738eeaf65 am 01c133d7: am cb3bba3c: Rename GesturePreviewTrail.java -> GestureTrail.java 
* commit '01c133d72e5cbba33148ec478a3f1ab0c0c3ad5f':
  Rename GesturePreviewTrail.java -> GestureTrail.java
 2013-05-15 12:53:02 -07:00
Tadashi G. Takaoka
941e8bbaa9 am a01ab9ea: am 565ced45: Merge "Refactor StringUtils.findPrefixedString to findValueOfKey" 
* commit 'a01ab9ea3580d95e87f3357b2612fb84971b3bfd':
  Refactor StringUtils.findPrefixedString to findValueOfKey
 2013-05-15 12:52:55 -07:00
Tadashi G. Takaoka
bd2aca0b77 am c6143574: am 5b8b76ba: Merge "Move gesture preview trail parameters to resource" 
* commit 'c614357468c496db420c7b1d0a8a119f86620f8a':
  Move gesture preview trail parameters to resource
 2013-05-15 12:46:56 -07:00
Tadashi G. Takaoka
55b98d2549 am 7b6b30df: am 9d71a6c9: Remove unused device form factor values 
* commit '7b6b30dffcf027f50198f9588eaa4918b4e1cda2':
  Remove unused device form factor values
 2013-05-15 12:46:39 -07:00
Baligh Uddin
c363302eb7 Merge commit '3ac40c6a' into jb-mr2-dev-plus-aosp 
Conflicts:
	java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

Conflict resolved by matching code with jb-mr2-dev.
 2013-05-15 11:40:41 -07:00
Satoshi Kataoka
fa47814ca3 am f4d7c99c: am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary" 
* commit 'f4d7c99cda24fb5747843a47cd8a4423c315f685':
  Fix the title of the fragment of the personal dictionary
 2013-05-15 11:19:28 -07:00
Jean Chalard
926abffaaa am 42abed7f: am 9a98ef69: Merge "[ZF3] Add the option to block potentially offensive words" 
* commit '42abed7ff30b4ad4c04407a81db8de86244b1d80':
  [ZF3] Add the option to block potentially offensive words
 2013-05-15 11:05:06 -07:00
Jean Chalard
3160671bc1 am 330072b0: am c03aaa1b: Merge "[ZF2] Read settings for profanity filtering." 
* commit '330072b0146ffe148417d43ee0842c1238b6923d':
  [ZF2] Read settings for profanity filtering.
 2013-05-15 11:05:03 -07:00
Tadashi G. Takaoka
e681b52822 am 7a2fbbb3: am 4bb312c7: Merge "Add strings-appname.xml to AOSP Android Keyboard project" 
* commit '7a2fbbb3e6c807340be95807fbd70042466a5426':
  Add strings-appname.xml to AOSP Android Keyboard project
 2013-05-15 11:04:58 -07:00
Tadashi G. Takaoka
037be7fa0a am 3385fe8f: am 9fc82bdb: Merge "Remove graying animation of alt-code keys while typing" 
* commit '3385fe8ff58cf42f1c1abac85d6d2ba2aa62ff32':
  Remove graying animation of alt-code keys while typing
 2013-05-15 11:04:55 -07:00
Satoshi Kataoka
56ec8d6a02 am 36de7a5e: am 30f0f3a9: Merge "Implement a functionality to add an entry to the user dictionary" 
* commit '36de7a5ea32ef6738a2923581e0b14a00b8a6808':
  Implement a functionality to add an entry to the user dictionary
 2013-05-15 11:04:41 -07:00
Tadashi G. Takaoka
b713600a52 am fd4baafe: am 46913aed: Merge "Add next axction to setup wizard" 
* commit 'fd4baafe710dc0fe843c7672a6bd8bee4244fd73':
  Add next axction to setup wizard
 2013-05-15 10:58:58 -07:00
Tadashi G. Takaoka
dfa5d2d799 am 38df0ed2: am b40a8c06: Merge "Tune setup wizard layout for landscape and tablet" 
* commit '38df0ed22b232d77119c709ee0e7a863c7f756b6':
  Tune setup wizard layout for landscape and tablet
 2013-05-15 10:58:57 -07:00
Satoshi Kataoka
96d5e29166 am 6448f749: am b35aa487: Merge "Make aggressive threshold really aggressive" 
* commit '6448f749154a723b85d4309a37ad8fda2e1434e3':
  Make aggressive threshold really aggressive
 2013-05-15 10:58:55 -07:00
Tadashi G. Takaoka
b689e6615b am 9ff6a6bf: am 3ee39be1: Merge "Add setup wizard indicator size resource" 
* commit '9ff6a6bf739e250f2ad7e868c2be55567c23fb7b':
  Add setup wizard indicator size resource
 2013-05-15 10:58:50 -07:00
Tadashi G. Takaoka
230068e2cd am 5cd83c93: am 9a289c08: Merge "Use resources for dimensions of setup wizard" 
* commit '5cd83c9341c04c63de136b0e1e8b581e88704075':
  Use resources for dimensions of setup wizard
 2013-05-15 10:58:45 -07:00
Tadashi G. Takaoka
d66e4c4515 am 0bc46dca: am 4b7e0c5a: Merge "Remove wording "wizard" from setup application" 
* commit '0bc46dca2cea2b15e1647533f81ea0ea992a41b4':
  Remove wording "wizard" from setup application
 2013-05-15 10:58:41 -07:00
Tadashi G. Takaoka
85e8dca43e am dc079451: am 480284e2: Merge "Add edit personal dictionary settings menu" 
* commit 'dc079451fc5bb10548d0d78c8db5e060e9a2f000':
  Add edit personal dictionary settings menu
 2013-05-15 10:58:40 -07:00
Satoshi Kataoka
874c4fda36 am 434abe45: am 9b4e3db1: Legal notice 
* commit '434abe450c8fd65789b6f8b04d62ad98287115dd':
  Legal notice
 2013-05-15 10:53:02 -07:00
Tadashi G. Takaoka
962c245c00 am 6bbe6858: am 0f07935e: Centering setup wizard welcome video 
* commit '6bbe68589318a808c0eade6a62ffb0986a894ae0':
  Centering setup wizard welcome video
 2013-05-15 10:52:54 -07:00
Tadashi G. Takaoka
56c6c336b2 am ab11dbe8: am b8ff89c8: Remove translatable="false" from setup wizard strings 
* commit 'ab11dbe8f3fbc7b55b251d69e3846cab24811903':
  Remove translatable="false" from setup wizard strings
 2013-05-15 10:52:46 -07:00
Tadashi G. Takaoka
67f3a10225 am c35e0e6a: am 42afa82d: Support landscape orientation for setup wizard 
* commit 'c35e0e6a4b73f854fef07165c4f0bdd448f5bed5':
  Support landscape orientation for setup wizard
 2013-05-15 10:52:44 -07:00
Tadashi G. Takaoka
b2f8f66f28 am baa1e14d: am fcefabf9: Groundwork to implement landscape and welcome screen 
* commit 'baa1e14da10fd1ab31780f08ffeb4f186124fc41':
  Groundwork to implement landscape and welcome screen
 2013-05-15 10:52:41 -07:00
Tadashi G. Takaoka
680fa7ba77 am 82a7b185: am 16ec2e11: Merge "Add finish action to setup wizard" 
* commit '82a7b185bb8a14e610950548d36fae7a06030236':
  Add finish action to setup wizard
 2013-05-15 10:52:40 -07:00
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