Jean Chalard
93b00a314e
[HS2] Move more stuff to onStartInput
...
Bug: 8152758
Change-Id: Ida05df7d151ceb582886e2ad06c5bdf0b59978ee
2014-08-06 11:14:47 +09:00
Jean Chalard
6474ef9925
Merge "[HW16] Implement processing event chains." into lmp-dev
2014-08-05 00:07:36 +00:00
Jean Chalard
0a2872cb44
[HW16] Implement processing event chains.
...
Change-Id: I4e1e4f101050ebda77c629a61c548d3c8efb330f
2014-08-05 15:37:01 +09:00
Tadashi G. Takaoka
e9ed396f6c
Merge "Revert "Revert "Add Key label off center attribute""" into lmp-dev
2014-08-05 00:03:09 +00:00
Tadashi G. Takaoka
0b5d12c6b4
Revert "Revert "Add Key label off center attribute""
...
This reverts commit 787e9a37b4
.
Change-Id: I177b8f5d08eb487c19180c09101cc073222c4efe
2014-08-07 14:31:47 +00:00
Ken Wakasa
0f2de75e31
Merge "Revert "Remove unused animation resources"" into lmp-dev
2014-08-05 00:03:09 +00:00
Ken Wakasa
5f57fe4ad0
Merge "Revert "Remove unused Key and Keyboard attributes"" into lmp-dev
2014-08-05 00:03:09 +00:00
Ken Wakasa
44e20f4fb4
Revert "Remove unused Key and Keyboard attributes"
...
This reverts commit cdcaa37a37
.
Due to unit test breakage.
Change-Id: I1c22edf983f6e03a34b86d7c1fae3d3188447a75
2014-08-07 11:37:11 +00:00
Tadashi G. Takaoka
cdcaa37a37
Remove unused Key and Keyboard attributes
...
This CL removes the following unused Key attributes
- Key.keyLabelFlags' followKeyLargeLabelRatio
- Keyboard.keyLargeLabelRatio
Change-Id: Ib4fb13cc7ca902ac1733ecf27bd284d07e10bc3e
2014-08-07 17:23:37 +09:00
Tadashi G. Takaoka
e988e412d9
Merge "Add Key label off center attribute" into lmp-dev
2014-08-05 00:03:09 +00:00
Tadashi G. Takaoka
ba49920e80
Add Key label off center attribute
...
This CL adds two Key attributes to control how much a label should be
off centered.
- keyLabelOffCenterRatio
- keyHintLabelOffCenterRatio
Bug: 14419121
Change-Id: I26650eefdd375f0eeca8a1ca6034a8339d2a3182
2014-08-07 14:39:57 +09:00
Jean Chalard
c710b34e34
Merge "[HW13] Split up onCodeInput" into lmp-dev
2014-08-05 00:03:09 +00:00
Jean Chalard
a88e95e07e
[HW13] Split up onCodeInput
...
Change-Id: I503c5403dcaea5db632eba85ae3fae9ba9a1f946
2014-08-05 12:59:36 +09:00
Ken Wakasa
5218382141
Merge "Revert "Tune number letter size of Material keyboard"" into lmp-dev
2014-08-04 23:56:40 +00:00
Ken Wakasa
5ad718f2ca
Revert "Tune number letter size of Material keyboard"
...
This reverts commit 44454c2b2b
.
Due to unit test breakage.
Bug: 14419121
Change-Id: Id0bbc2276fc035aa090f7bb4fa8112a1aecd483f
2014-08-07 11:36:20 +00:00
Ken Wakasa
1c7e6f8d6e
Merge "Revert "Align hint label to bottom"" into lmp-dev
2014-08-04 23:56:40 +00:00
Ken Wakasa
02c4a80afe
Revert "Align hint label to bottom"
...
This reverts commit f1784266ec
.
Due to unit test breakage.
Bug: 14419121
Change-Id: Ibc201649e71135292530b26337d9305a6681f446
2014-08-07 11:35:26 +00:00
Keisuke Kuroyanagi
b6665d958a
Merge "Use DistracterFilterCheckingIsInDictionary for User History" into lmp-dev
2014-08-04 23:56:40 +00:00
Keisuke Kuroyanagi
87ab5b0518
Use DistracterFilterCheckingIsInDictionary for User History
...
Bug: 13142176
Bug: 15531638
Change-Id: I7e4e5afa05c5cee6eedef62c053d81edac5fa6af
2014-08-07 18:39:06 +09:00
Tadashi G. Takaoka
6ba5d63628
Merge "Remove unused Key and Keyboard attributes" into lmp-dev
2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka
868395c637
Merge "Mark hind_compact layout as completed" into lmp-dev
2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka
3760803de6
Mark hind_compact layout as completed
...
Bug: 13779052
Change-Id: If87ee2edbcfec4ad0444d13c7bd502df88cac89a
2014-08-06 18:34:22 +09:00
Tadashi G. Takaoka
8cbb4eb984
Merge "Make popup hint letter theme-aware" into lmp-dev
2014-08-04 23:56:40 +00:00
Tadashi G. Takaoka
3410e16907
Make popup hint letter theme-aware
...
Bug: 16351091
Change-Id: I6af18ea210c00916157138b9cfbeb073aee6ca1b
2014-08-05 17:32:53 +09:00
Jean Chalard
1b9f7c962c
Merge "[HW14] Cleanup" into lmp-dev
2014-08-04 23:56:40 +00:00
Jean Chalard
dd31a2dedf
[HW14] Cleanup
...
Do away with the didAutoCorrect local variables which are
unnatural to return out of all these functions.
Change-Id: I22024004d2c489de018beff812c2c589bfd8ca32
2014-08-05 12:59:55 +09:00
Jean Chalard
f1accd4f04
[HS1] Save some data in startInputView
...
Bug: 8152758
Change-Id: Ic57d3918b08e775769d4ba5d73ba5c31231e0d6a
2014-08-04 22:40:21 +09:00
Jean Chalard
053352f283
am d9e41aac
: am 85b7b967
: Merge "[HW12] Use the consumed status of the Event." into lmp-dev
...
* commit 'd9e41aac3fdf6e81ed7f2487cd9c74c28734a5e2':
[HW12] Use the consumed status of the Event.
2014-08-04 04:13:05 +00:00
Tadashi G. Takaoka
530845cb5e
am 9681027a
: am 03a1c442
: Clean up compatible utility classes
...
* commit '9681027aade82febb2ba5e384d9c6f77511859d3':
Clean up compatible utility classes
2014-08-04 02:07:36 +00:00
Tadashi G. Takaoka
03a1c442ae
Clean up compatible utility classes
...
Change-Id: I95a682052037d292801477db0f05e04926b61412
2014-08-04 01:21:29 +00:00
Jean Chalard
3d230119bc
am 9557e52e
: am da5ccd9f
: [HW11] Cleanup
...
* commit '9557e52ef43d33157f759cc02384d50480645a6f':
[HW11] Cleanup
2014-08-01 21:00:12 +00:00
Jean Chalard
85b7b967b7
Merge "[HW12] Use the consumed status of the Event." into lmp-dev
2014-08-01 16:06:20 +00:00
Jean Chalard
e0bad8e988
[HW12] Use the consumed status of the Event.
...
Change-Id: I1619f6132f8f71bc1291fd6a5604a5e1e3431ae2
2014-08-04 12:41:07 +09:00
Jean Chalard
dcd3d2187c
am 0b9d6140
: am 00ee5f76
: [HW10] Pull the processed event in its eventual place
...
* commit '0b9d6140495b106458bf22d11f5732bf5a0062b0':
[HW10] Pull the processed event in its eventual place
2014-07-31 13:35:34 +00:00
Jean Chalard
3d663a0a9d
am 1711c2aa
: am f290d407
: [HW9] Pull the processed event further.
...
* commit '1711c2aaf495a56d570f25d1b853bc3f40f16d08':
[HW9] Pull the processed event further.
2014-07-31 13:35:33 +00:00
Jean Chalard
214f743131
am 795711f5
: am 69b68b59
: Fix some unit tests.
...
* commit '795711f5f91001416c0aab38203c3aa7a9bc9f98':
Fix some unit tests.
2014-07-31 13:35:18 +00:00
Jean Chalard
da5ccd9f18
[HW11] Cleanup
...
Change-Id: Ia866d3f9a5981c687766f8c39979fb6091018e44
2014-07-31 18:33:30 +09:00
Jean Chalard
00ee5f7697
[HW10] Pull the processed event in its eventual place
...
Change-Id: I5f7932097627766e907764a99a5e9c170f725bc0
2014-07-31 09:10:24 +00:00
Jean Chalard
f290d4073a
[HW9] Pull the processed event further.
...
The 'processedEvent' variables will ultimately disappear entirely.
Change-Id: I612c5ce7dedc341b64921a86ac028fe91b75359b
2014-07-31 09:10:03 +00:00
Jean Chalard
69b68b5916
Fix some unit tests.
...
The default value for the script needs to be Latin, as we don't specify
it in the files.
Change-Id: I1275f13f1cd92f00dc5708748fefb4982f0a60b3
2014-07-31 12:29:35 +09:00
Geoff Mendal
77aa7a9293
Merge "Import translations. DO NOT MERGE"
2014-07-30 19:31:16 +00:00
Geoff Mendal
09c66a64f0
Import translations. DO NOT MERGE
...
Change-Id: I3d29195219313870f9213eeaf0b985dfd350b73f
Auto-generated-cl: translation import
2014-07-31 00:12:44 -07:00
Geoff Mendal
71864e2edc
Merge "Import translations. DO NOT MERGE"
2014-07-30 19:31:16 +00:00
Geoff Mendal
5720e29cdd
Import translations. DO NOT MERGE
...
Change-Id: If072b73a0d9b75abd607b36437fbca00334e3676
Auto-generated-cl: translation import
2014-07-31 00:08:16 -07:00
Geoff Mendal
95284392fa
Merge "Import translations. DO NOT MERGE"
2014-07-30 23:34:26 +00:00
Geoff Mendal
6fb0e02827
Import translations. DO NOT MERGE
...
Change-Id: I87901e5652dceebaacd2fcf4f345057e7df50254
Auto-generated-cl: translation import
2014-07-31 00:06:47 -07:00
Geoff Mendal
8c6d627b04
Merge "Import translations. DO NOT MERGE"
2014-07-29 21:36:00 +00:00
Geoff Mendal
b4d0b6a546
Import translations. DO NOT MERGE
...
Change-Id: I0f3662d4c5c89c76b3aa5ceced64f6ece69e636a
Auto-generated-cl: translation import
2014-07-31 00:05:36 -07:00
Jean Chalard
014f30f34a
am f466c276
: am 86893a3b
: [HW8] Pull up the processed event.
...
* commit 'f466c27601bbe83b101bf133694ee16ec10a8ae5':
[HW8] Pull up the processed event.
2014-07-30 17:11:50 +00:00
Tadashi G. Takaoka
17efa4fd5d
am 2505462d
: am f4a3fd48
: Merge "Disptach hover events when sliding suggestion mode" into lmp-dev
...
* commit '2505462da586cb708af5219e4c996644613f7677':
Disptach hover events when sliding suggestion mode
2014-07-30 17:11:48 +00:00
Jean Chalard
82f2a0b8b8
am cea54014
: am ae4e2036
: [SD13] Reorder an enum alphabetically
...
* commit 'cea540145d65b605bb9bbe483c6210dd2f0d7d66':
[SD13] Reorder an enum alphabetically
2014-07-30 17:11:40 +00:00
Jean Chalard
e715a02f4f
am 67bb9d83
: am 3a729d4e
: [SD12] Add the last remaining scripts
...
* commit '67bb9d83ae1e838f6c13d4afe19db3068edafb9b':
[SD12] Add the last remaining scripts
2014-07-30 17:11:39 +00:00
Jean Chalard
fd59cd804c
am 26b07201
: am 7c5cd5ec
: [SD11] Add script checks for Myanmar, Sinhala, Thai and Telugu
...
* commit '26b072013f7ebb29b18d33196ba191e6baf9430c':
[SD11] Add script checks for Myanmar, Sinhala, Thai and Telugu
2014-07-30 17:11:38 +00:00
Jean Chalard
d5228f9c4a
am 1d1ba8ec
: am 0304c777
: Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev
...
* commit '1d1ba8ec2c5b1eebb3b3e946c97bc9166f9a155c':
[SD10] Add script checks for Lao and Khmer
2014-07-30 17:11:37 +00:00
Ken Wakasa
818d3ee923
am ec8472b5
: am 7f545a57
: [HW7.5] Introduce the @Nonnull annotation (take 2)
...
* commit 'ec8472b5f5e478ba4eb830a7603da9c5a4637461':
[HW7.5] Introduce the @Nonnull annotation (take 2)
2014-07-30 17:11:36 +00:00
Jean Chalard
1f9ece1ca9
am 14d985bd
: am 0f6807bf
: Merge "[HW7] Introduce consumed events" into lmp-dev
...
* commit '14d985bdbdfd4a237add1009912a6920573c1a9d':
[HW7] Introduce consumed events
2014-07-30 17:11:35 +00:00
Jean Chalard
46f56262ed
am 99e13e48
: am bf2a3210
: Merge "[HW6] Split processing and applying the event." into lmp-dev
...
* commit '99e13e485a314615a6523794fbb26eecb6e67a74':
[HW6] Split processing and applying the event.
2014-07-30 17:11:34 +00:00
Ken Wakasa
ae5ebb06cd
am 93114fa0
: am c4f6fc1e
: Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
...
* commit '93114fa05f974fb6955937efe3207e025d5a82c5':
Revert "[HW6] Split processing and applying the event."
2014-07-30 17:11:32 +00:00
Ken Wakasa
06be57772f
am 55387ba4
: am 9fbeeb60
: Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev
...
* commit '55387ba41731460a412fe4f39c081ff9f6a550f2':
Revert "[HW7] Introduce consumed events"
2014-07-30 17:11:30 +00:00
Ken Wakasa
17440d7ec8
am cbffc447
: am 2ce8799f
: Merge "Revert "[HW8] Pull up the processed event."" into lmp-dev
...
* commit 'cbffc447e741876d13230097064642208aca6e69':
Revert "[HW8] Pull up the processed event."
2014-07-30 17:11:29 +00:00
Ken Wakasa
e69ca079c5
am 2706868d
: am dc0c3e1e
: Merge "Revert "[HW9] Pull the processed event further."" into lmp-dev
...
* commit '2706868d34362874511492856ea180386e3ea04f':
Revert "[HW9] Pull the processed event further."
2014-07-30 17:11:28 +00:00
Ken Wakasa
c329457a06
am e3fd9367
: am e8ca3f40
: Merge "Revert "[HW10] Pull the processed event in its eventual place"" into lmp-dev
...
* commit 'e3fd9367af79d3616e144023dc70bed077469b71':
Revert "[HW10] Pull the processed event in its eventual place"
2014-07-30 17:11:27 +00:00
Jean Chalard
86893a3b3f
[HW8] Pull up the processed event.
...
Change-Id: I18021b7ec1588fc52533c48b7d8774bec7764822
2014-07-30 08:39:46 +00:00
Jean Chalard
ae4e203625
[SD13] Reorder an enum alphabetically
...
Change-Id: I907041b09e5bfce537ed4f592947b2cec8cef4ac
2014-07-30 15:58:43 +09:00
Jean Chalard
3a729d4ed8
[SD12] Add the last remaining scripts
...
Add scripts for Bengali, Devanagari, Kannada, Malayalam,
and Tamil.
Also include a very minor fix for Arabic.
This concludes work on:
Bug: 15840116
Change-Id: Iade313fc70030a67c68d424d8cb0cac245b883d1
2014-07-30 15:58:43 +09:00
Jean Chalard
7c5cd5ec89
[SD11] Add script checks for Myanmar, Sinhala, Thai and Telugu
...
Bug: 15840116
Change-Id: I1264fdeea0d4739ca0f360f4934d06e5a824d4e5
2014-07-30 15:58:43 +09:00
Ken Wakasa
7f545a57c9
[HW7.5] Introduce the @Nonnull annotation (take 2)
...
Change-Id: I05512b5434810046c8b72d6bb41567b6cd8b9d6e
2014-07-30 04:13:58 +00:00
Ken Wakasa
f570538536
am c9bba853
: am 666f1b38
: Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev
...
* commit 'c9bba853fa00f03bfc9b49931e320957adc15b20':
Revert "[HW7.5] Introduce the @Nonnull annotation"
2014-07-29 15:53:12 +00:00
Jean Chalard
e4f81d6b47
am 8a584a2f
: am bcb61da5
: [HW10] Pull the processed event in its eventual place
...
* commit '8a584a2f610c2baf6f343fdccfb1eae42eda4351':
[HW10] Pull the processed event in its eventual place
2014-07-29 13:32:08 +00:00
Jean Chalard
b322e8c5d4
am f5e55433
: am a8d80ec0
: [HW9] Pull the processed event further.
...
* commit 'f5e55433a307256fa13f14dcfb148815a7c52aca':
[HW9] Pull the processed event further.
2014-07-29 13:32:06 +00:00
Jean Chalard
5d5ab6a10c
am 859ccd77
: am 312c9498
: Merge "[HW8] Pull up the processed event." into lmp-dev
...
* commit '859ccd77e3c91023829403e2afd600e9ade86977':
[HW8] Pull up the processed event.
2014-07-29 13:32:05 +00:00
Jean Chalard
6bc87b96ce
am 8c932cbd
: am 3c7cb523
: Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
...
* commit '8c932cbd0a9563d03e914051e6447728875e6c2b':
[HW7.5] Introduce the @Nonnull annotation
2014-07-29 13:32:03 +00:00
Jean Chalard
8c6778f9ca
am 716c7d29
: am 30424521
: Merge "[HW7] Introduce consumed events" into lmp-dev
...
* commit '716c7d2923b0bd455dd9e0464c0dbf289ba76965':
[HW7] Introduce consumed events
2014-07-29 13:32:02 +00:00
Tadashi G. Takaoka
0f53ef0ab7
am 8172a681
: am a715d7f6
: Use fragment for keyboard theme settings
...
* commit '8172a681439501a755459ca755c1a877fec919d6':
Use fragment for keyboard theme settings
2014-07-29 13:31:59 +00:00
Jean Chalard
caf539079d
am 4591869d
: am 6c39db9f
: Merge "[HW6] Split processing and applying the event." into lmp-dev
...
* commit '4591869d562baef393b6ff63e90378401183dbc7':
[HW6] Split processing and applying the event.
2014-07-29 13:31:58 +00:00
Jean Chalard
868c9ee44d
am 1e2fb096
: am 76ad2597
: Merge "Improve the russian dictionary." into lmp-dev
...
* commit '1e2fb096143acc964ee9635c0448964b13a30c3a':
Improve the russian dictionary.
2014-07-29 13:31:48 +00:00
Jean Chalard
bcb61da581
[HW10] Pull the processed event in its eventual place
...
Change-Id: I9e13bb3efad557e9199021a344d8dff8215d97fa
2014-07-29 18:48:13 +09:00
Jean Chalard
a8d80ec012
[HW9] Pull the processed event further.
...
The 'processedEvent' variables will ultimately disappear entirely.
Change-Id: If44c68c1116faa9ca23e4ffeabe320704431ab3c
2014-07-29 18:38:49 +09:00
Tadashi G. Takaoka
a715d7f6fd
Use fragment for keyboard theme settings
...
Bug: 11866784
Change-Id: Ic50b6eb1bd8f2b823e2c9dfad04d8615bc910936
2014-07-29 18:19:20 +09:00
Tadashi G. Takaoka
7c76da6d03
am eee0baad
: am 76cffec7
: Show "navigate up" icon on settings activity
...
* commit 'eee0baad2e7ac239cda55e675faaebd9642c21d3':
Show "navigate up" icon on settings activity
2014-07-29 03:16:59 +00:00
Tadashi G. Takaoka
76cffec788
Show "navigate up" icon on settings activity
...
Bug: 15813742
Change-Id: I8b1feb5c35377e62199e5a909640d9c50f970654
2014-07-29 12:05:48 +09:00
Tadashi G. Takaoka
973c7abefe
am af6cfb36
: am 8ca3eb67
: Merge "Update Material icons and backgrounds" into lmp-dev
...
* commit 'af6cfb36cf15883022a527a3d47f53c18c259041':
Update Material icons and backgrounds
2014-07-29 02:49:36 +00:00
Keisuke Kuroyanagi
e642693a59
am 5e6431ce
: am c6862ee6
: Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
...
* commit '5e6431ce32e27d2cdc9e05ea24a7005a3c541386':
Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
2014-07-29 01:59:51 +00:00
Jean Chalard
37f701dfa0
am b6a75d10
: am 036b83f4
: Merge "Wait for an event before actually realizing it" into lmp-dev
...
* commit 'b6a75d10de3ab43dcf318fde77e81918fc55e02b':
Wait for an event before actually realizing it
2014-07-28 12:14:29 +00:00
Tadashi G. Takaoka
4c6e8e70fb
am 5fc43eb0
: am 1e491d90
: Merge "Use fragment for advanced preference screen" into lmp-dev
...
* commit '5fc43eb04df9870fb6256d8d3918e7d399ca8a79':
Use fragment for advanced preference screen
2014-07-28 12:14:28 +00:00
Keisuke Kuroyanagi
4de1ca67d7
am 0bad998c
: am fb15b768
: Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
...
* commit '0bad998c52cc0ed610e4fef745c438472f14a7e4':
Fix NPE when context.getFilesDir() returns null.
2014-07-28 12:14:26 +00:00
Tadashi G. Takaoka
cd4799fdf9
am 1f5881b7
: am 9ba85413
: Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
...
* commit '1f5881b752b9b8e527b00e14150cfedd916513ce':
Refactor Debug settings to use SubScreenFragment
2014-07-28 12:14:25 +00:00
Tadashi G. Takaoka
a8765daeec
am b1067103
: am 633f1a5e
: Merge "Use fragment for text correction preference screen" into lmp-dev
...
* commit 'b1067103343c9b196e0a9276f3e9f7c20b6def86':
Use fragment for text correction preference screen
2014-07-28 12:14:24 +00:00
Tadashi G. Takaoka
2d64f7c097
am f63a044c
: am a484dc84
: Merge "Use fragment for gesture typing preference screen" into lmp-dev
...
* commit 'f63a044c6649f3cabc3b612ed5bd79b6601f52ae':
Use fragment for gesture typing preference screen
2014-07-28 12:14:23 +00:00
Tadashi G. Takaoka
a0a37bd368
am beffde59
: am 1da43854
: Merge "Use fragment for multi lingual preference screen" into lmp-dev
...
* commit 'beffde59c36515f77946b35c2b0279413a1df69f':
Use fragment for multi lingual preference screen
2014-07-28 12:14:21 +00:00
Jean Chalard
d33f7e84ab
am ac82983f
: am 6d7a0810
: Merge "Fix a verifier error on ICS." into lmp-dev
...
* commit 'ac82983f65626c1db3fd878ba059807166ffbe36':
Fix a verifier error on ICS.
2014-07-28 12:14:20 +00:00
Tadashi G. Takaoka
081a4177e4
am c140938d
: am bfcd98ed
: Use fragment for input preference screen
...
* commit 'c140938d99b2b34e95d7e45425396f280a486043':
Use fragment for input preference screen
2014-07-28 12:14:19 +00:00
Tadashi G. Takaoka
4dba300e50
am 26a29865
: am ab661e3e
: Make "Show correction suggestions" as a binary option
...
* commit '26a2986581410536a98e1c311214dc90d9934546':
Make "Show correction suggestions" as a binary option
2014-07-28 12:14:18 +00:00
Tadashi G. Takaoka
bfcd98edc7
Use fragment for input preference screen
...
This CL introduces a common abstract class, SunScreenFragment, for
PreferenceFragment that implements a PreferenceScreen of the main
settings preference screen.
Bug: 16522808
Change-Id: I11fba71b5e9f96208b261e0c0314de8a41720d0f
2014-07-27 16:06:52 +09:00
Tadashi G. Takaoka
ab661e3ef8
Make "Show correction suggestions" as a binary option
...
Formerly "Show correction suggestions" had three options, "always
show", "show in portrait mode", and "always hide". The reason behind
"show in portrait mode" was that there may not be enough screen estate
in landscape mode to show suggestions. Because recent phone devices
have relatively large screen, we decide to remove "show in portrait
mode" option.
Bug: 15780939
Change-Id: I896d737452c3893d43ce20bd88127f10c1eb3d83
2014-07-27 14:47:07 +09:00
Ken Wakasa
e8ca3f4091
Merge "Revert "[HW10] Pull the processed event in its eventual place"" into lmp-dev
2014-07-25 11:19:20 +00:00
Ken Wakasa
79fd911c8d
Revert "[HW10] Pull the processed event in its eventual place"
...
This reverts commit bcb61da581
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: I5f7ee2c7883496ed36e56b3ef12fac91f85f9866
2014-07-30 00:29:41 +00:00
Jean Chalard
312c9498be
Merge "[HW8] Pull up the processed event." into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
ebdd641d58
[HW8] Pull up the processed event.
...
Change-Id: If4baba0af2e88627f22b5e7312948fc3d9c5a25f
2014-07-29 17:49:24 +09:00
Jean Chalard
60a2cd8ac4
[HW7.5] Introduce the @Nonnull annotation
...
Change-Id: I1f69ea704056943fa3371ff610e2d8181ead2376
2014-07-29 17:49:19 +09:00
Jean Chalard
99aff0af98
[HW7] Introduce consumed events
...
Change-Id: Ic2d95d19b1ac66e3e97e4a16187ce5aecb4ac678
2014-07-29 17:49:14 +09:00
Jean Chalard
1db3d860ca
[HW6] Split processing and applying the event.
...
If anyone has better names for those...
Change-Id: Ia2dfc75381816bd688948647e2c50c10657b9e89
2014-07-29 17:40:48 +09:00
Jean Chalard
3042452170
Merge "[HW7] Introduce consumed events" into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
76ad259764
Merge "Improve the russian dictionary." into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
ae41058659
Improve the russian dictionary.
...
Deleted: 38 words
Probability adjusted: 11 words
Added: 1299 words
[Category diff]
+1 15
-1 0
+2 0
-2 0
+3 0
-3 0
+4 0
-4 0
+5 0
-5 3
+6 1
-6 0
+7 0
-7 13
[Weighted category diff]
+1 15
-1 0
+2 0
-2 0
+3 0
-3 0
+4 0
-4 0
+5 0
-5 3
+6 1
-6 0
+7 0
-7 13
Change-Id: I1a6513954d60b30738cb849578ce535c5e05eb1a
2014-07-29 13:31:23 +09:00
Keisuke Kuroyanagi
c6862ee699
Merge "Allow adding DICTIONARY_MAX_WORD_LENGTH-length words." into lmp-dev
2014-07-25 11:19:20 +00:00
Keisuke Kuroyanagi
d9a8f2a82f
Allow adding DICTIONARY_MAX_WORD_LENGTH-length words.
...
Bug: 12725817
Change-Id: Ib9b30473ba94242a7b97ccd3b850068f596a5d17
2014-07-28 21:48:02 +09:00
Jean Chalard
036b83f4c4
Merge "Wait for an event before actually realizing it" into lmp-dev
2014-07-25 11:19:20 +00:00
Jean Chalard
3d951c1eff
Wait for an event before actually realizing it
...
This would wrongly emit a 'timeout' log entry when switching
between two instances of the same language.
Change-Id: I56e5de121b87f3e762b58f0b2a77e9abc784036e
2014-07-28 19:33:49 +09:00
Baligh Uddin
2dc3a51001
Merge "Import translations. DO NOT MERGE"
2014-07-24 20:48:02 +00:00
Tadashi G. Takaoka
456cc99678
am a270ac4a
: Remove unnecessary DebugSettingsActivity, use fragment directly
...
* commit 'a270ac4a61ff64f5d262a212b0bf4c128d3ce8d7':
Remove unnecessary DebugSettingsActivity, use fragment directly
2014-07-24 20:01:00 +00:00
Baligh Uddin
9ac0f0838b
Import translations. DO NOT MERGE
...
Change-Id: Id8eadce808d946a7674f41826ab4aa086ac818e7
Auto-generated-cl: translation import
2014-07-24 09:40:19 -07:00
Tadashi G. Takaoka
f4a3fd4893
Merge "Disptach hover events when sliding suggestion mode" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
da232a70a8
Disptach hover events when sliding suggestion mode
...
Bug: 15687702
Change-Id: I7ace1fbbba724c6e422230a3d88f8cc9ffa8efc2
2014-07-30 14:55:53 +09:00
Jean Chalard
0304c77750
Merge "[SD10] Add script checks for Lao and Khmer" into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
a9c12692ed
[SD10] Add script checks for Lao and Khmer
...
Bug: 15840116
Change-Id: Id72b739e73cb3e72f56e1872ad9d60469555e193
2014-07-30 12:02:37 +09:00
Jean Chalard
8e38b12e9c
[HW7] Introduce consumed events
...
Change-Id: I692c35b8e701d5a84500b949884472545b1f424d
2014-07-30 11:37:19 +09:00
Jean Chalard
7196566d4f
[HW6] Split processing and applying the event.
...
...take 2
Change-Id: I9d13b6d51e13ce2e76ae3febebfb8c310eba509d
2014-07-30 11:06:43 +09:00
Ken Wakasa
c4f6fc1e48
Merge "Revert "[HW6] Split processing and applying the event."" into lmp-dev
2014-07-24 16:04:26 +00:00
Ken Wakasa
4399849dea
Revert "[HW6] Split processing and applying the event."
...
This reverts commit 1db3d860ca
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: I5e2d02300320438ef9c29577ec5b0860ea91d822
2014-07-30 00:55:49 +00:00
Ken Wakasa
9fbeeb609f
Merge "Revert "[HW7] Introduce consumed events"" into lmp-dev
2014-07-24 16:04:26 +00:00
Ken Wakasa
bfa6f9533c
Revert "[HW7] Introduce consumed events"
...
This reverts commit 99aff0af98
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: Id41d802981d079f17134a03cc30ab36a3cdd4ac1
2014-07-30 00:53:24 +00:00
Ken Wakasa
2ce8799fa8
Merge "Revert "[HW8] Pull up the processed event."" into lmp-dev
2014-07-24 16:04:26 +00:00
Ken Wakasa
76fc4914b3
Revert "[HW8] Pull up the processed event."
...
This reverts commit ebdd641d58
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: Ie7958d749dc813c1752d03aec7f14f5586225ff7
2014-07-30 00:31:57 +00:00
Ken Wakasa
dc0c3e1e2a
Merge "Revert "[HW9] Pull the processed event further."" into lmp-dev
2014-07-24 16:04:26 +00:00
Ken Wakasa
e2397e54c6
Revert "[HW9] Pull the processed event further."
...
This reverts commit a8d80ec012
.
Reverting due to a few critical bugs and unit test failures.
Change-Id: I3f49b54f34d875e8986d6ddc2523ab0b706dc6f2
2014-07-30 00:31:12 +00:00
Ken Wakasa
666f1b384f
Merge "Revert "[HW7.5] Introduce the @Nonnull annotation"" into lmp-dev
2014-07-24 16:04:26 +00:00
Ken Wakasa
8aa74da98d
Revert "[HW7.5] Introduce the @Nonnull annotation"
...
This reverts commit 60a2cd8ac4
.
Reverting due to build breakage under the unbundled branch.
Change-Id: Iab2988c53884166f62c95da920ac7a7079a0e5a0
2014-07-29 15:43:59 +00:00
Jean Chalard
3c7cb5234f
Merge "[HW7.5] Introduce the @Nonnull annotation" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
8ca3eb67d2
Merge "Update Material icons and backgrounds" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
e14c680078
Update Material icons and backgrounds
...
Bug: 16143083
Change-Id: I6396f725b30e9ef6fa7964a0c9d7eb6d1d97e376
2014-07-29 11:32:04 +09:00
Tadashi G. Takaoka
1e491d90f9
Merge "Use fragment for advanced preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
9bdcb13160
Use fragment for advanced preference screen
...
Bug: 16522808
Change-Id: If4a2ad7a7dfecc7019bf78ad37d93fa8f37cf21e
2014-07-28 19:24:41 +09:00
Keisuke Kuroyanagi
fb15b768dd
Merge "Fix NPE when context.getFilesDir() returns null." into lmp-dev
2014-07-24 16:04:26 +00:00
Keisuke Kuroyanagi
79ff803cb0
Fix NPE when context.getFilesDir() returns null.
...
Bug: 16416948
Change-Id: I0fac5ab26d6efbadbd688d033a79f6705e0161a5
2014-07-28 19:25:07 +09:00
Tadashi G. Takaoka
9ba854133c
Merge "Refactor Debug settings to use SubScreenFragment" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
99295c8c5f
Refactor Debug settings to use SubScreenFragment
...
Bug: 16522808
Change-Id: I741e2fbc5f0a62c7d4ae00e603eef52cc2a6d086
2014-07-28 19:16:42 +09:00
Tadashi G. Takaoka
00b49cad9c
Use fragment for text correction preference screen
...
Bug: 16522808
Change-Id: Ia8ce83b0e69cc8157f7b8cefcfeb863eb85ee4b4
2014-07-28 17:48:49 +09:00
Tadashi G. Takaoka
3c8a075a58
Use fragment for gesture typing preference screen
...
Bug: 16522808
Change-Id: Ib8c2997466bb006c6b5d4e980344507b822d0023
2014-07-28 17:45:41 +09:00
Tadashi G. Takaoka
6b71530017
Use fragment for multi lingual preference screen
...
Bug: 16522808
Change-Id: I0bfac43513e1fb85b5d4c07f56dd4c5b82f75ed1
2014-07-28 17:20:16 +09:00
Tadashi G. Takaoka
633f1a5e6e
Merge "Use fragment for text correction preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
a484dc84d9
Merge "Use fragment for gesture typing preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Tadashi G. Takaoka
1da4385493
Merge "Use fragment for multi lingual preference screen" into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
6d7a08107c
Merge "Fix a verifier error on ICS." into lmp-dev
2014-07-24 16:04:26 +00:00
Jean Chalard
da70b90aa7
Fix a verifier error on ICS.
...
Bug: 16530557
Change-Id: I271c5884995a1d5f8a1cb7aee6f52d17fabb9e72
2014-07-28 17:33:52 +09:00
Tadashi G. Takaoka
a270ac4a61
Remove unnecessary DebugSettingsActivity, use fragment directly
...
This CL must be checked in together with I1db2e848ab.
Bug: 16522808
Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c
2014-07-23 17:09:46 -07:00
Baligh Uddin
129f05867f
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
8fc6b5a820
Import translations. DO NOT MERGE
...
Change-Id: I8916526987bd2008b85222124bf465114e4d592c
Auto-generated-cl: translation import
2014-07-22 17:43:50 +00:00
Baligh Uddin
58ad6c4805
Import translations. DO NOT MERGE
...
Change-Id: Ic1191118d6f8d9dc2bcc6c293c4ffa0f86be34c6
Auto-generated-cl: translation import
2014-07-22 17:39:41 +00:00
Baligh Uddin
9f147c1337
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
e13e675cdc
Import translations. DO NOT MERGE
...
Change-Id: I95653f0874ab89771a1aa60cb3a01cb3cfedf01a
Auto-generated-cl: translation import
2014-07-22 17:44:02 +00:00
Baligh Uddin
f1e3f9df51
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:29:55 +00:00
Baligh Uddin
c1d2124a3e
Import translations. DO NOT MERGE
...
Change-Id: I8ffb44bf95c317dca14df03e5627bd9870acccb5
Auto-generated-cl: translation import
2014-07-22 17:44:08 +00:00
Baligh Uddin
05a2e8dea5
Merge "Import translations. DO NOT MERGE"
2014-07-22 16:21:19 +00:00
Baligh Uddin
f9efaad468
Import translations. DO NOT MERGE
...
Change-Id: I2f8c16e0dcaf894d2c0acb70c5804969ac618500
Auto-generated-cl: translation import
2014-07-22 17:44:19 +00:00
Baligh Uddin
ef29c1cd61
Import translations. DO NOT MERGE
...
Change-Id: I844a25e74c1cd451523248ae0d09ba9d40c3d09d
Auto-generated-cl: translation import
2014-07-22 17:44:14 +00:00
Yohei Yukawa
3f513f107e
Enable InputMethodService#onUpdateCursor behind the flag
...
With this CL, InputMethodService#onUpdateCursor and
InputMethodService#onUpdateCursorAnchorInfo can be enabled
on L when ENABLE_CURSOR_ANCHOR_INFO_CALLBACK and
ENABLE_CURSOR_RECT_CALLBACK are specified, respectively.
BUG: 16382260
Change-Id: I29924128f6bd2f08cbd91cc4e82c9c4a6ecce3ff
2014-07-20 20:56:52 +09:00
Yohei Yukawa
91e7daaddf
Merge "Use CharSequence for spell checker to keep spans preserved" into lmp-dev
2014-07-17 17:59:02 +00:00
Baligh Uddin
8279b9d4a9
Remove deprecated locales - DO NOT MERGE
...
Change-Id: I8c1efe2343eea40faf7a690518c500af86c1c323
2014-07-20 02:27:29 +00:00
Yohei Yukawa
86f36003fd
Use CharSequence for spell checker to keep spans preserved
...
This is a ground work to take per word locale information into
consideration in the spell checker. This CL is supposed to change
no user visible behavior.
With this CL, the spell checker session is able to read span
information if necessary.
BUG: 16029304
Change-Id: Icb1e1ecdf40fe0445e14565b685b1b878b746210
2014-07-20 02:16:11 +00:00
Yohei Yukawa
22ba22f32d
Merge "Add two convenient utility methods for L new API" into lmp-dev
2014-07-18 18:24:25 +00:00
Tadashi G. Takaoka
34da749437
Merge "Update Hindi Compact keyboard layout" into lmp-dev
2014-07-19 22:40:06 +00:00
Tadashi G. Takaoka
254c5c1e4b
Update Hindi Compact keyboard layout
...
Bug: 13779052
Change-Id: I350e5521b41d2a0b1cc17b6d4a48e6a816db916c
2014-07-19 16:43:35 -07:00
Tadashi G. Takaoka
639c93f43b
Remove unused Key.keyLabelFlags' values
...
Change-Id: Iae3cd6674448f258ee0a4bf2966bf3c347876b4f
2014-07-19 12:31:50 -07:00
Yohei Yukawa
5696ac95ac
Add two convenient utility methods for L new API
...
This CL adds two convenient utility methods for
InputConnection#requestCursorAnchorInfo to encapsulate
a bit complicated parameter construction.
BUG: 16382260
Change-Id: Ib11e3bd15a4edcb602c08ff830b2fb7b34ec00da
2014-07-19 23:42:37 +09:00
Tadashi G. Takaoka
de1ab73efb
Use Theme.DeviceDefault theme
...
For API 21 (and later), Theme.DeviceDefault.Light is specified.
This CL must be checked in together with Ic91f28df81.
Bug: 11866784
Bug: 13888366
Bug: 15781377
Change-Id: I01b288473128fc2491d3663e90cab56d0ba2d704
2014-07-18 15:30:30 -07:00
Ken Wakasa
e645715b25
Clean up under the util package.
...
- Move util classes that are unused in AOSP
- Remove unused methods
Change-Id: Ic97fd313f1e2bafd50609d42aa3a2d090b63eafc
2014-07-18 17:47:14 +09:00
Yohei Yukawa
413aded600
Add a compatibility library for newly added methods in L
...
This CL adds an compatibility library for
InputConnection#requestCursorAnchorInfo method that is supposed to
be available in L and later.
BUG: 16382260
Change-Id: I68be0c56b9fd929546e8706ccece938ae4f33339
2014-07-18 08:30:12 +09:00
Yohei Yukawa
5bb0bff0e4
Merge "Enable StringUtils to split CharSequence like String#split" into lmp-dev
2014-07-17 21:15:46 +00:00
Yohei Yukawa
eac8670830
Enable StringUtils to split CharSequence like String#split
...
This is a groundwork for enabling LocaleSpan.
To enable LocaleSpan everywhere, we need to switch to
CharSequence from String so that Span infromation can be
preserved end-to-end. To achieve this, we need to have
CharSequence version of String#split.
BUG: 16029304
Change-Id: I0dd103185dcf62fb1e25054a374340790e6a4678
2014-07-19 22:47:56 +09:00
Tadashi G. Takaoka
5a5ee95fae
Rename ProductionFlag to ProductionFlags
...
Change-Id: I5da2dbf8828fa0e176e7c2496392a5f561ebfe20
2014-07-16 19:26:32 -07:00
Tadashi G. Takaoka
6f80ed3901
Merge "Rename LatinImeLogger to DebugFlags" into lmp-dev
2014-07-16 23:37:00 +00:00
Tadashi G. Takaoka
2dae79b196
Rename LatinImeLogger to DebugFlags
...
Bug: 15318007
Change-Id: Ic0268fd12865c9a692a5e7110a9beb76cb8b6d7f
2014-07-16 18:49:00 -07:00
Tadashi G. Takaoka
0de52fa68a
Merge "Use SwitchPreference for spell checker setting" into lmp-dev
2014-07-16 23:30:53 +00:00
Tadashi G. Takaoka
7f58115a86
Update Material theme colors
...
Bug: 15782668
Bug: 15436349
Change-Id: Idbf98933e60531dbddb9450c6dbe7c4e2492cbd5
2014-07-16 14:33:23 -07:00
Tadashi G. Takaoka
53c0088d57
Use SwitchPreference for spell checker setting
...
This is a follow up of I1f7214c689.
Bug: 15781377
Change-Id: I7289b8b724e086da80ab3849cc567560c1a8502d
2014-07-16 12:13:51 -07:00
Tadashi G. Takaoka
39ae9ee06b
Mark Theme name text as translatable="false"
...
Bug: 16226064
Change-Id: Ice28fc20680889a4053c5d20c88dd744a0f7297e
2014-07-15 22:54:43 -07:00
Keisuke Kuroyanagi
05c70484a2
Track crashing during migration to avoid crash loop. DO NOT MERGE.
...
Bug: 16213554
Bug: 16235703
Change-Id: Ib29b1a84b4c6ebae06d3dc6448f3c274ec6a7aab
(cherry picked from commit 1d6024d2f8
)
2014-07-14 15:48:01 +00:00
Tadashi G. Takaoka
a2087e66e5
Use SwitchPreference on API versions newer than KitKat
...
Bug: 15781377
Change-Id: I1f7214c689006b1088249783eb614b6f0fbf2ee7
2014-07-13 13:11:09 +09:00
Tadashi G. Takaoka
ecfc6f347a
Fix wrong shift key icon in Material Light theme
...
Bug: 16208129
Change-Id: I34ba531bcdd9b18b3b84c78cf0cd9cae439ecd5d
2014-07-12 13:39:17 +09:00
Tadashi G. Takaoka
63fc159550
Merge "Update Material theme colors"
2014-07-10 21:46:42 +00:00
Tadashi G. Takaoka
509d9be21f
Update Material theme colors
...
This CL also fixes a bug of pressed state color of suggestions strip
in Material Light theme.
Bug: 16208167
Change-Id: I4315893bd129f65f34c863b003c8b2cfab4d2d84
2014-07-11 13:09:18 +09:00
Tadashi G. Takaoka
b3bd025b1a
Increase CHAR LIMIT of settings title
...
Bug: 16080988
Change-Id: I8638a26370bbe2abf5dfcd9f40200b57264f5c0b
2014-07-11 11:37:16 +09:00
Tadashi G. Takaoka
b76e0a7e66
Merge "Update Material icons and key pressed state background"
2014-07-09 17:48:03 +00:00
Tadashi G. Takaoka
4607e763a4
Update Material icons and key pressed state background
...
Bug: 16143083
Bug: 15678940
Bug: 15680164
Change-Id: I9f2527a8a536aab05d961e619e3940603024385c
2014-07-10 22:40:06 +09:00
Keisuke Kuroyanagi
b7ecb258dc
Merge "Remove SuggestionsGatherer."
2014-07-09 17:48:03 +00:00
Keisuke Kuroyanagi
1467fa0c26
Remove SuggestionsGatherer.
...
Bug: 13689011
Bug: 13630847
Change-Id: I9930d5ce9cbe16489dc69f68b9590d72afe463b5
2014-07-10 16:23:27 +09:00
Keisuke Kuroyanagi
86dee2295d
Quit sorting suggestions in AndroidSpellCheckerService.
...
Suggestions have been sorted in SuggestionResults.
Bug: 13689011
Change-Id: Iec21e97119ceb7c71673d5b15bb1f06040b59fef
2014-07-10 16:21:31 +09:00
Keisuke Kuroyanagi
9e76304d60
Make spell checker use dictionary facilitator.
...
Bug: 13630847
Change-Id: I07d17ccf5ce0755f63a0b8d236d77600baaf62b6
2014-07-10 12:51:37 +09:00
Tadashi G. Takaoka
facfd28a47
Merge "Add some virama combinations and tall-a for Myanmar"
2014-07-09 17:22:29 +00:00
Keisuke Kuroyanagi
eff9e26bc1
Merge "Make spell checker use dictionary facilitator."
2014-07-09 17:48:03 +00:00
Tadashi G. Takaoka
f9f409530c
Add Material Light theme
...
Bug: 15782668
Change-Id: Id2ae47cfb2065d73f13701b9c6a041129dfd08ae
2014-07-10 07:43:04 +09:00
Tadashi G. Takaoka
8e7260a014
Merge "Update Material Dark theme"
2014-07-09 18:21:26 +00:00
Keisuke Kuroyanagi
12e63799d3
Merge "Quit sorting suggestions in AndroidSpellCheckerService."
2014-07-09 17:22:29 +00:00
Yohei Yukawa
fc137f35c8
Simplify the wrapper for TextInfo#getCharSequence
...
This CL simplifies the wrapper method for
TextInfo#getCharSequence() because in the almost all cases we want
to use the result of TextInfo#getText() as the default value.
BUG: 16029304
Change-Id: I62f987aed8ca42b093255e6c0703d6120fa01299
2014-07-09 23:52:44 +09:00
Tadashi G. Takaoka
46394af7b9
Update Material Dark theme
...
Bug: 15782668
Change-Id: If3f2439fe9dcd2c05514e73861777337b42273c4
2014-07-09 23:43:45 +09:00
Tadashi G. Takaoka
b657c053c4
Add some virama combinations and tall-a for Myanmar
...
Bug: 7963632
Change-Id: I478ecdc3b7409ccd8dc729da28ad4816a2eda75e
2014-07-09 17:41:56 +09:00
Tadashi G. Takaoka
36713e5782
Fix alphabet label of Kannada and Telugu
...
Bug: 10029252
Bug: 10028759
Change-Id: Iea9cc1b7cafa97280503b0236b005cea57ba2c3d
2014-07-09 15:52:03 +09:00
Keisuke Kuroyanagi
3b8f2ece40
Merge "Move phrase gesture from additional features to public."
2014-07-02 20:35:42 +00:00
Keisuke Kuroyanagi
b8a9479b57
Move phrase gesture from additional features to public.
...
Bug: 15758242
Change-Id: I703dc2703afdf9402c5d2ac27411b74ece993dba
2014-07-08 16:36:06 +09:00