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

7022 commits

Author SHA1 Message Date
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
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
1a9bf159a4 Merge "Don't triger onPress and startLongPressTimer when gesture is canceled" 2013-04-22 10:53:39 +00: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
6d25be9ac5 Merge "Don't kill suggestions with native score < 1" 2013-04-22 08:13:13 +00: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
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
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
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
b8ff89c809 Remove translatable="false" from setup wizard strings 
Change-Id: Ie2f53910ce91f8c288e83c4ea15dc51aafd4c6a2
 2013-04-19 21:07:17 +09:00
Tadashi G. Takaoka
42afa82d54 Support landscape orientation for setup wizard 
Bug: 8159728
Change-Id: Ic0f73a7ebfea6e5e98aa320eb1ebc2a677271665
 2013-04-19 20:53:40 +09:00
Tadashi G. Takaoka
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
fcefabf9ab Groundwork to implement landscape and welcome screen 
Bug: 8159728
Change-Id: I05ff6578980ec2e210ebb482ea51b1600e74a4f4
 2013-04-19 20:10:59 +09: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
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
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
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
1f6e06cf92 Merge "Make setup wizard step number highlighted when activated" 2013-04-19 03:21:04 +00: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
1844bec202 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-18 16:39:35 +00: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
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
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
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
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
Tadashi G. Takaoka
38046a0a4e am 7abeccfa: am 1711f986: Merge "Add shadow to gesture preview trail" 
* commit '7abeccfa2753806086c083b3ba7b5b96c40b387a':
  Add shadow to gesture preview trail
 2013-04-17 19:47:34 -07:00
Jean Chalard
7f8e55ec80 am c6c17b93: am 962c9f05: Merge "Small cleanup" 
* commit 'c6c17b933270d994caa127ba9ca96ecf35898a88':
  Small cleanup
 2013-04-17 19:47:31 -07:00
Jean Chalard
ca796e2d45 am aa6924e9: am 78d65873: Merge "Don\'t recapitalize on shift while on symbol layout" 
* commit 'aa6924e9b2094ae64c8cecf6b5b5c14c0f6fb54a':
  Don't recapitalize on shift while on symbol layout
 2013-04-17 19:47:30 -07:00
Jean Chalard
074fee655b am cca43825: am 8094bf45: Match the keyboard state to the recapitalize state. 
* commit 'cca43825157d869b22c7d501d793dd5ed3d61562':
  Match the keyboard state to the recapitalize state.
 2013-04-17 19:47:28 -07:00
Jean Chalard
fe48f31e56 am ced547f7: am e259b9f5: Merge "Clean up RecapitalizeStatus" 
* commit 'ced547f74156a3482698037bdfaa82ac78b01a91':
  Clean up RecapitalizeStatus
 2013-04-17 19:47:27 -07:00
Jean Chalard
57ac9afcc8 am 8e5c6d70: am fd15686a: Merge "Fix an NPE" 
* commit '8e5c6d709052ba13a4c1ebc08def8d563e7b149c':
  Fix an NPE
 2013-04-17 19:47:26 -07:00
Jean Chalard
5557bf5ba7 am 10800d4b: am a024ac6b: Merge "Fix an NPE" 
* commit '10800d4bce94b5735b94b056c60f9e61a7d57471':
  Fix an NPE
 2013-04-17 19:47:25 -07:00
Jean Chalard
892f1b46d5 am 63e442cf: am 5fca38c5: Merge "Small performance improvement / minor bugfix" 
* commit '63e442cf6b50f4a60c07a24f45a1db978d9f63f9':
  Small performance improvement / minor bugfix
 2013-04-17 19:47:20 -07:00
Ken Wakasa
441fbbaf1d am 9a0e877c: am e3aa7f10: Adjust CHAR_LIMITs 
* commit '9a0e877cfbdeabee64949b28db274093d0d5a9de':
  Adjust CHAR_LIMITs
 2013-04-17 19:47:18 -07:00
Jean Chalard
203af810b1 am 8e643e32: am b76ce125: Merge "Remove a useless function" 
* commit '8e643e32e6f07a218323d9a67091c3beed2f88a2':
  Remove a useless function
 2013-04-17 19:47:17 -07:00
Jean Chalard
0376d9a0d6 am 647f629a: am a5a2f3e3: Remove gesture suggestions with an INT_MIN score 
* commit '647f629a5a22f9d09c17b5667cc83e9c138edc0f':
  Remove gesture suggestions with an INT_MIN score
 2013-04-17 19:47:16 -07:00
Jean Chalard
5e5bd3b6e6 am dea5e6a3: am 03395833: Merge "Have Latin IME re-capitalize a selected string" 
* commit 'dea5e6a3011a68aa2c101480b0521498eea7da87':
  Have Latin IME re-capitalize a selected string
 2013-04-17 19:47:15 -07:00
Jean Chalard
d69892fc82 am 12bf5a05: am e99daea0: Update dictionaries 
* commit '12bf5a0546e64e4265e1271b6c78b51e67a990f5':
  Update dictionaries
 2013-04-17 19:47:14 -07:00
Jean Chalard
2532265d6a am 34676d92: am a022c538: Merge "If there are no suggestion span, recompute suggestions." 
* commit '34676d92cc08c5575995a36cef1df9c50c1facca':
  If there are no suggestion span, recompute suggestions.
 2013-04-17 19:47:12 -07:00
Jean Chalard
ae73133188 am be0e013b: am 059e084e: Merge "Reject a previously user-refused suggestion." 
* commit 'be0e013be879aec19197a9e1b0a1d2631a8d4c79':
  Reject a previously user-refused suggestion.
 2013-04-17 19:47:10 -07:00
Tadashi G. Takaoka
577dc18906 am 1a42236a: am 4b6756db: Merge "Remove unnecessary harmful finish() from SettingsActivity" 
* commit '1a42236a8b22e0d3ca6f26704f052b8f83c991c5':
  Remove unnecessary harmful finish() from SettingsActivity
 2013-04-17 19:47:08 -07:00
Jean Chalard
18c362d700 am 5f6492c5: am 673ebb4e: Merge "Update dictionaries" 
* commit '5f6492c584699fea5c5793f11b71df4b394c31c9':
  Update dictionaries
 2013-04-17 19:47:07 -07:00
Tadashi G. Takaoka
9797dd2edc am 2fd4a00b: am 1ec4c07a: Merge "Ignore modifier key while sliding key input" 
* commit '2fd4a00bea92a6b54cc21999c8f147e1baed1393':
  Ignore modifier key while sliding key input
 2013-04-17 19:47:05 -07:00
Tadashi G. Takaoka
333bb7dbbd am eabb710b: am f224941c: Merge "Suppress calling onPressKey and onReleaseKey while detecting gesture" 
* commit 'eabb710b60c50b58a105bf9cbb6c7987ccdae6ee':
  Suppress calling onPressKey and onReleaseKey while detecting gesture
 2013-04-17 19:47:04 -07:00
Tadashi G. Takaoka
ed497d2423 am 089f1ce9: am bfb07ed7: Merge "Add preference dependency to gesture input related options" 
* commit '089f1ce95467e279c1d0b9f53de603af6a685bc4':
  Add preference dependency to gesture input related options
 2013-04-17 19:47:03 -07:00
Tadashi G. Takaoka
b8540f8ee5 am 18414333: am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode" 
* commit '18414333d41ce877fb4a7aba76804cea2a8c89e3':
  Reset vertical correction when more suggestions are in modal mode
 2013-04-17 19:47:00 -07:00
Jean Chalard
ba5e450e40 am 69ffa8b0: am 03d1dff3: Merge "Fix Binary dict tests" 
* commit '69ffa8b0ff646591edcc1eb3a6dc28572cf8e033':
  Fix Binary dict tests
 2013-04-17 19:46:57 -07:00
Kurt Partridge
de51abf1cf am bfe5c07f: am ededdc6a: Merge "Avoid NPE" 
* commit 'bfe5c07fda3d24589b1ad16d41c0dafd6651d0ee':
  Avoid NPE
 2013-04-17 19:41:24 -07:00
Jean Chalard
38011d295c am 41e59b62: am 2cd1136b: Merge "Remove the dialog to insert words to the dictionary." 
* commit '41e59b6202555ab3f778e1a251147ce943b7e864':
  Remove the dialog to insert words to the dictionary.
 2013-04-17 19:41:21 -07:00
Jean Chalard
7b81296f81 am cb633e37: am 91bcf5eb: Merge "Restart suggestions when the cursor moves." 
* commit 'cb633e37794adf59dd6ce1df97e3d5db02da6784':
  Restart suggestions when the cursor moves.
 2013-04-17 19:41:20 -07:00
Jean Chalard
fda69c4439 am 991b1ef8: am 02ce3dc2: Fix a bug with bad application completions 
* commit '991b1ef83e8f92c29ddec6685d91c24f1875eeba':
  Fix a bug with bad application completions
 2013-04-17 19:41:18 -07:00
Jean Chalard
5351510dea am 68b392cc: am d24f9397: Merge "Make shortcut-only user dict entry non-words." 
* commit '68b392cc1208036df06ca2c94176b2bc3b5a690d':
  Make shortcut-only user dict entry non-words.
 2013-04-17 19:41:17 -07:00
Jean Chalard
9129081070 am 907a95c2: am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI" 
* commit '907a95c2f1f24b73736118ada0900228ad356734':
  Add a class to encapsulate getting the metadata URI
 2013-04-17 19:41:16 -07:00
Jean Chalard
5875362b70 am 9613be01: am d0623ad7: Merge "Move some values to a place where they are easier to override" 
* commit '9613be01de32ca276104c8c69b44c764d9e66a45':
  Move some values to a place where they are easier to override
 2013-04-17 19:41:12 -07:00
Kurt Partridge
a5613e634a am bdce031e: am 2927223e: Merge "Better isolate ResearchLogging data" 
* commit 'bdce031e00876df72e10b5c4e9c0ae9ff03153d1':
  Better isolate ResearchLogging data
 2013-04-17 19:41:10 -07:00
Tadashi G. Takaoka
dfc8135941 am 3d6b7431: am cd692be1: Merge "Change the default vibration duration to 20msec" 
* commit '3d6b7431893aa6aa6d0086e44b85f35057c5b87d':
  Change the default vibration duration to 20msec
 2013-04-17 19:41:09 -07:00
Jean Chalard
27dede24a6 am 2e4352c5: am b5d5190d: Merge "Add some utility functions." 
* commit '2e4352c53b48366c40d43b32e8acdc28acac2e6f':
  Add some utility functions.
 2013-04-17 19:41:08 -07:00
Tadashi G. Takaoka
3be1c7485b am 05314bf0: am 4f5f81d5: Reorder advanced settings menu 
* commit '05314bf0054148ec85df8620afcc9189ebca383c':
  Reorder advanced settings menu
 2013-04-17 19:41:06 -07:00
Tadashi G. Takaoka
46762bf521 am 206ce637: am bd8e92d8: Add debug message to detect unusual zero width condition 
* commit '206ce6374bb4dfcb93d059ec6795853f36cd4979':
  Add debug message to detect unusual zero width condition
 2013-04-17 19:41:05 -07:00
Tadashi G. Takaoka
1ba1c411ef am 93fe83a1: am f67a3881: Merge "Add TypefaceUtils" 
* commit '93fe83a1c29e8d8671c007a7a4781c791b9864b6':
  Add TypefaceUtils
 2013-04-17 19:41:04 -07:00
Tadashi G. Takaoka
24b39f16b2 am 18819688: am 6d0027a4: Merge "Use SparseIntArray instead of TreeMap<Integer, Integer>" 
* commit '188196883c9ac2a877dba27e7beabe4f55208bab':
  Use SparseIntArray instead of TreeMap<Integer, Integer>
 2013-04-17 19:41:02 -07:00
Tadashi G. Takaoka
dabcd969c5 am 1dc7fd3f: am cee512b6: Merge "More precise geometry checking for more keys keyboard" 
* commit '1dc7fd3f8085c5a729061a7b35f71a2024a5ce0b':
  More precise geometry checking for more keys keyboard
 2013-04-17 19:41:00 -07:00
Jean Chalard
e910a9c94a am b7917ee3: am 3722f087: Merge "Fix two bugs in dicttool" 
* commit 'b7917ee347898d5dc9b1698ec7818b3a4cc8a035':
  Fix two bugs in dicttool
 2013-04-17 19:40:59 -07:00
Kurt Partridge
9cf3937281 am 94c441a4: am cdaee868: Merge "Preserve a class for testing" 
* commit '94c441a424875f815d7e84d02da5c8943ad6f7a6':
  Preserve a class for testing
 2013-04-17 19:39:00 -07:00
Kurt Partridge
6267ec688e am 3e1f652c: am 099dd3f2: Merge "Better release build reporting" 
* commit '3e1f652c2c39351d306b3a930340948a46104de0':
  Better release build reporting
 2013-04-17 19:38:57 -07:00
Jean Chalard
7503ef330c am cd51b80a: am fb3e8057: Merge "Fix a bug where a space would not be inserted before a gesture" 
* commit 'cd51b80a0b31493ef9dce9b5283264399b305ba0':
  Fix a bug where a space would not be inserted before a gesture
 2013-04-17 19:38:51 -07:00
Tadashi G. Takaoka
c627f64274 am 9a6ff5dc: am c7d41589: Merge "Use private object as a lock instead of synchronized method" 
* commit '9a6ff5dcef1a593260032b5e10eb801de297c0b2':
  Use private object as a lock instead of synchronized method
 2013-04-17 19:38:49 -07:00
Tadashi G. Takaoka
4516304436 am 1502d977: am 12e77de2: Merge "Use private lock object instead of synchronized method" 
* commit '1502d9779555958b0ca147fda1cab1e6302c9035':
  Use private lock object instead of synchronized method
 2013-04-17 19:38:48 -07:00
Tadashi G. Takaoka
8ea774ebf2 am 14950497: am 1e256f58: Merge "Protect simultaneously modifying gesture preview data" 
* commit '14950497280f15b6d1de9e6c5d159ce46e27180b':
  Protect simultaneously modifying gesture preview data
 2013-04-17 19:38:46 -07:00
Jean Chalard
99e91fc8ec am 2dd2e2d7: am 99b93d17: Fix a bug where autocorrection status would be wrong. 
* commit '2dd2e2d7dff8c4446d536bd23fc94a5538c24ddf':
  Fix a bug where autocorrection status would be wrong.
 2013-04-17 19:38:43 -07:00
Tadashi G. Takaoka
9a0f6ef847 am c35bca68: am 262d5bd9: Don\'t override EXTRA_SHOW_FRAGMENT if exists 
* commit 'c35bca685689ff6430e7a9393af64c74112bf677':
  Don't override EXTRA_SHOW_FRAGMENT if exists
 2013-04-17 19:38:41 -07:00
Tadashi G. Takaoka
f0a4508ad5 am f5aa2fd5: am 10af4b6e: Merge "Separate StringUtils.capitalizeFirstCharacter" 
* commit 'f5aa2fd5c868cae6e879858738a5eef4445aaca8':
  Separate StringUtils.capitalizeFirstCharacter
 2013-04-17 19:38:40 -07:00
Keisuke Kuroynagi
5c7c36e31f am e81c1678: am 87fdde6e: Typing double letters via a \'circle\' on the key. 
* commit 'e81c16788712590fd6cf9e14420d50acf029ad48':
  Typing double letters via a 'circle' on the key.
 2013-04-17 19:38:38 -07:00
Tadashi G. Takaoka
0d9164ecd8 am 0d7499bc: am 4fdfce6d: Merge "Refactor SpellCheckerProximityInfo as extending ProximityInfo" 
* commit '0d7499bccfb37bad2364202657a4feebab137aeb':
  Refactor SpellCheckerProximityInfo as extending ProximityInfo
 2013-04-17 19:38:35 -07:00
Kurt Partridge
d34979381d am ab8f166e: am 09ab6495: Merge "[FileEncap18] Clean up uploading scheduling" 
* commit 'ab8f166e6793e214dcb92454b10dbe5cc74daf9b':
  [FileEncap18] Clean up uploading scheduling
 2013-04-17 19:33:02 -07:00
Kurt Partridge
7a1721753b Merge "Fix user recording dialog" 2013-04-18 02:07:16 +00:00
Kurt Partridge
0833b3cbae Merge "Fix alarm bug" 2013-04-18 01:01:48 +00:00
Kurt Partridge
a19133011a Merge "Avoid duplicate MotionEvents" 2013-04-17 22:57:20 +00:00
Kurt Partridge
b903f10393 Merge "Label logUnits after LatinImeOnEndBatchInput" 2013-04-17 21:30:47 +00:00
Baligh Uddin
285ea403e1 Import translations. DO NOT MERGE 
Change-Id: I923a171d7af715859605f79c35ea37239dcf0a3e
Auto-generated-cl: translation import
 2013-04-17 13:39:46 -07:00
Kurt Partridge
a5bfac5bec Merge "Fix NPE" 2013-04-17 20:33:26 +00:00
Kurt Partridge
7da87f97b0 Merge "Clean up unnecessary log messages" 2013-04-17 20:18:19 +00:00
Kurt Partridge
e9e4fe5227 Merge "Fix logic error" 2013-04-17 18:57:18 +00:00
Kurt Partridge
1f99e04bba Merge "Fix JsonWriter bug" 2013-04-17 18:20:34 +00:00
Kurt Partridge
dac3ee49ae Merge "Small dot in corner was not visible" 2013-04-17 17:18:35 +00:00
Kurt Partridge
bf62dc9460 Fix bug in counting words between samples 
Previously MainLogBuffer#shiftOutWords() assumed it wouldn't be called if
mNumWordsUntilSafeToSample was 0.  This relaxes this assumption (which is in fact
false in the current code).

Change-Id: I8723248095e84a0d9d6f4639b4742cc7dda9716b
 2013-04-17 08:44:06 -07:00
Kurt Partridge
fdc90d4a58 Fix user recording dialog 
Clicking the "include recording" checkbox in the user feedback dialog did nothing.
The code was relying on the state of the checkbox, rather than keeping its own state.
Fixing this addresses the bug.

Change-Id: I559d57a4e11f869f6e6f5e5de7878f765531a203
 2013-04-17 08:42:20 -07:00
Kurt Partridge
9d3bbc82a0 Fix alarm bug 
The AlarmManager takes absolute times as an argument, not durations.

Change-Id: I419434ba5908c5f4070608070bbecf753088ecc8
 2013-04-17 08:39:49 -07:00
Kurt Partridge
dd8c87a39d Merge "Include nanoTime in filename" 2013-04-17 15:31:20 +00:00
Tadashi G. Takaoka
530fd15eff Fix bug to update last interpolated index of GestureStroke 
Bug: 8556775
Change-Id: Ie12e0dc9bfeae45f6883580801e07d44be1d1d33
 2013-04-17 06:36:12 -07:00
Tadashi G. Takaoka
464202047d Add user feedback to setup action labels and icons 
Bug: 8159728
Change-Id: I46c77c31973ae492c2a12291f2e0b154f64d26c9
 2013-04-17 19:57:46 +09:00
Tadashi G. Takaoka
47a78aeb4d Merge "Finalize setup wizard strings and mark as translatable" 2013-04-17 10:55:41 +00:00
Tadashi G. Takaoka
8712ac7945 Finalize setup wizard strings and mark as translatable 
Bug: 8159728
Change-Id: I9f6f04b09b2cefdb7ece76a4f3c39ab56d0c8fab
 2013-04-17 19:52:50 +09:00
Kurt Partridge
cd831fa285 Fix JsonWriter bug 
JsonWriter requires that data be written to it, else close() will throw
an exception.

Change-Id: I596c5363e063cc75bcda55e0a506eefb3f17bd67
 2013-04-17 01:26:52 -07:00
Kurt Partridge
fe0529714e Label logUnits after LatinImeOnEndBatchInput 
Previously only a commitText would cause a LogUnit to be
labeled with the word that the data generates.  In the case
of gestured text, this information is available when
LatinIME#onEndBatchInput is called. Labeling the LogUnit
at this time means that the Log will have labeled words even
if stop() is called before commit.

Change-Id: Idb2f99a9c159a1b1aa00448a2ecddeca6c351c3e
 2013-04-17 01:14:36 -07:00
Kurt Partridge
1bf47582a0 Avoid duplicate MotionEvents 
Change-Id: I9c3b352b738698f262f254e581bde34b060e258f
 2013-04-17 00:30:54 -07:00
Tadashi G. Takaoka
bb5deb82b5 Fix singleton/utility classes initialization in SettingsFragment 
This is a follow up of Ide3cd3acba.

Bug: 8632344
Change-Id: Iafe51798a1a74eff5d8fcd6f0117d16b419d447d
 2013-04-17 16:16:10 +09:00
Tadashi G. Takaoka
888a194cf1 Fix missing AudioAndHapticFeedbackManager initialization 
Bug: 8632344
Change-Id: Ide3cd3acba3987317cff709fa591eadaa71834e8
 2013-04-17 15:32:01 +09:00
Kurt Partridge
4ac28ded28 Fix NPE 
Change-Id: I8a091fb63dab12a0d2ba69e2fe393249bc68d103
 2013-04-16 20:39:47 -07:00
Kurt Partridge
2edb4f22cb Clean up unnecessary log messages 
Change-Id: I6c3252f3b31c5874ea2f909f636f58b579c06b8d
 2013-04-16 20:39:47 -07:00
Kurt Partridge
cd39368c21 Fix logic error 
Change-Id: Ia36660c66504ba2fbb7f125704926a08726df87a
 2013-04-16 20:39:47 -07:00
Kurt Partridge
2d9d4390fd Small dot in corner was not visible 
Framework change perhaps?  Even if not, this makes it more visible

Change-Id: Ib6d36b5a30136c4516adac666bdff36d1cd9b337
 2013-04-16 20:39:47 -07:00
Kurt Partridge
125f22dc58 Include nanoTime in filename 
System is fast enough that sometimes SystemClock.currentTimeMillis() is duplicated
when used to make a unique filename.

Change-Id: I9454fbb5e10265d36b8e17cba183a1591d52cc7b
 2013-04-16 20:29:42 -07:00
Tadashi G. Takaoka
edc49d38e6 Fix bug to update last interpolated index of GestureStroke 
Bug: 8556775
Change-Id: Ie12e0dc9bfeae45f6883580801e07d44be1d1d33
 2013-04-17 11:58:09 +09:00
Jean Chalard
ff766f8c4b Merge "Don't insert automatic spaces when text looks like a URL" 2013-04-16 10:07:36 +00:00
Jean Chalard
73ec85b8ad Don't insert automatic spaces when text looks like a URL 
This is about as ad-hoc as it gets, but then again, what we want
is probably as ad-hoc as it gets.
All URL boxes I know of double as search bars, and not adding
automatic spaces there sucks (e.g. in Chrome URL bar).
And in other boxes actually you don't want to add a space if
it looks like a URL. QSB isn't even a search box, and it behaves
like this.

So I think this is actually the right answer to the problem.

Bug: 7062925
Change-Id: Ib09472b34644fd5bf2dc84bb97cedeeba28bcd02
 2013-04-16 18:03:49 +09:00
Tadashi G. Takaoka
1711f986d4 Merge "Add shadow to gesture preview trail" 2013-04-16 07:57:29 +00:00
Tadashi G. Takaoka
c71dde9cb5 Add shadow to gesture preview trail 
Bug: 7167303
Change-Id: I8f76fe0aec6cb32388e7c85d04516d1dd7d28c29
 2013-04-16 16:50:59 +09:00
Jean Chalard
962c9f059a Merge "Small cleanup" 2013-04-16 06:38:17 +00:00
Jean Chalard
30225f3897 Small cleanup 
Change-Id: Iafdbe305712c8a571f0f5abc2032df086d7ac015
 2013-04-16 15:30:48 +09:00
Jean Chalard
78d658734d Merge "Don't recapitalize on shift while on symbol layout" 2013-04-16 05:31:43 +00:00
Jean Chalard
1f52364630 Don't recapitalize on shift while on symbol layout 
Change-Id: Ibf2cdedf510c296561bb5eeb6ff18c3414d6d6f4
 2013-04-16 14:29:02 +09:00
Jean Chalard
8094bf45d7 Match the keyboard state to the recapitalize state. 
Bug: 7657025
Change-Id: I2f8fe7fc4596a498322ba5ccabbd0c18a2bc36cf
 2013-04-16 14:25:03 +09:00
Jean Chalard
e259b9f57d Merge "Clean up RecapitalizeStatus" 2013-04-16 04:57:35 +00:00
Jean Chalard
fd15686ae9 Merge "Fix an NPE" 2013-04-16 04:12:18 +00:00
Jean Chalard
b794e904a3 Clean up RecapitalizeStatus 
Change-Id: Ib4d002f90cd3a0e9ad4c04b883b0c1f05ada3ccf
 2013-04-16 13:11:18 +09:00
Jean Chalard
a024ac6b20 Merge "Fix an NPE" 2013-04-16 03:43:06 +00:00