Commit Graph

1103 Commits (6ece8f718b50e5bb847152dabe290982efd42df2)

Author SHA1 Message Date
Ken Wakasa 43f579e9f6 am 4eef5101: am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit '4eef51016adc4e103fa65d944a0ab31527ddced8':
  Reset the IME if requested by the app.
2012-11-08 06:22:02 -08:00
Ken Wakasa 4eef51016a am aa5d6fe0: am 9cc22c45: am 5d2556b9: Reset the IME if requested by the app.
* commit 'aa5d6fe05ce45e36b732a3abc849508cd8279257':
  Reset the IME if requested by the app.
2012-11-08 06:12:57 -08:00
Ken Wakasa 5d2556b932 Reset the IME if requested by the app.
Specifically, reset the KeyboardState to the main Alphabet layout in
LatinIME.onStartInputViewInternal() if a keyboard layout set doesn't get
reloaded in the method.

Please note TextView.setText() calls up resetInput(), then the IME should
reset with it.

bug: 7482086

Note that bug: 6851364 needs to be revisited.

Change-Id: I5d448c10963d3dd952dd13cb587085ec7b014e69
2012-11-07 01:09:26 +09:00
Tadashi G. Takaoka a47a777476 Merge "Cleanup logging code" 2012-11-01 02:15:24 -07:00
Tadashi G. Takaoka fca71cfddb Cleanup logging code
Change-Id: Ia604a4fcebfc5179bdbeaa982e052f7d3882ac6e
2012-11-01 17:03:35 +09:00
Tadashi G. Takaoka 93b5c2ce63 Make sure PointerTrackerQueue is non-null
Change-Id: I2106cf64bed1472fb39d24e7e5bdee7238a30bfe
2012-11-01 15:26:06 +09:00
Tadashi G. Takaoka 081fedc422 Rename SuddenJumpingTouchEventHandler to TouchSCreenRegulator
Change-Id: Ia4fb5b3612ff78ed1b243c80a03294b829470f5c
2012-11-01 14:56:32 +09:00
Tadashi G. Takaoka ffb0c093d1 Merge "Move isInvalidCordinates() method to Constants class" 2012-10-31 21:24:01 -07:00
Tadashi G. Takaoka d80286642a Merge "Cosmetic source code formating change" 2012-10-31 21:23:49 -07:00
Tadashi G. Takaoka 0c8a08c141 Merge "Straighten an if-else-if blocks into if-return blocks" 2012-10-31 21:23:35 -07:00
Tadashi G. Takaoka a232930d9c Straighten an if-else-if blocks into if-return blocks
Change-Id: If3eede1257658f27384e3efc72586fabbed19f7b
2012-11-01 13:14:19 +09:00
Tadashi G. Takaoka 24ab8055aa Move isInvalidCordinates() method to Constants class
Change-Id: Iad1464c299ad6055af1db1ff7978e5cd9a14750f
2012-11-01 13:12:58 +09:00
Tadashi G. Takaoka 20dd1bc090 Cosmetic source code formating change
Change-Id: I3a53b49afab70dfb13f12027070635da6001eb79
2012-11-01 13:10:44 +09:00
Tadashi G. Takaoka 13ae76d7a3 Cleaup non-distinct multitouch related stuff
Change-Id: I09072267217caad2513f83b61d7db1c6d74e18d1
2012-11-01 13:04:49 +09:00
Tadashi G. Takaoka 831198a4e4 Consolidate two helper methods (refactor step 3)
Change-Id: I8b8522d1e5342fc73346ba2748e75f0c1d5bf03c
2012-10-31 19:45:29 +09:00
Tadashi G. Takaoka 2a3b15b267 Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)
Change-Id: I42aad04658e14e8fd703e3828676719a333ec8f9
2012-10-31 19:44:45 +09:00
Tadashi G. Takaoka 3c6d3a4df8 Separate nested if-blocks into helper methods (refactor step 2)
Change-Id: Ic0ed243f8c1fbf62793565ee37175270b47f0801
2012-10-31 19:34:43 +09:00
Tadashi G. Takaoka 8b449c6dda Separate nested if-blocks into helper methods (refactor step 1)
Change-Id: I87ef8b174295fb12a91fec35acd3b0cc152ad8f0
2012-10-31 18:40:28 +09:00
Tadashi G. Takaoka 240871ecaf Move code point constants from Keyboard to Constants class
Change-Id: Iee01d4d2b916d0b584531104ac865ae6e6370a3d
2012-10-29 16:04:20 +09:00
Ken Wakasa d505319a25 am 5199b8bf: am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit '5199b8bf1a212b93c9f37d4bb18121ba7f174bd0':
  LatinIME: Add accents to german keyboard
2012-10-25 23:13:48 -07:00
Ken Wakasa 5199b8bf1a am f6df37ce: Merge "LatinIME: Add accents to german keyboard"
* commit 'f6df37ce2dce9ada1af097e0c2fbdd84c0334c61':
  LatinIME: Add accents to german keyboard
2012-10-25 23:11:21 -07:00
Tadashi G. Takaoka 7f77aed507 Merge "Replace useless CharSequence to String" 2012-10-22 14:27:35 -07:00
Kim Le 82a6f66783 LatinIME: Add accents to german keyboard
This fixes http://code.google.com/p/android/issues/detail?id=26247

Add
// U+00E9: "é" LATIN SMALL LETTER E WITH ACUTE
// U+00E8: "è" LATIN SMALL LETTER E WITH GRAVE
// U+00EA: "ê" LATIN SMALL LETTER E WITH CIRCUMFLEX
// U+00EB: "ë" LATIN SMALL LETTER E WITH DIAERESIS

Change-Id: I81d79f153cdfe7015bd0a343c681322ab8316db7
2012-10-22 22:19:08 +02:00
Tadashi G. Takaoka 15f6d4ae34 Add @UsedForTesting and @ExternallyReferenced annotations
Bug: 7268357
Change-Id: I0b7e0c19f04af9ae30874d0a4c26ad81bc80be8c
2012-10-22 11:18:43 -07:00
Tadashi G. Takaoka bc464e2952 Replace useless CharSequence to String
Change-Id: Idc478f901185ee1b4912acc82d0cbc54fee4e991
2012-10-22 11:03:28 -07:00
Tadashi G. Takaoka 8e360c68f1 Move AudioAndHapticFeedbackManager from LatinIME to KeyboardSwitcher
Bug: 7313372
Change-Id: I9bd3275f57ed3f5c2c4a95768443af505513ee97
2012-10-17 19:39:16 -07:00
Tadashi G. Takaoka 723d32ad6e Shortcut key is enabled on the no language keyoard
Bug: 6617754
Change-Id: Id8336f152456367320de3151823691eebc2e02f6
2012-10-17 16:27:43 -07:00
Tadashi G. Takaoka 788c885aa5 am 344a7fef: am 658e935b: am c0bc3369: Merge "Fix more suggestions text width calculation" into jb-mr1-dev
* commit '344a7fef5bd101e2d1c4278cc35de2862f28a456':
  Fix more suggestions text width calculation
2012-10-16 17:32:00 -07:00
Tadashi G. Takaoka 477088c612 am 6b169dc9: am 718a0744: am 0cbc19b0: Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev
* commit '6b169dc91d7533d36bc1f5864bcaf05450af3beb':
  Restrict bogus move event detector to a horizontal movement
2012-10-16 17:31:56 -07:00
Jean Chalard fa3d984d1b am 60211f0d: am 2631fe4c: am 6686e63f: Honor automatic shift turned off for gestures
* commit '60211f0d250ca931788d32d5a69c880f75ef7d49':
  Honor automatic shift turned off for gestures
2012-10-16 17:28:18 -07:00
Tadashi G. Takaoka c0bc336955 Merge "Fix more suggestions text width calculation" into jb-mr1-dev 2012-10-16 17:24:35 -07:00
Tadashi G. Takaoka 0cbc19b0b1 Merge "Restrict bogus move event detector to a horizontal movement" into jb-mr1-dev 2012-10-16 17:24:23 -07:00
Tadashi G. Takaoka d631778e1c Restrict bogus move event detector to a horizontal movement
The bogus move detection threshold is in proportional to a diagonal
length of a key. It was in proportional to a key width.

Bug: 7346614
Change-Id: I796add8aea16dd05e9844d6c4fba8072eece39c6
2012-10-16 14:53:54 -07:00
Tadashi G. Takaoka bdc8b9e42b Fix more suggestions text width calculation
Bug: 7345983
Change-Id: Ic1554db98e7aaf032eb90a98c0c37c7c789461b5
2012-10-16 14:24:30 -07:00
Jean Chalard 6686e63f21 Honor automatic shift turned off for gestures
Bug: 7354129
Change-Id: Ia02336e8cea2f04b629edbe74b7815cce0d7fad6
2012-10-17 05:41:06 +09:00
Tadashi G. Takaoka dd7db83423 am a13087e1: am 9c318bc5: am ac2a154a: Merge "Detect bogus down-move-up event and add workaround" into jb-mr1-dev
* commit 'a13087e1abf48f8599795b9abb4f49a596a6f32c':
  Detect bogus down-move-up event and add workaround
2012-10-12 11:14:00 -07:00
Tadashi G. Takaoka b0952888eb Detect bogus down-move-up event and add workaround
Bug: 7032858
Change-Id: I2e76bf49f1e07b436d05c19881e2f2c4fed21621
2012-10-12 20:45:08 +09:00
Tadashi G. Takaoka ad181915f7 Fix excessive canceling of long-press timer while gesturing
Change-Id: I2a68c777e66a6b83d16885780a92a21e91bd3f9e
2012-10-11 17:51:45 +09:00
Tadashi G. Takaoka c1f2c3a646 am c66a2d1d: am 61155c70: am 9d423536: Merge "Don\'t cancel long press timer too early" into jb-mr1-dev
* commit 'c66a2d1da69de796a2a7acb5dd6903cb5668585c':
  Don't cancel long press timer too early
2012-10-11 00:52:05 -07:00
Tadashi G. Takaoka c9ba26994b Don't cancel long press timer too early
Bug: 7328861
Change-Id: I1b77ec4a30ae15b2edda42a1ff58ebc528288553
2012-10-11 15:58:56 +09:00
Tadashi G. Takaoka 4020289147 am 6b0fa314: am f5c10d00: am 7a17c1fc: Tuning gesture detection parameters
* commit '6b0fa314d780ea77bd2c65b9bdd87297d50a0f6b':
  Tuning gesture detection parameters
2012-10-09 07:48:45 -07:00
Tadashi G. Takaoka 11cec73499 Merge "Disable touch position correction of MoreKeysKeyboard" 2012-10-09 03:39:43 -07:00
Tadashi G. Takaoka f9aa99c1c9 Disable touch position correction of MoreKeysKeyboard
Change-Id: Ieec33894a348602fd71d6fe473142b43eb2551b6
2012-10-09 19:20:28 +09:00
Tadashi G. Takaoka 7a17c1fcb5 Tuning gesture detection parameters
Bug: 7032858
Change-Id: Ie4f952aa33b99ce16027500a596d723ee9bafae9
2012-10-09 19:06:10 +09:00
Tadashi G. Takaoka 4df6549c1a Allow to start gesture from a non-letter key except from a modifier key
Bug: 7303982
Change-Id: Id54965c1d7b2b760ac2a76a0fc509b46948e75e6
2012-10-09 18:03:40 +09:00
Tadashi G. Takaoka f731eb1760 Add separate key hysteresis distance for sliding modifier input
Bug: 7294402
Change-Id: I78c8be9e1a7b2d49d86bfe1e3a46d1785bfe5d48
2012-10-07 01:19:01 +09:00
Tadashi G. Takaoka 3623b9767b Fix detecting fast typing algorithm and parameter
Bug: 7032858
Change-Id: I5ed701e2394d16e43258a3c22d59991cb18adce8
2012-10-05 18:23:39 +09:00
Tadashi G. Takaoka 80bcb99632 Move gesture detection and recognition paramters to resources
Bug: 7032858
Change-Id: I66570a5e21cdeede1eba420c597f440ab61aa941
2012-10-05 14:39:44 +09:00
Tadashi G. Takaoka d445b56ce1 Fix possible NPE caused while monkey test
Bug: 7269036
Change-Id: I9054b33ad3c8996cac3ee5f0e9c01ba8ceea4971
2012-10-03 14:33:52 +09:00
Tadashi G. Takaoka 15281adbc1 Show gesture floating preview text by default
Bug: 7244214
Change-Id: Ib4ab810ef50798828dd10c39a8077466165772e4
2012-10-01 21:23:00 -07:00
Tadashi G. Takaoka 6052a81e08 Merge "Fix gesture detection algorithm" into jb-mr1-dev 2012-09-28 06:49:24 -07:00
Tadashi G. Takaoka 58fe5a421f Fix gesture detection algorithm
This change also
  * Introduces adaptive gesture detecting threshold for time domain in addition to length domain.
  * Tunes the parameters for detecting gesture after fast typing.
  * Fixes a bug in dismissing gesture floating preview text.
  * Cleanup debug messages

Bug: 7218902
Change-Id: Iafccd872c6efe0c3b5ae65fa40b04c80d9f139c7
2012-09-28 22:47:55 +09:00
Tadashi G. Takaoka c8f252940f Merge "Temporarily suppress key popup preview after gesture input" into jb-mr1-dev 2012-09-28 03:38:20 -07:00
Tadashi G. Takaoka 29d2d48182 Temporarily suppress key popup preview after gesture input
Bug: 7244317
Change-Id: I39cdb0fbda51f3e4339301d9cc53403b1ad15409
2012-09-28 19:10:56 +09:00
Tadashi G. Takaoka bf538ab2c0 Remove dead code for disabling gesture input after fast typing
Bug: 7218902
Change-Id: Iccc1d4cf0dd3ac84b30c68e11eee9a6ad89f14c4
2012-09-28 16:15:51 +09:00
Tadashi G. Takaoka a28a05e971 Cleanup: Make some classes as final
Change-Id: I6009b3c1950ba32b7f1e205a3db2307fe0cd688e
2012-09-27 19:03:30 +09:00
Tadashi G. Takaoka 1775201671 Calculate default touch position correction data for keys on 4th row
This change also disables touch position correction for Phone/Dvorak
keyboard.

Bug: 7243101
Change-Id: Idfcc7ad1feabbe6a81635dceba5be087401fa18b
2012-09-27 17:55:58 +09:00
Tadashi G. Takaoka 157fe98fd4 Draw gesture trail that is above the keyboard
Bug: 7233992
Change-Id: Ia848543a9d008c68d6ecbc7f715aa6ccdba9d1c6
2012-09-26 20:43:13 +09:00
Tadashi G. Takaoka 1c820c4146 Merge "Don't cancel gesture trail update drawing" into jb-mr1-dev 2012-09-25 22:50:50 -07:00
Tadashi G. Takaoka 1645902cce Postpone gesture start detection on non-letter key
Bug: 7108223
Change-Id: Ie1ead5cec947ddf86c5150dca5b20b224527e511
2012-09-26 12:46:55 +09:00
Tadashi G. Takaoka 936371e64f Don't cancel gesture trail update drawing
Bug: 7216955
Change-Id: Ie12bf45637b1012c9addb47279f9653334fae702
2012-09-26 12:25:24 +09:00
Tadashi G. Takaoka 630d9c95e5 Introduce typing aware gesture detection
Bug: 7218902
Change-Id: I11ad85914bf991eca513e04ed8b5d12779101dda
2012-09-25 20:11:05 +09:00
Tadashi G. Takaoka 6ca50d9920 Fix touch position correction data passing
Bug: 7225811
Change-Id: I3dcc0385ed633585d6810fdb742e0f88c2efbbd2
2012-09-25 14:24:15 +09:00
Tadashi G. Takaoka b305e6775a Second finger can start gesture input
Bug: 7108075
Change-Id: I17c419086a86c0bdac7a3858f8c66f6893678e67
2012-09-24 15:31:51 +09:00
Tadashi G. Takaoka 9f09c6fbc8 Disable gesture input while fast typing
Bug: 7032858
Change-Id: I0f9f92c712dbe45f4ba0b3cf331fbe11426c1db4
2012-09-24 13:14:47 +09:00
Tadashi G. Takaoka 02a67200fc Fix gesture start detection algorithm
Bug: 7032858
Change-Id: I9f4d939fa87fdead4c5a5921338a16cd0a59b7ac
2012-09-21 17:30:00 +09:00
Tadashi G. Takaoka 81d2e93772 Merge "Fix stuck gesture floatin preview text" into jb-mr1-dev 2012-09-20 03:47:46 -07:00
Tadashi G. Takaoka 61dcaaf17e Use device independent parameter for gesture
Change-Id: Iea95992e4482108a498f14ec595f3eacc7d7fc4b
2012-09-20 19:38:29 +09:00
Tadashi G. Takaoka 77bcd6be33 Fix stuck gesture floatin preview text
Bug: 7192483
Change-Id: Ic62253180446a625330966a114a6fabf74ab4ec8
2012-09-20 18:46:23 +09:00
Tadashi G. Takaoka f80f09c7ee Move PointerTracker.MIN_GESTURE_RECOGNITION_TIME to GestureStroke
Change-Id: Ib50192ed8f611fd8288ff9b7a1e0a19249cc6348
2012-09-20 15:14:25 +09:00
Tadashi G. Takaoka c7dc673cf0 Use Path to draw gesture preview trail
This change also reduces the number of points to use as preview trail.

Bug: 7167303
Change-Id: I0cf4908efa44b17b42d4fddd6725238236ac2654
2012-09-19 19:29:06 +09:00
Tadashi G. Takaoka 4f8e451d0c Show gesture floating preview text is off by default
Bug: 7043127
Change-Id: Icabf080f43a5934fef3824919bb03229522d5e5a
2012-09-19 18:59:10 +09:00
Tadashi G. Takaoka f501e4dbd2 Remove hack algorithm from GestureStroke
Change-Id: Idd1c150677b989415e6fee4f543ff7639e98bed8
2012-09-19 16:13:08 +09:00
Jean Chalard 35dc8cf223 Replace immediate values with named constants for characters (A6)
Change-Id: I6248f9f3ff99003ab62be22eac673df0f7f5c015
2012-09-14 16:59:50 +09:00
Tadashi G. Takaoka 9c5d165e9c Don't show gesture preview trail while detecting gesture input
Bug: 7166222
Change-Id: Iecc8403a4eca305323ed8c8e17266d23172d84d9
2012-09-14 11:21:12 +09:00
Tadashi G. Takaoka 350fab6dc4 Fix gesture floating preview on up event
This is a follow up of Iddb26ba1.

Bug: 7119032
Change-Id: Ibbc94a1a4880ca31bd8aeece89893691b14acc4d
2012-09-13 19:07:09 +09:00
Tadashi G. Takaoka f0e83046f0 Show gesture floating preview text at oldest finger
Bug: 7119032
Change-Id: Iddb26ba1a595e472fde0982d744b5652d5fbda3e
2012-09-13 18:17:15 +09:00
Tadashi G. Takaoka 9ad4b2a894 Use offscreen bitmap buffer to draw gesture preview trail
Bug: 7042741
Change-Id: Ie3d7054e786938dc501c7aa2ffc96b5924a7967b
2012-09-12 17:47:17 +09:00
Tadashi G. Takaoka 64c65ce6d7 Add missing MoreKeySpec.hashCode
Bug: 7149235
Change-Id: I14ba1017dffccc690e24289052a3ad7265a5f5f7
2012-09-12 11:52:44 +09:00
Charles Chen 655be140a0 Merge "When Accessibility is on, intercept touch events during dispatch." into jb-mr1-dev 2012-09-11 13:31:30 -07:00
Ken Wakasa e30c4e0bb1 Stabilize gesture recognition algorithm that looks for the nearest key.
It relies on the order of the key array.

Change-Id: I58fa71a7b330e59cd774fc208e5b6bc1a3decd2e
2012-09-11 20:00:21 +09:00
alanv dc2ee77724 When Accessibility is on, intercept touch events during dispatch.
This allows Accessibility code to safely inject events into
onTouchEvent() without accidentally intercepting them.

Bug: 7137557
Change-Id: Ie4fa8e3be5b1bb84f57c6254feab1129cb89998f
2012-09-10 15:47:24 -07:00
Tadashi G. Takaoka f117f77766 Fix bimanual gesture preview trail
Bug: 7122288
Change-Id: I9f0aabe08628880a8439bfda98844ae60206b8de
2012-09-07 17:20:07 +09:00
Tadashi G. Takaoka c1780c16a7 Revise gesture preview trail design
Bug: 7042741
Change-Id: I99e3b3a6fc52afaee3cc5daf371131c3afebb3ae
2012-09-06 20:09:12 +09:00
Tadashi G. Takaoka 71e2e8152f Revise gesture floating preview design
Bug: 7043127
Change-Id: Ibf9a6d57279263d9b60753e0eb734b658eeda9f2
2012-09-06 12:29:57 +09:00
Tadashi G. Takaoka e8c6d5a480 Utilize StateListDrawable for key preview background
Change-Id: I268550a185701caecefc27ebaec40fb2c940d883
2012-09-05 20:38:00 +09:00
Tadashi G. Takaoka 3f00c6151f Reduce amount of empty space in which keypresses are detected
Bug: 6942329
Change-Id: Ie92ccf43f307b8ceb9a311c30390d0cb2abf2cd7
2012-09-04 16:11:21 +09:00
Tadashi G. Takaoka 2c0c1cc677 Merge "Fix key info reported by keyboard accessibility node provider." into jb-mr1-dev 2012-09-03 18:34:55 -07:00
Tadashi G. Takaoka eceea877bd Consolidate Esperanto layout into Spanish layout
This change also removes AsciiCapable extra value from Esperanto
subtype.

Change-Id: I0fa18ef7c52e4ba24b182e8ecb9788572660b704
2012-09-03 17:38:56 +09:00
Tadashi G. Takaoka ab5f9532db Use 5-row layout for Thai phone keybopard
Bug: 6911182
Change-Id: I78f59564e8c31b9b66ed9a136584d0c57cc43120
2012-09-03 14:15:48 +09:00
Tadashi G. Takaoka a643b54b4d Add missing KeyDrawParams default constructor to fix build
Change-Id: Id2ae9e4085b4137c961b5202e0822d484dd71e8e
2012-08-31 20:28:46 +09:00
Tadashi G. Takaoka dc34da218a Support per-Key and per-Keyboard key visual attributes
This change refactors KeyDrawParams and KeyPreviewDrawParams to
separate KeyVisualAttributes.

Change-Id: I4de549eef303e1debe4b8f84668e042445fc18da
2012-08-31 20:23:21 +09:00
Tadashi G. Takaoka 36b5f4aae2 Fix key label padding
Change-Id: I971dd17afdaf1ce6e64e3c41bdb42a6ba3f6fd0e
2012-08-31 19:57:25 +09:00
Tadashi G. Takaoka 71b52a84e2 Move key label padding attributes back to KeyboardView
This is a partially reverting change of I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394

Change-Id: Id213541cdddcc0761bf6418c8429a5f96c0281ef
2012-08-31 10:35:54 +09:00
Tadashi G. Takaoka 49d8af8a4e Separate inner classes of KeyboardView out under internal package
Change-Id: I6d53b53526bbab951044a026476bd88a9ebd5a90
2012-08-30 16:23:01 +09:00
Tadashi G. Takaoka 749cc18751 Move some key top visual attributes from KeyboardView to Key
Change-Id: I1e2d59bf8c438ca653e2e415ccf66fd4f15d5394
2012-08-30 16:14:32 +09:00
Tadashi G. Takaoka 35ff94547c Separate inner classes of keyboard package out under internal package
Change-Id: Ia3969bd5ddec5aa5d81d05ad4cf676d818587922
2012-08-30 15:37:55 +09:00
Tadashi G. Takaoka 29d5973fd3 Optimize rare Key attributes to separate class
This change also removes per-Key verticalGap and horizontalGap.

Change-Id: Id4d2129022fbbfbf5d740b8d1257032c945bb775
2012-08-30 11:48:19 +09:00
Tadashi G. Takaoka 61bc66b324 Revert "Revert "Fix key letter size of 5-rows Thai keyboard""
This reverts commit 7a5ca9982f.
Depends: Ia4fa5046b3106e2710b9d5df1a6cc5f2cf995ec7

Change-Id: I0b9d0125380efe898943dc26ae884378145c44a3
2012-08-30 11:30:13 +09:00
alanv 26b424b644 Fix key info reported by keyboard accessibility node provider.
Bug: 6704529
Change-Id: I519881a96767a8858c11da7c0abac3e276a45cf5
2012-08-29 13:07:37 -07:00