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

7315 commits

Author SHA1 Message Date
Tadashi G. Takaoka
c9398a3b39 Merge "Fix PointerTrackerQueue.releaseAllPointerOlderThan" 2013-05-14 06:53:15 +00:00
Tadashi G. Takaoka
979fb7415b Fix PointerTrackerQueue.releaseAllPointerOlderThan 
Change-Id: If353869720895ee5355079c15c724132762dd70c
 2013-05-14 15:32:21 +09:00
Jean Chalard
cb0d1c4c58 Fix isSuggestionsStripVisible when keyboard hidden 
When the keyboard is hidden, the suggestion strip is
never visible.

Bug: 8954116
Change-Id: I9f242d07b49ad60b625a22429bb013251e814905
 2013-05-14 15:19:19 +09:00
Kurt Partridge
6fefc142cf Remove FeedbackLog instance variables. 
For a while, the ResearchLogger supported comprehensive recording of the
last few words in case the user wished to upload this data to give
developers feedback.  However, this mechanism was not implemented well
(keeping a separate copy of the data), did not make the collected data
clear to the user, and was not working properly in the latest build (NPEs).
The mechanism in fact was deprecated in favor of the "userRecording"
mechanism in which the user explicitly turned on comprehensive recording,
demonstrated the issue they were experiencing, and then turned it off.

This change removes the vestiges of the FeedbackLogging mechanism.
A feedback log is still used to hold the user's message, but it is created
in a local variable as-needed, and not persisted in ResearchLogger.

Change-Id: I6a09d0ed36e1eddb6e57895e7428d22107f75f49
 2013-05-13 20:37:15 -07:00
Kurt Partridge
b5c39f4531 Rename a var to match semantics 
The IS_INHIBITING_AUTO_UPLOAD flag is tested in isPossibleToUpload, so it inhibits all uploads, not
just automatic ones.  Renaming to IS_INHIBITING_UPLOAD.

Change-Id: Iceed79260d4b062147f40c09f0c5bb06b2519b1b
 2013-05-13 17:01:39 -07:00
Baligh Uddin
e69066d11b Import translations. DO NOT MERGE 
Change-Id: I9b70a81c1f507e5e9a2bfdcb179dea1cc03e0517
Auto-generated-cl: translation import
 2013-05-13 11:35:25 -07: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
e8336aa80c Merge "Fix keypress vibration duration of HTC One X" 2013-05-13 10:52:09 +00:00
Tadashi G. Takaoka
5f857a359a Merge "Disable functional key while in sliding input mode" 2013-05-13 10:50:32 +00: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
e3b1bdc4f1 Disable functional key while in sliding input mode 
This change registers the functional key when sliding input mode is
end at the functional key itself.

Bug: 8915171
Change-Id: I2031e2aa4ebf33684221fc44d4a808112489724f
 2013-05-13 19:39:57 +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
0efd8d1b69 Fix landscape override value expression 
This is a follow up of I275c99db8a.

Bug: 8556975
Change-Id: Ia6c2ab878760523da767036ce0bfc6c8350e1a92
 2013-05-13 18:19:20 +09:00
Tadashi G. Takaoka
6b0bcfba9b Merge "Disable long press timer while sliding input mode" 2013-05-13 08:57:56 +00:00
Tadashi G. Takaoka
43ad100d8b Disable long press timer while sliding input mode 
Bug: 8915171
Change-Id: Id8685f90766c7de55b56476de83abf97150a186d
 2013-05-13 17:40:26 +09:00
Tadashi G. Takaoka
ad662adeef Disable delete key repeating while in slide input mode 
Bug: 8915171
Change-Id: I04f84c29f10abc0207072d2165c75dd20f053f92
 2013-05-13 17:23:08 +09:00
Tadashi G. Takaoka
18184eacb1 Support regular expression for condition pattern 
Bug: 8556975
Change-Id: Iffc53d6a40dd77860434c5f7f4f59af5cd1ba92b
 2013-05-13 16:25:03 +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
Kurt Partridge
7d72ca0b20 Avoid JsonWriter multi-write error 
JsonWriter requires that its clients pass it only a single top-level object.
The existing implementation tries to make code cleaner by having mJsonWriter
never be null, and instead use a global static "NULL_JSON_WRITER" that just
discards data.  But because JsonWriter complains if more than one top-level
object is passed, making this a global object does not work.  This change
instead copes with mJsonWriter being null.

Change-Id: Ia37ccfc8646e91f11a64713dd92d2846eb86ac54
 2013-05-10 18:21:08 -07:00
Kurt Partridge
260df84197 Merge "Remove unused code" 2013-05-10 22:12:11 +00:00
Kurt Partridge
bb17034f64 Merge "Remove ref to LatinImeLogger preference." 2013-05-10 20:41:52 +00:00
Kurt Partridge
4135c2db7b Merge "Avoid NPE by fixing ResearchLogger initialization" 2013-05-10 15:48:04 +00:00
Tadashi G. Takaoka
565ced4546 Merge "Refactor StringUtils.findPrefixedString to findValueOfKey" 2013-05-10 09:49:07 +00: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
4705c0fa7c Fix screen flash when launching settings activity 
Bug: 8336068
Change-Id: I90a0f259129a3f3319b158b060154cc43960c234
 2013-05-10 15:36:24 +09:00
Tadashi G. Takaoka
2b5c9726f4 Introduce another activity to launch setup wizard 
Bug: 8336068
Change-Id: I35b94dd87c5b01d3e927da8f918a5398dd565d33
 2013-05-10 15:30:53 +09:00
Tadashi G. Takaoka
5ffa5bf3ba Merge "Keep SetupActivity alive to check re-launching from launcher" 2013-05-10 06:24:52 +00:00
Tadashi G. Takaoka
9ed322b40f Keep SetupActivity alive to check re-launching from launcher 
Bug: 8336068
Change-Id: I183b8e3fd1b3898d5f8dbbb13a0c93c64341fc38
 2013-05-10 15:15:53 +09:00
Jean Chalard
2564bd0937 Merge "Reuse old preferences if possible." 2013-05-10 05:56:32 +00:00
Jean Chalard
a2ec5e8338 Reuse old preferences if possible. 
This is an optimization. It also happens to work around what
seems to be a framework bug in JB MR1 / MR1.1.

Bug: 8771179
Change-Id: I62cc7acdc8656d75f8a50c068c4e9d8c6ceb74a0
 2013-05-10 14:41:36 +09:00
Satoshi Kataoka
ba35426f01 Merge "Tweak a label in the personal dictionary settings" 2013-05-10 03:27:51 +00:00
Tadashi G. Takaoka
2ad7023c54 Fix detecting out of keyboard area 
Bug: 8885165
Change-Id: I85c78b23955169972fb0f5395463b6fe47f12c9c
 2013-05-10 12:16:44 +09:00
Satoshi Kataoka
4c6a5c0428 Tweak a label in the personal dictionary settings 
Bug: 8897600
Change-Id: Ibf245e32468e5740ad9d65b8ff1f1e87b430d287
 2013-05-10 12:14:22 +09:00
Kurt Partridge
a68cace7d1 Avoid NPE by fixing ResearchLogger initialization 
Previously, mMainResearchLog and mMainLogBuffer were set up
when the user moved to a new TextView, and set to null when
the user left the TextView.  This change causes
mMainResearchLog, mMainLogBuffer, mFeedbackLog, and
mFeedbackLogBuffer to be non-null forever after init() is
called.  start() no longer sets up these fields; instead
they are cleared and reset every time stop() is called.
Checks for null values are now removed.

The earlier code just didn't initialize these variables if
the user disabled logging, but since the new version
invariantly keeps these variables valid, we add a check for
whether the user has enabled logging in publishLogUnits().

Change-Id: Ifde3517f1cf924cfa33cda95fec24529b52b3c08
 2013-05-09 18:38:32 -07:00
Kurt Partridge
011634163c Remove unused code 
Change-Id: I192c67e9e8de44f073abc70ec85ebcdb36356c2e
 2013-05-09 14:36:40 -07:00
Kurt Partridge
ef5d760ca4 Remove ref to LatinImeLogger preference. 
This is a bug; the ResearchLogger uses ResearchSettings.readResearchLoggerEnabledFlag() instead,
which the user cannot change.  (We assume they will just switch to a different keyboard.)

Change-Id: Ib5731c9eeb2bc29d9cf8608033326674f5eb6f7b
 2013-05-09 14:36:40 -07:00
Baligh Uddin
8dafc8e834 am 22e6a5c5: Import translations. DO NOT MERGE 
* commit '22e6a5c5b4c3fb486fd2605255081fc4b849f415':
  Import translations. DO NOT MERGE
 2013-05-09 08:52:51 -07:00
Baligh Uddin
42dc0c2562 Merge "Import translations. DO NOT MERGE" 2013-05-09 15:52:00 +00:00
Satoshi Kataoka
341f1b237b Tweak gesture debug 
Change-Id: Iea11a095adb15fbf4be38f34542119f8bc7bcbff
 2013-05-09 20:08:50 +09:00
Satoshi Kataoka
52cb409ac2 Don't resize debug array if production 
Bug: 8556775
Change-Id: I46a10f8dc938cab493933f0f2b4e1f7779b24f6f
 2013-05-09 19:22:24 +09:00
Satoshi Kataoka
b2c4c73064 Add debug facilities for gesture 
Bug: 8556775
Change-Id: I9069b2b44356bbae9fa4aaf0b99c3d723a8c9c58
 2013-05-09 19:19:11 +09:00
Satoshi Kataoka
b902109000 Fix usages of getEnabledInputMethodSubtypeList 
Bug: 8450279
Change-Id: Ib8433442ae6ca6c28da2652bff687cdeaf7c196e
 2013-05-09 17:07:19 +09:00
Tadashi G. Takaoka
499cea949d Use revised Google Keyboard icon 
Bug: 8159728
Change-Id: I458df60cb39f81cde3c08190af0ab08d304f9d98
 2013-05-09 11:50:39 +09:00
Tadashi G. Takaoka
3e37586316 Launch setup wizard as single top activity 
Bug: 8336068
Change-Id: Ifac84361e4e37b4aa106cbdbfffb83883ec2f8e6
 2013-05-09 11:17:00 +09:00
Baligh Uddin
2e4bde7398 Import translations. DO NOT MERGE 
Change-Id: I77a0aed9771ecc28a56226bb5f9776c1e1cf8b4d
Auto-generated-cl: translation import
 2013-05-08 13:18:34 -07:00
Baligh Uddin
22e6a5c5b4 Import translations. DO NOT MERGE 
Change-Id: I189a4ad23e69f0abe515dad7e3c909a28fcfbf0b
Auto-generated-cl: translation import
 2013-05-08 13:09:53 -07:00
Jean Chalard
71d52474fd Merge "Optimizations and safeguards." 2013-05-08 10:11:49 +00:00
Satoshi Kataoka
eab27c1ef6 Merge "Add account e-mail addresses to the user dictionary" 2013-05-08 09:53:54 +00:00
Jean Chalard
9f9cc03277 Optimizations and safeguards. 
- Don't call finishComposingText when useless.
- Add safeguards against calling setComposingRegion when the
  data returned by the editor is inconsistent.
- Cancel pending recorrection messages when new messages arrive.

Bug: 8842941
Bug: 8845001
Change-Id: I939701033cf5c2bbd85871ecf83e329021ddeb91
 2013-05-08 18:47:10 +09:00
Tadashi G. Takaoka
5b8b76baa3 Merge "Move gesture preview trail parameters to resource" 2013-05-08 09:02:52 +00:00
Satoshi Kataoka
5648054667 Add account e-mail addresses to the user dictionary 
Bug: 8683365
Change-Id: Id72540c515e61c3dd854892599645dd6d22b496d
 2013-05-08 17:58:21 +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
Satoshi Kataoka
faa94a2d0a Merge "Add owner's info to the dictionary" 2013-05-08 08:31:45 +00:00
Satoshi Kataoka
fc6d4a5412 Add owner's info to the dictionary 
Bug: 8683365
Change-Id: I1c30eac128b4172526423ebeeb45bc6cee7fb67b
 2013-05-08 17:29:04 +09:00
Satoshi Kataoka
6435c80087 Merge "Fix an issue on the transition between the setup and the settings" 2013-05-08 08:23:49 +00:00
Tadashi G. Takaoka
331d256f21 Fix an issue on the transition between the setup and the settings 
Bug: 8853220

Change-Id: I99b6c46d900e9391f77986d1ae6e3edeaeff01e5
 2013-05-08 15:18:45 +09:00
Satoshi Kataoka
f59c4f6840 Fix labels in the personal dictionary settings 
Bug: 8855738
Bug: 8853764
Change-Id: I03383bb5d6d72645f511cc6175dec747eb13a840
 2013-05-08 14:58:43 +09:00
Satoshi Kataoka
244a24e368 Consolidate dummy proximity info to the spell checker info 
Bug: 8783170

Change-Id: I067486e5ec1ae7cdef8e2121392464ba71ee8add
 2013-05-08 11:49:12 +09:00
Kurt Partridge
8064c669fe Fix looping logic bugs. 
shiftOut() is getting called once too often through these for loops.

Change-Id: I9a68b49e6cc1469bcddd673ab1567e238cf192b8
 2013-05-07 08:33:31 -07:00
Tadashi G. Takaoka
104bb70c65 Merge "Avoid drawing too long gesture preview trails" 2013-05-07 11:58:09 +00:00
Jean Chalard
2afe88b8d7 Merge "Unify space-adding on gestures." 2013-05-07 11:51:01 +00:00
Tadashi G. Takaoka
80e396d83c Avoid drawing too long gesture preview trails 
Bug: 7167303
Change-Id: I63c2e8fb60f76e80346b67fd44399fa91930f2f0
 2013-05-07 20:48:46 +09:00
Jean Chalard
e8b9b35471 Unify space-adding on gestures. 
This is much simpler, and more correct.

Bug: 8808497
Change-Id: I7a56bf9d6d9fb481f898b7a9f5898a86c11b34c0
 2013-05-07 20:38:09 +09:00
Satoshi Kataoka
a9dd74cf3f refactor spell checker 
Change-Id: Ie7bea23f2ac54f03572e77c31ba7cb3d5e8f8d2f
 2013-05-07 20:21:11 +09:00
Tadashi G. Takaoka
9d71a6c968 Remove unused device form factor values 
Change-Id: I1ed88b842a3d45e5460dd387bfad4276c844096a
 2013-05-07 18:52:22 +09:00
Tadashi G. Takaoka
84ac8f31fb Move empty listner to KeyboardActionListener.Adapter 
Change-Id: Ic7bad73c089de015746c667bbfb2c09bd429a9fc
 2013-05-07 16:40:15 +09:00
Tadashi G. Takaoka
61b6fc7d7b Clean up unused static variable 
Change-Id: I51c5903b7716d3927d2ff09a5054725215a626b5
 2013-05-07 16:36:32 +09:00
Tadashi G. Takaoka
ce67b41661 Record down point as gesture preview trail for sure 
Change-Id: Ic712a6af8229a9a1aa4a5419d779927f1ef8be67
 2013-05-07 15:51:23 +09:00
Tadashi G. Takaoka
4ddf1e47a7 Remove unused gesture preview trail code 
Change-Id: I2aa77675628a4b1655b30852c950f5daae6f0a92
 2013-05-07 14:27:34 +09:00
Baligh Uddin
71778d2551 am 34a0dc5a: Import translations. DO NOT MERGE 
* commit '34a0dc5abe47b28b7ef681b30aa5c94349b57e0d':
  Import translations. DO NOT MERGE
 2013-05-06 14:03:12 -07:00
Baligh Uddin
580d4e9950 Import translations. DO NOT MERGE 
Change-Id: I066a2af59e34e18a530af0f3977c4aecab350ef8
Auto-generated-cl: translation import
 2013-05-06 13:47:37 -07:00
Baligh Uddin
34a0dc5abe Import translations. DO NOT MERGE 
Change-Id: I2e89e3da74724731dc26f081c9d468200e90b31e
Auto-generated-cl: translation import
 2013-05-06 13:39:54 -07:00
Baligh Uddin
a8478986d4 am b55b15c3: Import translations. DO NOT MERGE 
* commit 'b55b15c3bd920842720dd97ffa33bb45f5e6e0cd':
  Import translations. DO NOT MERGE
 2013-05-06 11:11:37 -07:00
Baligh Uddin
dd8197bcb2 Import translations. DO NOT MERGE 
Change-Id: I838674303010d6bff9e3a6f747fd265d1c82baac
Auto-generated-cl: translation import
 2013-05-03 16:52:20 -07:00
Baligh Uddin
b55b15c3bd Import translations. DO NOT MERGE 
Change-Id: I5c8c885e2971d73ffa5a8ac45dd39dd836c935c8
Auto-generated-cl: translation import
 2013-05-03 16:44:22 -07:00
Tadashi G. Takaoka
a36266dd58 am a5be033d: Preserve setup wizard step while orientation change 
* commit 'a5be033d4a7a141615e7d784f9218a476a10e018':
  Preserve setup wizard step while orientation change
 2013-05-02 03:23:59 -07:00
Tadashi G. Takaoka
a5be033d4a Preserve setup wizard step while orientation change 
Bug: 8159728
Change-Id: I596f59749443b8878b5613285f0fe793d449cdbd
 2013-05-02 18:42:10 +09:00
Tadashi G. Takaoka
9bb189f613 am 7d19ab5c: Using int instead of booleans to save keyboard shift state 
* commit '7d19ab5c9d20cb71f9892a147a854809eb20ca49':
  Using int instead of booleans to save keyboard shift state
 2013-05-02 00:38:44 -07:00
Tadashi G. Takaoka
7d19ab5c9d Using int instead of booleans to save keyboard shift state 
This is a follow up of Ib2bc262aac.

Bug: 8734294
Change-Id: I0b56797ffc4f16e18da72352777fe0f000d173aa
 2013-05-02 16:21:39 +09:00
Tadashi G. Takaoka
3c1a18c6a6 am 7f8dd50b: Save automatic shift state while orientation changing 
* commit '7f8dd50b8fe38738e52511e1d0bf082172b8932d':
  Save automatic shift state while orientation changing
 2013-05-02 00:18:51 -07:00
Tadashi G. Takaoka
7f8dd50b8f Save automatic shift state while orientation changing 
Bug: 8734294
Change-Id: Ib2bc262aacedf786a318c2fe1bd4420a21e7d847
 2013-05-02 15:48:56 +09:00
Baligh Uddin
f9a4732e3b am f7e4057f: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'f7e4057f22c5226c0a11b0aec2e30c387ab9f285':
  Import translations. DO NOT MERGE
 2013-05-01 20:45:38 -07:00
Baligh Uddin
f7e4057f22 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-05-02 03:43:55 +00:00
Baligh Uddin
5c3c9ca6e6 Import translations. DO NOT MERGE 
Change-Id: Ie0357e3c5e84878d7ae8f57fcf02220fb22badda
Auto-generated-cl: translation import
 2013-05-01 20:43:38 -07:00
Satoshi Kataoka
e5daf6608a am 6845427e: DO NOT MERGE: Return possible suggestions in Google Spell Checker 
* commit '6845427e5d48fe48f837cd96a52c209be5f40357':
  DO NOT MERGE: Return possible suggestions in Google Spell Checker
 2013-05-01 18:37:23 -07:00
Baligh Uddin
3985e632ad Import translations. DO NOT MERGE 
Change-Id: I3f66d23846516560e3a1e316cf56dc7a17dfe9e2
Auto-generated-cl: translation import
 2013-05-01 14:35:47 -07:00
Baligh Uddin
cd6806d2d9 Import translations. DO NOT MERGE 
Change-Id: I840f5e7a7f140fbf5ccf27371077b2d8c86506c2
Auto-generated-cl: translation import
 2013-05-01 14:28:20 -07:00
Jean Chalard
d8e5527701 am 83757d43: Merge "Pass blockOffensiveWords as a parameter" 
* commit '83757d439ea15c5304a048868edb16d5ef7fd5cb':
  Pass blockOffensiveWords as a parameter
 2013-05-01 04:59:07 -07:00
Jean Chalard
83757d439e Merge "Pass blockOffensiveWords as a parameter" 2013-05-01 11:57:36 +00:00
Jean Chalard
2dbb5957e3 Pass blockOffensiveWords as a parameter 
Bug: 8773353
Change-Id: Ic1019742ce7ff6e4f7fff4d2729f8ab52d841488
 2013-05-01 20:47:35 +09:00
Ken Wakasa
56550ee5c3 am 1490b534: Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1 
* commit '1490b534162cc5f99e2a1ed93c63a1fa4045e5ca':
  Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
 2013-05-01 04:25:44 -07:00
Ken Wakasa
1490b53416 Cleanup -- follow up to Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1 
Change-Id: Icb89c5119a67edaa019d5f7645b734cfcfc29041
 2013-05-01 20:19:05 +09:00
Satoshi Kataoka
6845427e5d DO NOT MERGE: Return possible suggestions in Google Spell Checker 
Bug: 8772531

By the change in the suggestion algorithm, the pruning of the suggestions is not required anymore. This has been fixed in master branch properly.

Change-Id: I6ab9da953d69ff726d2bc328c09064e6ade0dcea
 2013-05-01 20:18:55 +09:00
Jean Chalard
3eee5cd24b am 53b37dc0: Merge "Fix a layout problem for pre-MR2" 
* commit '53b37dc098daf99151bf1b38d04bd202f8a3ba03':
  Fix a layout problem for pre-MR2
 2013-05-01 02:57:26 -07:00
Jean Chalard
53b37dc098 Merge "Fix a layout problem for pre-MR2" 2013-05-01 09:56:00 +00:00
Jean Chalard
b15e822234 Fix a layout problem for pre-MR2 
...where marginStart is not supported yet.

Change-Id: Id4f642333c17d091b1ab36549ca580f4572d3bf4
 2013-05-01 18:45:24 +09:00
Satoshi Kataoka
3ac40c6ae4 am 1641a4a4: Merge "Fix Google spell checker tests" 
* commit '1641a4a4576e73bbf0218178c885f448d669b472':
  Fix Google spell checker tests
 2013-05-01 02:33:29 -07:00
Satoshi Kataoka
1641a4a457 Merge "Fix Google spell checker tests" 2013-05-01 09:31:52 +00:00
Satoshi Kataoka
d5781eef62 Fix Google spell checker tests 
Bug: 8613307

Change-Id: Ief04a4abb6dc1f79660a2e419c9c5e271802b5a1
 2013-05-01 18:21:56 +09:00
Tadashi G. Takaoka
6191026ce4 am 0caf3f6a: Merge "Introduce MoreSuggestionsListener class" 
* commit '0caf3f6a04a706be6f69309b7d0869bf93accd56':
  Introduce MoreSuggestionsListener class
 2013-05-01 02:16:51 -07:00
Tadashi G. Takaoka
0caf3f6a04 Merge "Introduce MoreSuggestionsListener class" 2013-05-01 09:15:26 +00:00
Tadashi G. Takaoka
6f7905ae75 Introduce MoreSuggestionsListener class 
Bug: 8694255
Change-Id: I9420a7cb1983c6211f58d13b3b11db4347c3f99b
 2013-05-01 18:03:37 +09:00
Satoshi Kataoka
fcfa2cb24f am 6314b845: Merge "Add permissions for personalization" 
* commit '6314b845f4df3ae66caeef16dd1ac399116eac35':
  Add permissions for personalization
 2013-05-01 01:15:37 -07:00
Satoshi Kataoka
6314b845f4 Merge "Add permissions for personalization" 2013-05-01 08:13:40 +00:00
Satoshi Kataoka
492557e4f7 Add permissions for personalization 
Bug: 8683365

Change-Id: Ia74d730a6b778c0e647794efc8c3a810c715902c
 2013-05-01 17:10:20 +09:00
Tadashi G. Takaoka
f405dc87a8 am 17a35383: Merge "Override View.drawableStateChanged to detect state_pressed" 
* commit '17a353831ae81ba6155a87693289ca9afd7f89cb':
  Override View.drawableStateChanged to detect state_pressed
 2013-04-30 22:06:17 -07:00
Tadashi G. Takaoka
47a66b12ec Override View.drawableStateChanged to detect state_pressed 
Unlike on JB, View.setPressed(boolean) is never called when the view
is pressed on ICS. To detect a pressed state of the view, we need to
override View.drawableStateChanged() and check the drawable state
contains state_pressed.

Bug: 8159728
Change-Id: I481051364d6f3d1370742723c3ce19d898ea5463
 2013-05-01 14:02:18 +09:00
Tadashi G. Takaoka
3b8921646f am 7b2114a4: Display still image when device can\'t play welcome video 
* commit '7b2114a4283ccd90a937b14145c11125824cd1bd':
  Display still image when device can't play welcome video
 2013-04-30 20:38:07 -07:00
Tadashi G. Takaoka
7b2114a428 Display still image when device can't play welcome video 
Note that the still image in this change is a placeholder and must be
replaced by final asset.

Bug: 8159728
Change-Id: I4f5a28e0af711edacbc87c2ee64508f34f67f0da
 2013-05-01 12:24:36 +09:00
Jean Chalard
4aa48aedda am 019c3806: am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev 
* commit '019c38060d8479e26895f94e00fa53586ce28a70':
  Don't do recorrection when suggestions are off.
 2013-04-30 19:23:31 -07:00
Jean Chalard
019c38060d am ace3f3c5: am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev 
* commit 'ace3f3c5d56f5b4a58e8dc400fec1bb8c7b17a63':
  Don't do recorrection when suggestions are off.
 2013-04-30 19:22:13 -07:00
Jean Chalard
ace3f3c5d5 am 25c90e6d: Merge "Don\'t do recorrection when suggestions are off." into jb-mr2-dev 
* commit '25c90e6d51aeca5dce05b5adb691876b55a142d5':
  Don't do recorrection when suggestions are off.
 2013-04-30 19:19:04 -07:00
Jean Chalard
25c90e6d51 Merge "Don't do recorrection when suggestions are off." into jb-mr2-dev 2013-05-01 02:16:20 +00:00
Jean Chalard
aa3a96f3a1 Don't do recorrection when suggestions are off. 
Bug: 8767981
Change-Id: If5c775e488b91ae03ecce2673c99918ac8134928
 2013-05-01 10:17:28 +09:00
Baligh Uddin
b4251873b0 am e5ae0bd3: Import translations. DO NOT MERGE 
* commit 'e5ae0bd36aaaa3396ed09e23c7a19acab63eed7f':
  Import translations. DO NOT MERGE
 2013-04-30 16:42:49 -07:00
Baligh Uddin
8daffca047 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-04-30 16:53:14 +00:00
Ken Wakasa
761b5586a7 am a0b62ece: Merge "Cleanup an unused return value" 
* commit 'a0b62ece8383d8fae96287cc333e2165e29d21e0':
  Cleanup an unused return value
 2013-04-30 04:25:56 -07:00
Ken Wakasa
a0b62ece83 Merge "Cleanup an unused return value" 2013-04-30 11:16:28 +00:00
Baligh Uddin
8805c305c4 Import translations. DO NOT MERGE 
Change-Id: Ica24d3aa4d4e8ffbcc17f9b206f2683fcfc4daf5
Auto-generated-cl: translation import
 2013-04-30 03:57:08 -07:00
Baligh Uddin
e5ae0bd36a Import translations. DO NOT MERGE 
Change-Id: I90d5918cc37eaa6d3e19822e149a8a16b9d76744
Auto-generated-cl: translation import
 2013-04-30 03:55:36 -07:00
Tadashi G. Takaoka
f4a03ddcf8 am 1187ef9a: Merge "Catch error while playing welcome video" 
* commit '1187ef9a9747ff2ed71101156f3f560eaa32772c':
  Catch error while playing welcome video
 2013-04-30 02:33:52 -07:00
Tadashi G. Takaoka
1187ef9a97 Merge "Catch error while playing welcome video" 2013-04-30 09:31:20 +00:00
Jean Chalard
d618419d16 am 37bbaea8: Merge "[PB14] Cosmetic fixes to the progress bar" 
* commit '37bbaea8a15038406214fa8c9098cfcf4b2e2d9b':
  [PB14] Cosmetic fixes to the progress bar
 2013-04-30 02:22:20 -07:00
Jean Chalard
37bbaea8a1 Merge "[PB14] Cosmetic fixes to the progress bar" 2013-04-30 09:20:41 +00:00
Tadashi G. Takaoka
ad46c9e0e0 Catch error while playing welcome video 
Bug: 8159728
Change-Id: Ic8eea7993f12395d6eca6db8d5529803251a9fee
 2013-04-30 18:18:32 +09:00
Jean Chalard
7eff677c29 [PB14] Cosmetic fixes to the progress bar 
Bug: 7600384
Change-Id: I33ea155c0c97c7ead07686c4d2a9e0d98be9929c
 2013-04-30 17:54:09 +09:00
Ken Wakasa
0d6c87d113 Cleanup an unused return value 
Change-Id: I974964aa3cc24b5480e57bd38c197fe7a49acaa4
 2013-04-30 16:53:18 +09:00
Satoshi Kataoka
f4d7c99cda am 71c1e50f: Merge "Fix the title of the fragment of the personal dictionary" 
* commit '71c1e50fdb47c78b3180cc6b04d4cababe3f3fe2':
  Fix the title of the fragment of the personal dictionary
 2013-04-30 00:13:02 -07:00
Satoshi Kataoka
71c1e50fdb Merge "Fix the title of the fragment of the personal dictionary" 2013-04-30 07:11:13 +00:00
Jean Chalard
69e1e45c01 am 01170ffe: [PB13] Actually update the progress bar 
* commit '01170ffebeb4a604667abb84310ed4e910f97bf7':
  [PB13] Actually update the progress bar
 2013-04-30 00:09:52 -07:00
Jean Chalard
01170ffebe [PB13] Actually update the progress bar 
Bug: 7600384
Change-Id: Iaa8f3a59243a15d2a01aaf6017ed85c52b6482a6
 2013-04-30 15:48:26 +09:00
Tadashi G. Takaoka
3bcc75456f am 965329c1: Fix missing string reference of spellchecker.xml 
* commit '965329c192ee385c83ccf9b054063f9a68cca34b':
  Fix missing string reference of spellchecker.xml
 2013-04-29 23:35:50 -07:00
Tadashi G. Takaoka
965329c192 Fix missing string reference of spellchecker.xml 
This is a followup of I8dea5393ad.

Change-Id: I311c50cf8205298f20694e068bb9a4b661df8a8b
 2013-04-30 15:31:58 +09:00
Jean Chalard
27c9166272 am 5f2efe0f: Merge "[PB12] Implement the progress bar update lifecycle" 
* commit '5f2efe0f911f4f547765d260f76412717d232599':
  [PB12] Implement the progress bar update lifecycle
 2013-04-29 23:03:47 -07: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
d282ebfb71 [PB12] Implement the progress bar update lifecycle 
This ensures the thread does not run uselessly (it is even terminated when
the progress bar exits the screen).

Bug: 7600384
Change-Id: I09117a6f763b574b9b3266f36ba3da4720dc9224
 2013-04-30 14:55:10 +09:00
Jeff Sharkey
238748d57c am 7a800e79: Merge "Avoid leaking AssetFileDescriptor." 
* commit '7a800e7982ff607aa339f44742de935033f38cfe':
  Avoid leaking AssetFileDescriptor.
 2013-04-29 22:33:22 -07:00
Jeff Sharkey
7a800e7982 Merge "Avoid leaking AssetFileDescriptor." 2013-04-30 01:11:02 +00:00
Jeff Sharkey
c5ebc792d6 Avoid leaking AssetFileDescriptor. 
Change-Id: Iac388c8aefc684980cb4c7131fb47319f6073eb3
 2013-04-29 12:26:44 -07:00
Baligh Uddin
ed9ef5a778 am af77854a: am 31a70de6: Import translations. DO NOT MERGE 
* commit 'af77854afce13fa54826cbe2c55745030621cb5a':
  Import translations. DO NOT MERGE
 2013-04-29 11:22:26 -07:00
Baligh Uddin
88a78cd0c6 Revert "Import translations. DO NOT MERGE" 
This reverts commit c641478352

Change-Id: Ibfdb00914e74239ed18982f7e264392e27ebccc4
 2013-04-27 02:50:44 +00:00
Baligh Uddin
af77854afc am 31a70de6: Import translations. DO NOT MERGE 
* commit '31a70de6d22c9fd763d0e6dcc46e24be33838066':
  Import translations. DO NOT MERGE
 2013-04-26 16:43:47 -07:00
Baligh Uddin
c641478352 Import translations. DO NOT MERGE 
Change-Id: If02e4938fef4c4b30e61ae967aed197873b2dc61
Auto-generated-cl: translation import
 2013-04-26 13:44:20 -07:00
Baligh Uddin
96b284afe1 Import translations. DO NOT MERGE 
Change-Id: I65a16c04a3e63881180231d8c04c6cea847269d3
Auto-generated-cl: translation import
 2013-04-26 13:39:42 -07:00
Baligh Uddin
31a70de6d2 Import translations. DO NOT MERGE 
Change-Id: Id6eb0824603681ad04462fc08c0dcf071efa1d72
Auto-generated-cl: translation import
 2013-04-26 13:38:16 -07:00
Jean Chalard
fc26033c37 [PB11] Add a skeleton class for a self-updating progress bar 
Bug: 7600384
Change-Id: I55b51152dd9968a359af091bf309f0d406f63ec4
 2013-04-26 20:51:42 +09:00
Jean Chalard
ab0c66b9d1 [PB10] Add a progress bar to display file download progress 
The progress bar is showing but doesn't show progress yet.

Bug: 7600384
Change-Id: I80debd3f4368e82e4184a6c638bdcc8e48ed2305
 2013-04-26 20:34:56 +09:00
Jean Chalard
ae577ac1db Merge "Update dictionaries" 2013-04-26 11:28:08 +00:00
Jean Chalard
d57a7748c1 Update dictionaries 
>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366957492 <=> 1366974711
Body :
Added: ложись 100
Added: под 100
Added: посмотрю 100
Added: угу 100
Added: ух 100

>>> java/res/raw/main_ru.dict
Header :
  date : 1366957492 <=> 1366974711
Body :
Added: ложись 100
Added: под 100
Added: посмотрю 100
Added: угу 100
Added: ух 100

Change-Id: Ida39ea2cf25cd291554f3b2f3ce31f57dca24113
 2013-04-26 20:15:14 +09:00
Jean Chalard
739406bf46 Merge "[PB9] Make buttons that animate-out unclickable" 2013-04-26 10:29:43 +00:00
Jean Chalard
d4fc13d261 [PB9] Make buttons that animate-out unclickable 
Clicking on a button that is animating-out is only done by
mistake. Better make them unclickable.
Also, interrupt an out-in animation if it has been preempted.

Bug: 7600384
Change-Id: Ic4700cda46a894ea580bc67ee7bef885ecf1d3bc
 2013-04-26 19:06:29 +09:00
Tadashi G. Takaoka
be06bce18b Merge "Get rid of janky black box before the movie starts" 2013-04-26 09:38:54 +00:00
Tadashi G. Takaoka
d477755287 Merge "Fix graying animation of alt-code keys when space/enter is typed" 2013-04-26 09:33:07 +00:00
Tadashi G. Takaoka
732c93815a Get rid of janky black box before the movie starts 
Bug: 8159728
Change-Id: I1d0a01a05b3b694d21fdfdc246d1329ab829908d
 2013-04-26 18:26:12 +09:00
Jean Chalard
e8ed5d8876 Delete obsolete dictionaries 
Bug: 7980985
Change-Id: I4c9165e6102cb12fa1249074297e94013439ea3b
 2013-04-26 17:31:55 +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
Jean Chalard
1ff8b1ce3a Merge "Update dictionaries" 2013-04-26 07:50:07 +00:00
Tadashi G. Takaoka
5141f04ef3 Fix graying animation of alt-code keys when space/enter is typed 
Change-Id: Iac508f37afa916ca52c62c2369cb7ff91bde0a64
 2013-04-26 16:14:18 +09:00
Jean Chalard
7ec72b80ed Update dictionaries 
Full diff too long: truncated

Summary diff
>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366277083 <=> 1366957492
  version : 31 <=> 32
Contents :
  - Reinstate 2- and 3- letter words that were demoted to avoid
    bad space insertion (343 entries)
  - Add missing words as per b/6341908 and b/5674314
    (98 entries)

This has zero effect on the regression tests

Bug: 6341908
Bug: 5674314
Change-Id: Ifce268a7eab5edd264d963489187e975017f8b72
 2013-04-26 15:56:54 +09:00
Satoshi Kataoka
adbafa1a9b Merge "Support ICS on the user dictionary settings" 2013-04-26 06:50:42 +00:00
Satoshi Kataoka
dcef94165b Support ICS on the user dictionary settings 
Bug: 8600958
Change-Id: I50e9228afc7b04147eb7c4734d3145abe8859a30
 2013-04-26 15:48:08 +09: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
dca46b5015 Merge "Keep task stack when invoking settings from setup wizard" 2013-04-26 06:45:52 +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
Tadashi G. Takaoka
82e476b188 Keep task stack when invoking settings from setup wizard 
Bug: 8336068
Change-Id: If1df32595f72285b2dad16e28b4429b7b6059839
 2013-04-26 13:03:37 +09:00
Jean Chalard
df3ca0420b Fix deleting a dictionary 
When the user presses the "delete" button in the Add-on dictionary
interface, we send an empty dictionary to Latin IME as a dummy for
it to use instead of the pre-installed one.
The old "empty" placeholder was rejected by initial verification.
This one is still empty, but passes the check.

Bug: 7980985
Change-Id: I751bbf67d8078dd5fbdce1dd2f0db72a8207816d
 2013-04-25 22:39:22 +09:00
Jean Chalard
1919072cfc Merge "[ZF1] Check profanity in Java rather than in native" 2013-04-25 11:33:05 +00: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
Jean Chalard
99e998286d [ZF1] Check profanity in Java rather than in native 
Bug: 7226877
Change-Id: Ib6c32bfee9977c27dbf7e1e590b2b00d9ceb7301
 2013-04-25 20:29:11 +09:00
Jean Chalard
fb34869f5a Merge "[PB8] Add an animation upon status change." 2013-04-25 11:04:58 +00:00
Tadashi G. Takaoka
b1b03cfc2b Merge "Fix missing initialization of PreviewPlacerView" 2013-04-25 10:00:34 +00:00
Jean Chalard
43590149a5 Work around a bug in older DownloadManager versions. 
This adds a number to the extension.

Note that for DownloadManager to keep this, the server
needs to send it a mime type it does not recognize. Right
now, it does not recognize application/json so it's okay,
but we'd do well to remove the content/type header from
the server to prevent problems.

Bug: 8467516
Change-Id: Ic484f66ac3f67c36f59f2c0bcb8c7fdeb6e8590d
 2013-04-25 18:52:39 +09:00
Jean Chalard
4dc77dcf4c Merge "[PB7] Export animation code out of the preference" 2013-04-25 09:49:12 +00:00
Jean Chalard
513c63e877 [PB8] Add an animation upon status change. 
Bug: 7600384
Change-Id: If5efb9357075193d10255187008e870e2933bdb8
 2013-04-25 18:37:03 +09:00
Jean Chalard
2d72590ced [PB7] Export animation code out of the preference 
Bug: 7600384
Change-Id: I8009b31d96646acd667db410b94e969daea91d52
 2013-04-25 18:37:01 +09:00
Tadashi G. Takaoka
1b6eea8903 Fix missing initialization of PreviewPlacerView 
Bug: 8716050
Change-Id: I234f1134274b9f72c8abbd729783f9ffe8f20f64
 2013-04-25 18:26:24 +09:00
Jean Chalard
a995bf4031 Put temp files within app files 
Bug: 8715614
Change-Id: I307d83923070994525cf0d27aad403e881a89314
 2013-04-25 18:14:40 +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
Jean Chalard
2cf450f482 [PB6] Encapsulate the buttons into a view 
Handling buttons directly in the preference causes large
problems of code readability and interface.  It's better to
have a class to manage the buttons and their animations
separately. This is feature-equivalent, and mostly
delegates stuff for now.

Bug: 7600384
Change-Id: Ia8da0ec68ffac84fc1d65e1760539a87a73fa776
 2013-04-25 12:25:25 +09:00
Jean Chalard
e91387e281 Merge "[PB5] Store state in a more convenient manner" 2013-04-25 02:44:47 +00:00
Baligh Uddin
8f4cad6f85 am 78e92b5c: Import translations. DO NOT MERGE 
* commit '78e92b5cd94f2fa582b43190002ac6e51a163032':
  Import translations. DO NOT MERGE
 2013-04-24 14:28:50 -07:00
Baligh Uddin
348e062a63 Import translations. DO NOT MERGE 
Change-Id: Iefa9cf774c772bc113d481199a0a9c564a0aba27
Auto-generated-cl: translation import
 2013-04-24 13:22:43 -07:00
Baligh Uddin
78e92b5cd9 Import translations. DO NOT MERGE 
Change-Id: Ic979ab299132925396513d01ece53a6dc02cfa80
Auto-generated-cl: translation import
 2013-04-24 13:17:41 -07:00
Jean Chalard
cadea5d2fc [PB5] Store state in a more convenient manner 
This is more readable and will help with animations going forward.

Bug: 7600384
Change-Id: I255598d860d1e451fef106b00da63c282fe95f95
 2013-04-24 22:49:50 +09:00
Jean Chalard
e91c001da9 Merge "[PB4] Make a memory non-static" 2013-04-24 11:51:10 +00:00
Jean Chalard
80790d78f6 Merge "[PB3] Simplify storage" 2013-04-24 11:49:43 +00:00
Jean Chalard
776edcfe46 Merge "[PB2] Small bugfix" 2013-04-24 11:49:33 +00:00
Jean Chalard
c017f18a59 [PB4] Make a memory non-static 
The life span of this object is actually the life span of the interface.
It should not be static.
Also, we'll have a few other things to store in there soon.

Bug: 7600384
Change-Id: I708019e9ee53653e83a1e52c8e76326c3e39bcf3
 2013-04-24 20:46:28 +09:00
Jean Chalard
43e8639e4e [PB3] Simplify storage 
By looping through children, there is no need to remember the
last index.

Bug: 7600384
Change-Id: I8b42b0aa38874ee494c6c4ecc09194a1d3c16922
 2013-04-24 20:46:26 +09:00
Jean Chalard
d98f406dd3 [PB2] Small bugfix 
The button would not display after it got hidden once.

Bug: 7600384
Change-Id: I57f9f1191be3b8fff55dde7a2781dbef68a2df62
 2013-04-24 20:45:53 +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
b35aa487fd Merge "Make aggressive threshold really aggressive" 2013-04-24 09:14:30 +00: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
0e96003e0f Merge "Refactor SetupStepGroup" 2013-04-24 05:53:33 +00:00
Tadashi G. Takaoka
e918bf07a0 Refactor SetupStepGroup 
Bug: 8159728
Change-Id: I1ab846d0910aacbd2f979289d72bafea8a8e0378
 2013-04-24 14:15:59 +09:00
Tadashi G. Takaoka
3ee39be1bd Merge "Add setup wizard indicator size resource" 2013-04-24 04:01:04 +00: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
Jean Chalard
197a2d32e1 Merge "[PB1] Cleanup" 2013-04-24 02:17:23 +00: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
Jean Chalard
41f505dc3e [PB1] Cleanup 
This preference is not a DialogPreference any more, as it doesn't
ever display a Dialog.

Bug: 7600384
Change-Id: Ia5965617c83d3cb964010f9b40d833065dccef60
 2013-04-23 20:41:41 +09:00
Baligh Uddin
6b87e270f7 am fc036454: Import translations. DO NOT MERGE 
* commit 'fc0364548979c2f881ce2fa0629205b8378a3a28':
  Import translations. DO NOT MERGE
 2013-04-23 03:51:31 -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
Jean Chalard
c3f4783649 Add an additional ID to the client info. 
Bug: 8651863
Change-Id: I748f35726d72ede926d5b06ed87ff029317f1ac3
 2013-04-23 14:37:15 +09:00
Baligh Uddin
f595a0626d Import translations. DO NOT MERGE 
Change-Id: Ib14aef97ea78806e1560fbd3d3e1f40f01bf8c0a
Auto-generated-cl: translation import
 2013-04-22 14:13:10 -07:00
Baligh Uddin
fc03645489 Import translations. DO NOT MERGE 
Change-Id: I58c4fff8e92f66f7e85446d6fd05e61e3f081aca
Auto-generated-cl: translation import
 2013-04-22 14:07:22 -07:00
Satoshi Kataoka
434abe450c am 9b4e3db1: Legal notice 
* commit '9b4e3db1afb9cfb089aa81e87075cdc8e2740a87':
  Legal notice
 2013-04-22 07:26:11 -07: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
34b0087038 am 1a9bf159: Merge "Don\'t triger onPress and startLongPressTimer when gesture is canceled" 
* commit '1a9bf159a49c975b9e8da1c691676d6d23b01a3b':
  Don't triger onPress and startLongPressTimer when gesture is canceled
 2013-04-22 03:55:33 -07:00
Tadashi G. Takaoka
1a9bf159a4 Merge "Don't triger onPress and startLongPressTimer when gesture is canceled" 2013-04-22 10:53:39 +00:00
Tadashi G. Takaoka
80a98ee5c2 am 508ab248: Merge "Implement IMM.switchToNextInputMethod() for ICS" 
* commit '508ab248758c167400c2a868d6d6a2e24ddb717b':
  Implement IMM.switchToNextInputMethod() for ICS
 2013-04-22 03:38:42 -07:00
Tadashi G. Takaoka
508ab24875 Merge "Implement IMM.switchToNextInputMethod() for ICS" 2013-04-22 10:37:11 +00:00
Tadashi G. Takaoka
13d5da8b88 Don't triger onPress and startLongPressTimer when gesture is canceled 
Bug: 8650846
Change-Id: Ice5ef07d6833422906b0b756206e097f75d1f2db
 2013-04-22 19:36:08 +09:00
Tadashi G. Takaoka
85629debaa Implement IMM.switchToNextInputMethod() for ICS 
Bug: 8633367
Change-Id: Ifc0f97b1fdf5e5cc3601c24a503058c4822478dc
 2013-04-22 19:30:56 +09:00
Jean Chalard
72e8d94288 am 6d25be9a: Merge "Don\'t kill suggestions with native score < 1" 
* commit '6d25be9ac5e30c956fb7ee3ad43fc67ccbfcb92b':
  Don't kill suggestions with native score < 1
 2013-04-22 01:14:58 -07:00
Jean Chalard
6d25be9ac5 Merge "Don't kill suggestions with native score < 1" 2013-04-22 08:13:13 +00:00
Tadashi G. Takaoka
6bbe685893 am 0f07935e: Centering setup wizard welcome video 
* commit '0f07935e5165b33d512d7d594e5fec7a2f210013':
  Centering setup wizard welcome video
 2013-04-22 00:31:24 -07:00
Jean Chalard
f0e579a171 Don't kill suggestions with native score < 1 
Change-Id: I954856b7fec0b91e19a467f2a87978d49caa639d
 2013-04-22 14:21:43 +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
727975009f am 2a9b5447: am a56c7020: am d4ab58a0: Add translatable="false" for appropriate entries 
* commit '2a9b5447fa87daa70c45ecf0f038271ed7a92813':
  Add translatable="false" for appropriate entries
 2013-04-19 10:13:47 -07: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
Kurt Partridge
bd99e8dc24 am 41b34cf2: Merge "Allow LogUnits to hold >1 word" 
* commit '41b34cf2aeca063d99e47b6da2a9dab68fba0608':
  Allow LogUnits to hold >1 word
 2013-04-19 09:07:11 -07:00
Kurt Partridge
41b34cf2ae Merge "Allow LogUnits to hold >1 word" 2013-04-19 16:04:13 +00:00
Kurt Partridge
e92b5e145f Allow LogUnits to hold >1 word 
LogUnits have been annotated with the autocorrected words, but
until now this was assumed to be a single word without spaces.
But spaceless typing can result in spaces in the LogUnit label.  With this
change, the LogUnit inspects the autocorrected text to determine how many
words were inserted, and counts them accurately.

This change corrects a privacy problem, which was that if the word sampling
algorithm chose a LogUnit that actually contained multiple words, then more
than two successive words would be included in the log.

Change-Id: I7c01c3dd3ac33d7e96c00836256bae9c14b124ed
 2013-04-19 08:55:39 -07:00
Jean Chalard
6f6974e6e9 am 825da76c: Redisplay a hidden button after it entered the screen again. 
* commit '825da76c72d420e8c43c7334cf273ba9e5da59fe':
  Redisplay a hidden button after it entered the screen again.
 2013-04-19 07:06:36 -07:00
Jean Chalard
6dc9933d83 am f8014eea: Hide the correct button when pressing a new button. 
* commit 'f8014eea341040f8d155e071e4e0c915a7ebd61d':
  Hide the correct button when pressing a new button.
 2013-04-19 06:56:11 -07:00
Jean Chalard
825da76c72 Redisplay a hidden button after it entered the screen again. 
Bug: 7600384
Change-Id: I6cd18fd7584b6e98260cb432956f08ba9886580b
 2013-04-19 22:50:48 +09:00
Jean Chalard
f8014eea34 Hide the correct button when pressing a new button. 
Bug: 7600384
Change-Id: Ic5dbbbbcf19d778dde1316ebb417f1a8ede2d25d
 2013-04-19 22:50:45 +09:00
Tadashi G. Takaoka
ab11dbe8f3 am b8ff89c8: Remove translatable="false" from setup wizard strings 
* commit 'b8ff89c809dabc46df9ee683c6064f67ee432213':
  Remove translatable="false" from setup wizard strings
 2013-04-19 05:11:30 -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
c35e0e6a4b am 42afa82d: Support landscape orientation for setup wizard 
* commit '42afa82d54f10d7faf8c4ba50516dd450606f98b':
  Support landscape orientation for setup wizard
 2013-04-19 04:55:55 -07:00
Tadashi G. Takaoka
b3663df582 am 68e4de1e: Add welcome screen to setup wizard 
* commit '68e4de1e78c62802fb18be120d58646ca35fe320':
  Add welcome screen to setup wizard
 2013-04-19 04:55:53 -07: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
68e4de1e78 Add welcome screen to setup wizard 
This is a preliminary implementation because the welcome screen video
is just a placeholder.

Bug: 8159728
Change-Id: I6a2459a266babec2f078fc393b18c77b0b7992a8
 2013-04-19 20:49:49 +09:00
Tadashi G. Takaoka
baa1e14da1 am fcefabf9: Groundwork to implement landscape and welcome screen 
* commit 'fcefabf9abafc867ae858160169bb1cd19981e07':
  Groundwork to implement landscape and welcome screen
 2013-04-19 04:24:48 -07: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
82a7b185bb am 16ec2e11: Merge "Add finish action to setup wizard" 
* commit '16ec2e1155a0152c6ded42bc8941b90b7cd08d35':
  Add finish action to setup wizard
 2013-04-19 04:01:19 -07:00
Tadashi G. Takaoka
16ec2e1155 Merge "Add finish action to setup wizard" 2013-04-19 10:58:55 +00: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
Jean Chalard
1a835efc22 am ff078041: am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev 
* commit 'ff078041e7829e1a0d4537c395dad0cf9c4d7f51':
  Fix an NPE in recorrection
 2013-04-19 00:13:08 -07:00
Jean Chalard
ff078041e7 am f1dde6a1: am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev 
* commit 'f1dde6a1bf659d182db5a2645515cc1efe74459c':
  Fix an NPE in recorrection
 2013-04-19 00:10:22 -07:00
Jean Chalard
b7abaafec0 am e5cbdfe1: am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev 
* commit 'e5cbdfe1b83032c6ea212dd95c3968c522baa1d1':
  Fix an NPE in recapitalize
 2013-04-19 00:08:56 -07:00
Jean Chalard
f1dde6a1bf am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev 
* commit '758c74fe82683aef08d93a935433c027a7bc21a7':
  Fix an NPE in recorrection
 2013-04-19 00:07:37 -07:00
Jean Chalard
e5cbdfe1b8 am 3629605b: am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev 
* commit '3629605b7c14b5eea498ef9588f4fef788ef454c':
  Fix an NPE in recapitalize
 2013-04-19 00:06:58 -07:00
Jean Chalard
3629605b7c am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev 
* commit '77226ed006ba32228cd5db19031e04d13d87b27e':
  Fix an NPE in recapitalize
 2013-04-19 00:04:13 -07:00
Jean Chalard
758c74fe82 Merge "Fix an NPE in recorrection" into jb-mr2-dev 2013-04-19 07:03:19 +00:00
Jean Chalard
77226ed006 Merge "Fix an NPE in recapitalize" into jb-mr2-dev 2013-04-19 07:01:10 +00:00
Jean Chalard
ae7d1530b4 Fix an NPE in recorrection 
Also, theoretically, we don't want to retrieve older suggestions if
there are no results for a recorrection - that would look random.
This bug addresses this too.

Bug: 8657919
Change-Id: I44f36d34a708a968ab71fa0592da57f4c97d4b7f
 2013-04-19 15:53:33 +09:00
Jean Chalard
3bdf341ea0 Fix an NPE in recapitalize 
Bug: 8657736
Change-Id: I459d1c200826c1c394f8207475ecf60a4f356793
 2013-04-19 15:44:20 +09:00
Tadashi G. Takaoka
fc2ca29d71 am f10046bd: Remove ScrollView from setup wizard 
* commit 'f10046bddc78c939c53236fb94ebaf413d108b11':
  Remove ScrollView from setup wizard
 2013-04-18 22:51:15 -07:00
Tadashi G. Takaoka
ed0d1156f7 am 30f102e2: Move some attributes of setup wizard layouts to style files 
* commit '30f102e297d4e4afc28b3aad688fe72e814452e7':
  Move some attributes of setup wizard layouts to style files
 2013-04-18 20:49:01 -07:00
Tadashi G. Takaoka
f10046bddc Remove ScrollView from setup wizard 
Change-Id: I85f089301d1be8ed789a20049d21e2c371cad1c5
 2013-04-19 12:45:47 +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
ae19f170ba am 1f6e06cf: Merge "Make setup wizard step number highlighted when activated" 
* commit '1f6e06cf9244cdd8803ee653f948e169c190b067':
  Make setup wizard step number highlighted when activated
 2013-04-18 20:24:11 -07:00
Tadashi G. Takaoka
1f6e06cf92 Merge "Make setup wizard step number highlighted when activated" 2013-04-19 03:21:04 +00:00
Tadashi G. Takaoka
7158438a64 am 88ee052c: Merge "Update strings of setup wizard" 
* commit '88ee052c10a08bc48f40074583b64e5ebc43fdee':
  Update strings of setup wizard
 2013-04-18 20:18:54 -07:00
Tadashi G. Takaoka
88ee052c10 Merge "Update strings of setup wizard" 2013-04-19 03:16:46 +00: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
b84c0468e4 Make setup wizard step number highlighted when activated 
Bug: 8159728
Change-Id: I62ccbebaae0a0c4a93ad7c155fc3020a7f357f3c
 2013-04-19 11:14:21 +09:00
Baligh Uddin
04211b9112 am dcc59297: am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit 'dcc59297ac97c2ae7791ab09c535927c93c607fb':
  Import translations. DO NOT MERGE
 2013-04-18 09:46:34 -07:00
Baligh Uddin
dcc59297ac am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1844bec2024859f1c8dbc331893a74d5af9152d8':
  Import translations. DO NOT MERGE
 2013-04-18 09:42:23 -07:00
Baligh Uddin
3f4d2105db Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-04-18 16:39:51 +00:00
Baligh Uddin
1844bec202 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:39:35 +00:00
Ken Wakasa
4f1a832dd0 am f02e2693: am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev 
* commit 'f02e2693120f84b7d08f059dd9b30eacf838e405':
  Fix an infinite loop
 2013-04-18 09:34:55 -07:00
Ken Wakasa
f02e269312 am 55b306c9: am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev 
* commit '55b306c9e0ea29a10dfd79d5478344fcc98ca184':
  Fix an infinite loop
 2013-04-18 09:32:04 -07:00
Jean Chalard
936fc9abe5 am 3a18ae70: am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView 
* commit '3a18ae70ccdce702478bcb7c7d238373b460b014':
  Initialize dictionaries at onStartInputView
 2013-04-18 09:29:41 -07:00
Ken Wakasa
55b306c9e0 am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev 
* commit '64eda4f4fa30fc60daeb5a8af462e688d4573700':
  Fix an infinite loop
 2013-04-18 09:28:10 -07:00
Jean Chalard
3a18ae70cc am a5d2da82: am d91268ad: Initialize dictionaries at onStartInputView 
* commit 'a5d2da82a6a4486a4ef74e51ddd1c875f4c2d935':
  Initialize dictionaries at onStartInputView
 2013-04-18 09:27:35 -07:00
Jean Chalard
a5d2da82a6 am d91268ad: Initialize dictionaries at onStartInputView 
* commit 'd91268ad9fb69b4733044b4e466e1d33f6c4725f':
  Initialize dictionaries at onStartInputView
 2013-04-18 09:24:45 -07:00
Ken Wakasa
64eda4f4fa Merge "Fix an infinite loop" into jb-mr2-dev 2013-04-18 16:24:01 +00:00
Jean Chalard
77e26e1c29 Fix an infinite loop 
What do you mean "Can't happen"?
It happens all the time - the empty string is the default ID, and it
needs to be updated like everyone else.

Bug: 8651858
Change-Id: I5a2f2ebb5b2ef08b27f26be8fb2c3d2f231ebcfc
 2013-04-18 23:14:13 +09:00
Jean Chalard
0e64fbbcac am 9cf46864: Update dictionaries 
* commit '9cf468646fe3c0ce1ed1b360068dc128f7d9518b':
  Update dictionaries
 2013-04-18 04:52:04 -07:00
Jean Chalard
9cf468646f Update dictionaries 
>>> dictionaries/en_GB_wordlist.combined.gz
Header :
  date : 1366021966 <=> 1366272052
Body :
Added: yt 0

>>> dictionaries/en_US_wordlist.combined.gz
Header :
  date : 1366021978 <=> 1366272093
Body :
Added: yt 0

>>> dictionaries/en_wordlist.combined.gz
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> dictionaries/fr_wordlist.combined.gz
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> dictionaries/ru_wordlist.combined.gz
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

>>> java/res/raw/main_en.dict
Header :
  date : 1366021987 <=> 1366272977
Body :
Added: yt 0

>>> java/res/raw/main_fr.dict
Header :
  date : 1366003217 <=> 1366272255
Body :
Freq changed: cash 80 -> 20

>>> java/res/raw/main_ru.dict
Header :
  date : 1366003693 <=> 1366277083
Body :
Deleted: толщ 76

Bug: 8635822
Change-Id: I44dc73bd010b125c994387894847a008276d69f7
 2013-04-18 18:41:19 +09:00
Tadashi G. Takaoka
64e87b3e66 am 0b2d184a: Merge "Update setup wizard icons" 
* commit '0b2d184a426f49c115ea55098ae6073ccd7d6a94':
  Update setup wizard icons
 2013-04-17 23:59:41 -07:00
Tadashi G. Takaoka
0b2d184a42 Merge "Update setup wizard icons" 2013-04-18 06:56:24 +00:00
Jean Chalard
d91268ad9f Initialize dictionaries at onStartInputView 
Bug: 8344402
Change-Id: I41b8440f0d72a66fde3f6feb0db8239c9bb10ea3
 2013-04-18 14:48:42 +09:00
Kurt Partridge
8acab80a86 am 56f35a10: Merge "Fix bug in counting words between samples" 
* commit '56f35a10cde1beeea51d99427992d832fa2de2bb':
  Fix bug in counting words between samples
 2013-04-17 21:25:27 -07:00
Kurt Partridge
56f35a10cd Merge "Fix bug in counting words between samples" 2013-04-18 04:23:29 +00:00
Tadashi G. Takaoka
d794f5ae2a Update setup wizard icons 
Bug: 8159728
Change-Id: Ia5a14a35292b43dc1eaa2d4edd65134040355149
 2013-04-18 13:15:53 +09:00
Baligh Uddin
c2e36a8fc2 am 97aa9c40: am a5506b53: am bfedad23: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '97aa9c4059c41395b6ad550a3e8dfb4a7b66a83b':
 2013-04-17 19:50:51 -07:00
Tadashi G. Takaoka
93c31e176f am 530fd15e: Fix bug to update last interpolated index of GestureStroke 
* commit '530fd15eff8bd8df1c4c87cfeab379b5328748c1':
  Fix bug to update last interpolated index of GestureStroke
 2013-04-17 19:47:39 -07:00
Jean Chalard
38d52c0aca am a694c9ba: am ff766f8c: Merge "Don\'t insert automatic spaces when text looks like a URL" 
* commit 'a694c9ba08895dbfadd703acb731a383edad8c9f':
  Don't insert automatic spaces when text looks like a URL
 2013-04-17 19:47:35 -07:00