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

4243 commits

Author SHA1 Message Date
Ken Wakasa
b6ca354431 Small code cleanups 
Multi-project commit with I249d5fbe

Change-Id: Ia28c4e970992aa1299a30e604eaa5d096655c3a5
 2013-01-07 12:13:42 +09:00
Jean Chalard
f677681330 Fix double input of chars typed on a h/w keyboard 
Bug: 7939324
Change-Id: I11b7af54893cb645f8a06266a0b0ba95dd0b02f9
 2013-01-07 10:03:20 +09:00
Kurt Partridge
f77dd424b0 [Rlog27] Refactor LogBuffer 
Cleanup and prepare for replaying

Change-Id: Ie09e912c6e9c0d7375168c575ccf1cfd9375dd31
 2013-01-03 16:36:32 -08:00
Tadashi G. Takaoka
fa7f08b373 Set default audio and haptic feedback settings 
- Default keypress volume is set to 0.2f in resource.
- Default keypress vibration duration is set to 10 msec in resource.

Bug: 7055329
Change-Id: I83bd6288d171d9787d52e2b02e4e5305f1435681
 2012-12-28 19:24:32 +09:00
Tadashi G. Takaoka
a2982dd5a7 Refactor to add SeekBarDialog 
Change-Id: Id8e08a1d5ec5efb2baf96a2634111619fcb9fd4e
 2012-12-28 15:49:36 +09:00
Jean Chalard
864db4b0da A small simplification. 
It's useless to setAutoCorrection(getTypedWord()). Every time the
contents of the word composer are altered, the auto-correction is
reset, and at use time if it's null then the typed word is used
anyway.

Change-Id: I0870657a1ab3f456f376995b27e70703f7a5d23a
 2012-12-28 14:41:28 +09:00
Jean Chalard
997cba7dec Start committing hardware events (B4) 
Essentially this does activate auto-correction with a hardware
keyboard, although a lot of things are still left to implement.
No proximity is used yet which means only missing and excessive
letters are considered. Dead keys are not handled. No combiner
is supported. No suggestions are displayed. Resuming suggestions
does not work correctly with a hardware key (because the view
holds a temporary hardware event 'onKeyPreIme' and the event
from the IME won't be handled until this is handled which won't
happen until after the IME said that it did handle the event).

Bug: 5037589
Change-Id: Idcb5c7b26d56717ed772d53c062362807f11cdae
 2012-12-27 16:17:49 +09:00
Jean Chalard
581f324ed8 Initial implementation for decoding HW key events (B3) 
Bug: 5037589
Change-Id: I829f70a258de58ef8d2b836a9b435198a226e37f
 2012-12-27 16:17:46 +09:00
Jean Chalard
0abc48218e Rename some confusing variables 
Change-Id: Ib0de800599ae7f12c86270a627616d5b52366414
 2012-12-27 15:42:14 +09:00
Jean Chalard
5bde3a6163 Fix an old bug in getting a word from the connected view. 
In this test, it's impossible that start < 0 so the test is useless.
I'm not sure what the cursor test was for, but it's very old code, and
it seems the assumption was either misled or doesn't hold any more:
testing for the absolute cursor position against the length of the
word against the cursor makes no sense.

The net result of this was that when the cursor index got large
enough, resuming suggestion would not work any more.

Bug: 7586467
Change-Id: I3462082374fe9579bec7698f4d424de6ff5f2ded
 2012-12-27 15:41:10 +09:00
Tadashi G. Takaoka
0856ceef9a Merge "Get rid of current subtype and system locale cache from SubtypeSwitcher" 2012-12-26 19:21:36 -08:00
Tadashi G. Takaoka
1dbec26f8f Merge "Fix gesture trail width calculation" 2012-12-26 19:01:31 -08:00
Tadashi G. Takaoka
f483225397 Get rid of current subtype and system locale cache from SubtypeSwitcher 
Bug: 7675452
Change-Id: I2121f56964b6d25e8d40f5b8ec67eeae527b2117
 2012-12-27 12:00:38 +09:00
Tadashi G. Takaoka
92aee35222 Fix gesture trail width calculation 
Change-Id: I41e0a95437aa9b8ec9a8eefb3bc5eb0452284b60
 2012-12-27 11:43:35 +09:00
Jean Chalard
5112b59db2 Add support for multiple keyboard event decoders (B2) 
Bug: 5037589
Change-Id: I0a4926f94ef8d1caa17669801608608648b697b9
 2012-12-26 20:25:05 +09:00
Kurt Partridge
4aff3bf0ea Clean up unnecessary uses of toString() 
Leftover from changing variables from CharSequence to String

Change-Id: I4db43fcb075aa37bf9c5b2a23bad0e4c2d718379
 2012-12-23 18:42:06 -08:00
Kurt Partridge
f763dc5915 [Rlog24] ResearchLogger detect word boundaries in callers above commitText 
multi project commit with I5847d4aba97a7224ae170a7153811c5a11816449

Change-Id: Ie6fbf6f19f0193451fe6f3ddf9d4ef1637a35db1
 2012-12-23 12:33:16 -08:00
Kurt Partridge
13b1be988d Merge "Log LatinIME.commitCurrentAutoCorrection()" 2012-12-23 11:47:47 -08:00
Kurt Partridge
c1b4d14394 Merge "Differentiate LOG_EVERYTHING and LOG_FULL_TEXTVIEW_CONTENTS" 2012-12-23 11:20:34 -08:00
Kurt Partridge
5e9a5ca998 Merge "[Rlog36z] Pass LatinIME instance to logger as LatinIME class" 2012-12-23 10:37:31 -08:00
Kurt Partridge
dce58fe895 Merge "[Rlog24z] Initialize statistics variables" 2012-12-23 09:51:22 -08:00
Kurt Partridge
a51fbd92a5 Merge "[Rlog20] Remove duplicate logStatistics" 2012-12-23 09:05:00 -08:00
Kurt Partridge
99bd42b295 [Rlog24z] Initialize statistics variables 
Change-Id: I73a6009294a4f559a93b6ea9ceb4ea2683d97486
 2012-12-23 09:04:01 -08:00
Kurt Partridge
f0d626ecfc Merge "[Rlog19] ResearchLog remove unnecessary logSegment{start,end}" 2012-12-23 08:28:53 -08:00
Kurt Partridge
9e12ba6c95 Merge "[Rlog22] ResearchLogger fixed debug printing" 2012-12-22 18:02:25 -08:00
Kurt Partridge
226377e65a Log LatinIME.commitCurrentAutoCorrection() 
Change-Id: Ic46c91374ae0177cafad4579d28d6980af0d8d3a
 2012-12-22 17:32:12 -08:00
Kurt Partridge
fc6e0cce6f [Rlog19] ResearchLog remove unnecessary logSegment{start,end} 
Change-Id: I73b7765c764e5f1035f1c37df45345f26aa5acb1
 2012-12-22 17:22:43 -08:00
Kurt Partridge
583a1edc4a [Rlog22] ResearchLogger fixed debug printing 
Change-Id: I2c59983236c936b8698004db8213b68c2f964cd5
 2012-12-22 17:16:51 -08:00
Kurt Partridge
18b01e88ac Merge "[Rlog41] ResearchLogger debugging support in UploaderService" 2012-12-22 17:12:39 -08:00
Kurt Partridge
5dd5dd2911 [Rlog36z] Pass LatinIME instance to logger as LatinIME class 
Upcoming changes require LatinIME class, not just InputMethodService

Change-Id: Ia5b3a716ac02a99749fb2ba0164ba46c8a0c559a
 2012-12-22 14:20:39 -08:00
Kurt Partridge
68fc33bd92 Differentiate LOG_EVERYTHING and LOG_FULL_TEXTVIEW_CONTENTS 
Previously, LOG_EVERYTHING logged both all bigrams and also the entire TextView at the end of a
session.  Now, use a separate flag, LOG_FULL_TEXTVIEW_CONTENTS to determine whether the TextView
contents are recorded.

Change-Id: I0c7a90a8ff88aa65d057f3b2d3dd5adc3893504a
 2012-12-22 13:57:58 -08:00
Kurt Partridge
522d739524 [Rlog20] Remove duplicate logStatistics 
Change-Id: I31c5520598269a83ab218e3a024bff0a625c2770
 2012-12-22 13:38:28 -08:00
Kurt Partridge
ab5d2b45b9 [Rlog41] ResearchLogger debugging support in UploaderService 
Change-Id: I70d5bd0cb12be7a5cc216799f92622912646466f
 2012-12-22 13:07:46 -08:00
Kurt Partridge
163699e240 Merge "[Rlog12] Add comments to logging callpoints" 2012-12-22 12:59:15 -08:00
Kurt Partridge
ab9f4fd359 Merge "[Rlog7] ResearchLog improve gesture tracking" 2012-12-22 11:50:46 -08:00
Kurt Partridge
c322c3c3c7 [Rlog12] Add comments to logging callpoints 
Change-Id: Idd786e2804dc82c1fa27ecf0fc0537491438d017
 2012-12-21 12:34:39 -08:00
Kurt Partridge
f1ce54891f [Rlog7] ResearchLog improve gesture tracking 
- count how many times a gesture is deleted
- count num chars entered by gesture
- change name of fns to reflect capturing gesture information when setting composing text

Change-Id: I1b8ebf9cfcf304e0efd827c8b8e28a4010199728
 2012-12-21 12:33:54 -08:00
Kurt Partridge
5a7ac3bf2a Merge "[Rlog6.2] ResearchLogging Refactor" 2012-12-21 11:43:18 -08:00
Kurt Partridge
58281a98eb [Rlog6.2] ResearchLogging Refactor 
Move specifics of Log output format from ResearchLog to LogUnit

Change-Id: I9d0253c50bb8175ab141bd87dd9a09f39f316b10
 2012-12-21 11:36:28 -08:00
Tadashi G. Takaoka
7c1e853387 Call onCancelBatchInput only when onStartBatchInput has been called 
This NPE issue (Bug: 7903331) has been introduced by Ie68c7698.

Bug: 7903331
Change-Id: I44884f5608fe47d9db7a2c93a752d17b9ae39a22
 2012-12-21 14:31:03 +09:00
Kurt Partridge
11bc86adcb Merge "[Rlog13] Add flag to inhibit uploading" 2012-12-20 13:13:21 -08:00
Kurt Partridge
4c2b6923c3 Merge "[Rlog11] ResearchLogger printable code for research key" 2012-12-20 11:40:18 -08:00
Kurt Partridge
a98dabf106 Merge "[Rlog10] ResearchLogger change visible indicator to just lines on the side" 2012-12-20 10:43:11 -08:00
Kurt Partridge
0214f70e0c Merge "[Rlog8] Show red border if logging everything" 2012-12-20 09:53:32 -08:00
Kurt Partridge
5a50d574e4 [Rlog13] Add flag to inhibit uploading 
Change-Id: I9d22dfb3fbc8332000507c8b97d9072bdd8dda91
 2012-12-19 18:32:28 -08:00
Kurt Partridge
c572c20cd8 [Rlog8] Show red border if logging everything 
Change-Id: I5a3f21cef7d93128661b11b60eac7d84b8110e47
 2012-12-19 18:26:07 -08:00
Kurt Partridge
ff9e30f5a3 [Rlog10] ResearchLogger change visible indicator to just lines on the side 
(Note: Rlog9 was abandoned).

Change-Id: I69de4116e33d3c79216e25efe2ad2bcb2780b0ff
 2012-12-19 18:20:03 -08:00
Kurt Partridge
af34813127 [Rlog11] ResearchLogger printable code for research key 
Change-Id: Ifac7a801ea8534191a9258871d3d7f91e942788b
 2012-12-19 18:15:41 -08:00
Kurt Partridge
c2049c3284 Merge "[Rlog6.1] Fix LOG_EVERYTHING bug." 2012-12-19 17:20:12 -08:00
Kurt Partridge
94ac7a3851 Merge "Add ProductionFlag.IS_EXPERIMENTAL_DEBUG" 2012-12-19 09:02:05 -08:00
Jean Chalard
cff28c5d5d Add skeleton classes for hardware event flow (B1) 
Bug: 5037589
Change-Id: Id8eea0e2bd00dd339a1efb4b0542e4c091a84195
 2012-12-19 17:47:29 +09:00
Ken Wakasa
45239029ce Remove trailing spaces 
Change-Id: I260b85ef9e91d17f97d6e405d2d92a65b443df44
 2012-12-19 15:36:55 +09:00
Kurt Partridge
41fe487e3a [Rlog6.1] Fix LOG_EVERYTHING bug. 
(It wasn't logging everything).

Change-Id: I8c9fd1e7c04e1a3813e26e67691e0366ff48c9ee
 2012-12-18 19:47:10 -08:00
Kurt Partridge
0aafbcf879 Add ProductionFlag.IS_EXPERIMENTAL_DEBUG 
The IS_EXPERIMENTAL_DEBUG flag gives a single place to turn off all debugging flags that might be
set and to also enforce privacy controls.  Currently only used in the research package.

multi-project commit with I9275a7c8e40bf56106447a02d3056655329074b3

Change-Id: If769fe3a633f33963ca49e8ddf01ab24a30b6fd2
 2012-12-18 19:46:30 -08:00
Kurt Partridge
baf73311cd Merge "[Rlog6] ResearchLogger fix dictionary loading" 2012-12-18 12:25:31 -08:00
Kurt Partridge
ce8b139124 Merge "[Rlog5] ResearchLogging change from onFinishInput to onFinishInputView" 2012-12-18 11:34:34 -08:00
Kurt Partridge
1e55e59cc9 Merge "[Rlog4] ResearchLogger add LOG_EVERYTHING flag" 2012-12-18 10:46:12 -08:00
Kurt Partridge
8432c1317a Merge "[Rlog3] improve stat recording" 2012-12-18 09:54:05 -08:00
Kurt Partridge
606058f777 [Rlog5] ResearchLogging change from onFinishInput to onFinishInputView 
Change-Id: I7d3bcfe647249e0b8a14ac3d67460c2684f16d8c
 2012-12-17 21:39:54 -08:00
Kurt Partridge
40417aed94 [Rlog6] ResearchLogger fix dictionary loading 
Change-Id: I5af460bd7c7fd67f858626ae3daf71fd615a25bf
 2012-12-17 21:39:54 -08:00
Kurt Partridge
1a27336837 [Rlog4] ResearchLogger add LOG_EVERYTHING flag 
- broaden OUTPUT_WHOLE_BUFFER to log not just the buffer at the end, but everything along the
  way.  This should only be set when the user is aware that logging is on, e.g. in a user test.

Change-Id: I8f9874697524e533586da40d0a3e452f6a04d3e4
 2012-12-17 21:39:35 -08:00
Kurt Partridge
48160f9d84 [Rlog3] improve stat recording 
Change-Id: Ie3b70e6eadc2a9af5ef45ddfad6a3398cea7bfe8
 2012-12-17 17:08:47 -08:00
Kurt Partridge
c5da4365fb Merge "[Rlog2] ResearchLogging fix multi-space logging" 2012-12-17 16:33:57 -08:00
Kurt Partridge
3370dc8237 [Rlog2] ResearchLogging fix multi-space logging 
multi-space logging should look like single-space logging, missing a few minor log statements
(SuggestionUpdates, SetComposingText)

multi-project commit with I2af842348c2f2b8f7271ac5b63def245e83df24d

Change-Id: Icd3187c0d0377255f82787afffea657c14345803
 2012-12-17 09:53:43 -08:00
Ken Wakasa
e57e9fbd18 Merge "Remove AudioManagerCompatWrapper.java" 2012-12-17 02:50:18 -08:00
Ken Wakasa
fbe83245c9 Clean up SuggestionSpanUtils for API level 14+ 
Change-Id: Iadc235524341b48e7618e9ce05907c786409e004
 2012-12-17 19:41:44 +09:00
Ken Wakasa
1e6edb3e57 Remove AudioManagerCompatWrapper.java 
It is actually no longer needed for API 14+

Change-Id: I379809eae881351fdf210dd8eaa5e0b5662fb59f
 2012-12-17 18:27:20 +09:00
Ken Wakasa
96b22200be Privatize a few constants in BinaryDictionary.java 
Change-Id: I7defaf1f577fd67e678cac83ff935e8181dd0a48
 2012-12-17 17:46:57 +09:00
Tadashi G. Takaoka
f21a491ad8 Show last valid suggestions when gesture typing gets no suggestion 
Bug: 7679566
Change-Id: Ie68c7698144c7576b5814ee35664309bcfdcbf0f
 2012-12-17 16:19:10 +09:00
Tadashi G. Takaoka
b808188b2f Show last valid suggestions when tap typing gets no suggestion 
Bug: 7872809
Change-Id: Ib5a255de7968aba214249c1b934327d248a15efd
 2012-12-17 14:32:18 +09:00
Ken Wakasa
8c15e91344 resolved conflicts for merge of d48d6fee to master 
Change-Id: I21141956135debe737453dba87617671b1716d0a
 2012-12-15 09:44:39 +09:00
Jean Chalard
d48d6feedd am db6f21c6: am 18d688c9: Use the amended user dictionary word for insertion 
* commit 'db6f21c6792fe07a733572e1d4978f46b5462c35':
  Use the amended user dictionary word for insertion
 2012-12-14 11:01:56 -08:00
Kurt Partridge
39b5396f8e Merge "[Rlog1] Track time of log statements" 2012-12-14 06:08:20 -08:00
Jean Chalard
18d688c94b Use the amended user dictionary word for insertion 
When the user edits a word before adding it to the user
dictionary, the keyboard should replace whatever was
committed before with the amended version.

Bug: 7725834
Change-Id: I1a417be6c5a86d6a96bc2c76aca314ad8f1202a9
 2012-12-14 20:28:22 +09:00
Tadashi G. Takaoka
edbb65be3e Reset composing state at onFinishInputView 
Bug: 7709817
Change-Id: Icac0b8cb28209d98d291d8f00be55e33af5bf696
 2012-12-14 17:48:13 +09:00
Tom Ouyang
ac69ab400d Refactor more keys menu framework (part 3) 
Make it possible to re-enter gesture input even after triggering the long-press
menu. This is useful for new users who may pause at the start of a word. Works
for both single and bi-manual gestures.

Bug: 7595193
Change-Id: Ieaecfd5385ed6c10ae9347b99c2e35a0de5e895d
 2012-12-13 21:45:51 -08:00
Tom Ouyang
be68b41ccb Fix more suggestion window asymmetry bug in N7. 
Bug: 7711822
Change-Id: I63ba13b1c160cf55b8820a08e6e28fa666dd2580
 2012-12-13 21:01:30 -08:00
Tom Ouyang
1f4f404e1f Merge "Refactor more keys menu framework (part 2)" 2012-12-13 18:51:37 -08:00
Kurt Partridge
5e854e281a [Rlog1] Track time of log statements 
Log statements are now recorded with a timestamp.  This is important for filtering out statements
not part of words that are sampled when spaces are inserted automatically.

multi-project commit with Change-Id: I68221a2528045d25632aef4bb716f92a4f4a56a4

Change-Id: I46ac9b3b1dcbb08425160d0109028cb64445139c
 2012-12-13 18:44:10 -08:00
Tom Ouyang
35580bad6f Refactor more keys menu framework (part 2) 
- Integrate pointer tracking between more keys menu, more suggestions menu, and main keyboard.
- Adds multi-touch support for more keys menus. Long press with one finger and select keys with another finger.

Bug: 7508007

Change-Id: I394f28cd79e342d6bcfea573af72aa33b9def00f
 2012-12-13 13:17:28 -08:00
Tadashi G. Takaoka
8eaf75aa7b Fix label of switch to symbols key when symbols has shortcut key 
This change fixes the labels of switch to symbols key and switch back
from more symbols key when symbols layout has shortcut key.

Change-Id: I3fbbef2d929486d0f0542f4d89cb086d9f5bad82
 2012-12-13 17:44:40 +09:00
Tadashi G. Takaoka
ac3720ce6d Fix layout switch keys' label of no language subtype keyboard 
This change moves the following string from resources to
KeyboardTextsSet.
- label_to_alpha_key
- label_to_symbols_key
- label_to_symbols_with_microphone_key

Bug: 7697799
Change-Id: Icf9b8848de4c70f792e336f2ae274dab12be79ee
 2012-12-13 17:44:10 +09:00
Jean Chalard
f1b464da31 Remove a useless member 
Change-Id: Id13e0aeec6ec3655d6bb0edc7f8f7821e7dc5a36
 2012-12-11 19:15:24 +09:00
Tadashi G. Takaoka
12939572f3 Remove unused suggestion preview stuffs 
Change-Id: Ida5668f4eba1783d96e02001a64ae713f98176b7
 2012-12-07 17:47:09 -08:00
Tom Ouyang
fa2d543785 Refactor more keys menu framework (part 1) 
Eliminate use of slower popup window for rendering the more keys menu and more suggestions menu.
These menus are now drawn directly on the preview placer view.

Change-Id: I40638724a6ffde2be4b5d0341d2a5db7ff7be930
 2012-12-07 16:34:25 -08:00
Tadashi G. Takaoka
8e2b34cdb2 Cancel batch input when orientation has been changed 
Bug: 7665231
Bug: 7662486
Change-Id: I7b6095026dbf1b9b2f6d3b29f2ab83c462ab374e
 2012-12-06 14:24:05 -08:00
Tadashi G. Takaoka
b494b30453 Merge "Fix off by one bug in gesture trail drawing" 2012-12-06 09:57:24 -08:00
Jean Chalard
2da8866518 Remove a couple Eclipse and Android Lint warnings 
Change-Id: I0c29c5d2abcbf80759b996d34b534deb083cd7d3
 2012-12-06 21:30:51 +09:00
Tadashi G. Takaoka
8c93e513ad Fix off by one bug in gesture trail drawing 
Bug: 7594165
Change-Id: Ia3f7dcee71db91e39c40022b19e7b07c5d4488c8
 2012-12-05 14:56:31 -08:00
Ken Wakasa
2b6a1fed76 Method/variable/resource names clean up for the double-space period 
bug: 7664717
Change-Id: I914aa588b863c442c2d360221e3fa0f4c42640e7
 2012-12-05 12:40:10 +09:00
Jean Chalard
b4a9a6deba Merge "Fix wrong misspelling reports of fully capitalized words" 2012-12-04 01:22:48 -08:00
Jean Chalard
95bfb8ac47 Fix wrong misspelling reports of fully capitalized words 
Two flavors of words would be wrongly reported as misspelled
by the android spell checker when they are written in all
upper case letters:
- Words containing a quote or a dash or any other non-letter
- Words that need the first letter to be capitalized

Bug: 7659216
Change-Id: Ibc5d261945ffcbb8a858d4c73b7c62cef6671abf
 2012-12-04 18:05:27 +09:00
Tadashi G. Takaoka
6e9e5635c3 Merge "Dismiss sliding key input preview when touch event is canceled" 2012-12-03 23:45:46 -08:00
Tadashi G. Takaoka
08d8a676c2 Dismiss sliding key input preview when touch event is canceled 
This is a follow up of Id807af31.

Bug: 7662486
Change-Id: I13895140f1214592257d0023c1450875a4885ee9
 2012-12-04 16:37:26 +09:00
Ken Wakasa
139bd83f0c Add a new option for the double-space period functionality 
bug: 6934756

Change-Id: I94b2d08cac6533e96031d8e97f347e9b5fd72859
 2012-12-04 15:27:22 +09:00
Kurt Partridge
b10ec5319b Fix crashes related to setSpan(-1 ... -1) errors 
Fixes b/7652661

In some circumstnaces, when hiding the window, the logger tries to capture the TextView contents
and restore the cursor position based on the values stored in LatinIME.  However, the IME may not
know the cursor position.

This fix does two things 1) doesn't try to reposition the cursor if the TextView contents are not
to be captured, and 2) if the cursor position is unknown (i.e., == -1), doesn't try to move it back.

Change-Id: I3976aaccf58c18f892c3a8530218ae52bcac9989
 2012-12-03 16:39:58 -08:00
Tadashi G. Takaoka
f9898d05f7 Merge "Get rid of special keys from ProximityInfo" 2012-12-03 01:55:30 -08:00
Tadashi G. Takaoka
308aaff80c Get rid of special keys from ProximityInfo 
Bug: 7601672
Change-Id: I15faa4829b98f7b4dd07013fdd58bc2c527bcd6f
 2012-12-03 18:50:58 +09:00
Tadashi G. Takaoka
84f5816cf1 Merge "Groundwork for sliding key input preview" 2012-12-03 01:19:51 -08:00
Tadashi G. Takaoka
547b638194 Groundwork for sliding key input preview 
Bug: 7548583
Change-Id: Id807af31f581c08ff8074ed1f6766337bea9469f
 2012-12-03 18:16:12 +09:00
Tadashi G. Takaoka
6f0a60d10d Cancel gesture preview update when gesture typing is canceled 
Bug: 7594165
Change-Id: I2854a49b2a2e5d3e36cafc5196191359fd2bf003
 2012-12-03 15:04:01 +09:00
Kurt Partridge
d4dbf09241 Merge "Revert "ResearchLog. Track time of log statements"" 2012-11-30 15:18:49 -08:00
Kurt Partridge
33d5da590f Revert "ResearchLog. Track time of log statements" 
This reverts commit bdbe279cec

Other half of this change couldn't be committed because of a inter-project directory migration.  Reverting until things settle down.

Change-Id: I3862fc8485dfca6d507f620e905cfa583aa0e39a
 2012-11-30 15:18:30 -08:00
Kurt Partridge
bc8df552f0 Merge "ResearchLog. Track time of log statements" 2012-11-30 14:54:16 -08:00
Kurt Partridge
fdfa03c9f1 Merge "ResearchLogger switch word segmentation" 2012-11-30 11:52:09 -08:00
Kurt Partridge
2ae580eaea Merge "ResearchLogging of segments: groups of LogUnits that are sampled together" 2012-11-30 09:28:23 -08:00
Satoshi Kataoka
16e9d343c4 Merge "Tweak beeline speed" 2012-11-30 02:08:55 -08:00
Tadashi G. Takaoka
b5fc0e02d0 Cancel update batch input timer when gesture typing has been canceled 
Bug: 7594165
Change-Id: I9dc42919bd196c249c79668570004d3f541cc9ec
 2012-11-30 16:30:56 +09:00
Kurt Partridge
bdbe279cec ResearchLog. Track time of log statements 
Log statements are now recorded with a timestamp.  This is important for filtering out statements
not part of words that are sampled when spaces are inserted automatically.

multi-project commit with Change-Id: I68221a2528045d25632aef4bb716f92a4f4a56a4

Change-Id: I9f49c36391e1e1773b6d4876d7387c893024f87b
 2012-11-29 20:40:42 -08:00
Kurt Partridge
6a0720478d ResearchLogger switch word segmentation 
Previously, a logunit was considered a word only if it was all letters.  This is important for
tracking bigrams correctly.

Now, a logunit must have only at least one letter.  The dictionary check is still performed,
and punctuation, etc. still comes in as separate LogUnits.  But a word can contain a space,
which helps set up for logging words where spaces are inserted automatically, and other situations
in which text is committed with an additional space tacked onto the end.

Change-Id: Ia74094a99058890d20a9cdadf2d0989841a79a41
 2012-11-29 20:32:12 -08:00
Kurt Partridge
98967539fd ResearchLogging of segments: groups of LogUnits that are sampled together 
Change-Id: Id68de4c6b2df574a38bb5ca800a9b641b1d78200
 2012-11-29 20:31:56 -08:00
Satoshi Kataoka
6ae8dd4343 Tweak beeline speed 
Change-Id: I77bbd5e1888281e838d87824dc04a574b1a7ecb7
 2012-11-30 02:02:59 +09:00
Kurt Partridge
061da39c0f Merge "ResearchLogger add debugging code" 2012-11-29 06:45:25 -08:00
Kurt Partridge
bf9db1cc83 Merge "ResearchLogging fix password field collection" 2012-11-29 06:05:01 -08:00
Tadashi G. Takaoka
e14df775d4 Make RoundedLine member variables as method parameters (Step 5) 
Change-Id: Ib2ade2bf51c293c65fc9206a9a16694e6d18da50
 2012-11-29 16:50:52 +09:00
Tadashi G. Takaoka
f90475b5d4 Make RoundedLine as top level class (Step 4) 
Change-Id: Id52baefb3d61eb46b3679e1ba3aa7ef7cd020efc
 2012-11-29 16:28:12 +09:00
Kurt Partridge
565b9d2add ResearchLogger add debugging code 
Change-Id: I03729506984f259dee63f3a66fd91963e3403d16
 2012-11-28 22:46:31 -08:00
Tadashi G. Takaoka
1a6d56e31d Consolidate point calculating and path creating methods into one (Step 3) 
Change-Id: Id49eee7c38595ea312dc9a63341a376825030035
 2012-11-29 14:28:59 +09:00
Tadashi G. Takaoka
8cfd64eed9 Make rounde line algorithm as instance method (Step 2) 
Change-Id: Ia6f41dc0ce7d3f3a1e4a8bbe838835cbdd94e6e9
 2012-11-29 14:22:30 +09:00
Tadashi G. Takaoka
0d034b3169 Consolidate data and algorithm of calculating rounded line (Step 1) 
Change-Id: Ic6d72b5a34ddfbc55317fa651f78af6f50c9a284
 2012-11-29 14:14:49 +09:00
Kurt Partridge
6c95f97a93 ResearchLogging fix password field collection 
password data collection was too "sticky"; the next field wouldn't be collected either.

Change-Id: I739a956f663cff33216f83ac453b2a89d8c33dde
 2012-11-28 19:15:12 -08:00
Tadashi G. Takaoka
359c35e0f6 Add CoordinateUtils class 
Change-Id: I23784117f77da54ee2a0670e65d86e26d762a687
 2012-11-28 19:03:28 +09:00
Tadashi G. Takaoka
2200dbbf09 Merge "Set additional subtypes before getting current subtype" 2012-11-27 22:22:31 -08:00
Tadashi G. Takaoka
85e397cd10 Set additional subtypes before getting current subtype 
Bug: 7594188
Change-Id: I1977acb7189f8eb186b9b20a3e5b64b4aaabf191
 2012-11-28 14:49:38 +09:00
Tadashi G. Takaoka
2db9e1c447 Fix typo in method name 
This is a follow up of I6f851248.

Change-Id: I3fe17f3c81ed35e7c38ac9701e73c6b2c1ca8d63
 2012-11-28 14:35:37 +09:00
Tadashi G. Takaoka
0567d144a3 am 7ba02315: am b172725c: am 7d045829: Request update shift state after shift-chording input 
* commit '7ba02315abf3f6fe2e40fcb248ccf1cab8dee179':
  Request update shift state after shift-chording input
 2012-11-27 11:36:53 -08:00
Tadashi G. Takaoka
7ba02315ab am b172725c: am 7d045829: Request update shift state after shift-chording input 
* commit 'b172725c8dc26bc96667135d1b17396f2a6257b4':
  Request update shift state after shift-chording input
 2012-11-27 11:34:00 -08:00
Tadashi G. Takaoka
72fd0968e5 Provide gesture data even if the finger stays still 
Bug: 7595187
Change-Id: I6f85124815f18706b2b2b5b5da2783dffd246e8c
 2012-11-27 18:33:16 +09:00
Tadashi G. Takaoka
b3f789799a Cancel gesture typing by sliding out from keyboard 
Bug: 7594165
Change-Id: I7849d763e49b57716e8418fb8b6f90eca3a5d2ec
 2012-11-22 17:49:56 +09:00
Tadashi G. Takaoka
befc1a05c9 Fix keyboard theme initializing bug 
Change-Id: If7037f3e0606ee34d1a6739cc39da23de18cc35c
 2012-11-22 11:41:53 +09:00
Tadashi G. Takaoka
7d045829b8 Request update shift state after shift-chording input 
Bug: 7529860
Change-Id: Iec82459348722be358ae2ded15deafac21749dcd
 2012-11-21 16:12:40 +09:00
Jean Chalard
e36af707c8 resolved conflicts for merge of b7e6bbae to master 
Change-Id: Ic02809190721472d138532d2189328519117e042
 2012-11-21 13:07:31 +09:00
Jean Chalard
b7e6bbaebc am 3acd0c7a: am f732f4dd: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev 
* commit '3acd0c7a9f4a5f17897a4fe51b023d6f14ba7ef0':
  Only add spaces automatically when appropriate.
 2012-11-20 19:38:47 -08:00
Jean Chalard
f732f4ddcc Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev 2012-11-20 19:36:50 -08:00
Tadashi G. Takaoka
e44ce053e7 am 8a5b176f: am fd1267e3: Add Spanish United States keyboard (DO NOT MERGE) 
* commit '8a5b176f655a46f1c575886a7d3a3c1120c91b29':
  Add Spanish United States keyboard (DO NOT MERGE)
 2012-11-20 18:58:29 -08:00
Tadashi G. Takaoka
d2266d22c9 Merge "Reorganize currency keys" 2012-11-20 02:29:37 -08:00
Tadashi G. Takaoka
c27e899dbe Reorganize currency keys 
Add Rial(ar), Indian Rupee(hi), Tugrik(mn), Baht(th), Hryvnia(uk),
Dong(vi) currency sign keys to symbol layout.

Bug: 7455289
Change-Id: I0f819631ff05c4a31d3a6868dea5e18a1797f103
 2012-11-20 18:04:55 +09:00
Jean Chalard
c82c0d0ef2 Merge "Fix variation dumping." 2012-11-19 23:56:47 -08:00
Jean Chalard
4d0fa31779 Fix variation dumping. 
Variations are not flags - they should not be OR'd in this way.
Only one variation may be active at a time.

Change-Id: I9d3d4c8fc04af56c914c65f9c55f1e7b9517fc68
 2012-11-20 16:55:16 +09:00
Jean Chalard
ec60d60078 Only add spaces automatically when appropriate. 
Correctly check the variations to determine if we should
add automatic spaces (in manual picks and gestures) or not.

Bug: 7164981
Change-Id: I19e25af839b4062c217113cd804b1473912f22a5
 2012-11-19 19:47:40 +09:00
Tadashi G. Takaoka
76d4ffeebf Add Spanish United States keyboard 
The subtype locale name on the spacebar will be suppressed when only
one subtype is enabled and
 - Subtype locale is equal to the system locale.
or
 - Subtype language is equal to the system language but the subtype is
   implicitly enabled.

Thus the "es_ES" system locale chooses "es" subtype keyboard
implicitly but the keyboard doesn't have the subtype name on its
spacebar.

This change also removes Spanish Latin America keyboard.

Bug: 7531804
Change-Id: Ib929e8235d643c0ba039eb010e18ab721a734e15
 2012-11-19 15:39:44 +09:00
Tadashi G. Takaoka
fd1267e396 Add Spanish United States keyboard (DO NOT MERGE) 
Bug: 7531804
Change-Id: Idd66ee30e5228260540308a97c930185b48e775f
 2012-11-19 11:27:07 +09:00
Ken Wakasa
41a2c10e72 resolved conflicts for merge of 4ad92578 to master 
Change-Id: I29ad9f0ba357e39889e30c9ebfcf61f9d08ee4ef
 2012-11-17 11:33:48 +09:00
Ken Wakasa
4ad92578dd am 7acd310d: am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev 
* commit '7acd310d02f060f3e3e29000db902dffb6b0df9c':
  Revert "Only add spaces automatically when appropriate."
 2012-11-16 18:05:42 -08:00
Ken Wakasa
f9ff4fb5da Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev 2012-11-16 18:00:15 -08:00
Ken Wakasa
5986931fcb Revert "Only add spaces automatically when appropriate." 
This reverts commit 6ce66d1c7d

Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a
bug: 7565414
 2012-11-16 17:49:22 -08:00
Marco Nelissen
ea23a28557 resolved conflicts for merge of 6f42cf1d to master 
Change-Id: I054bb0cfba9de06473100010a76e2f3d9c2c1180
 2012-11-16 11:23:33 -08:00
Jean Chalard
3a9f84a197 am 8c470f16: am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev 
* commit '8c470f16db291e257ac538bd0ac2a9354d34010c':
  Fix a bug with some text fields
 2012-11-16 10:36:15 -08:00
Ken Wakasa
fe9ec6bc7d Remove unused variables 
Change-Id: Ia5079368a1bc86ccdf0052445dc6945041c0abca
 2012-11-16 19:28:56 +09:00
Jean Chalard
6f42cf1dee am 3dd4548e: am 191d49ae: Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev 
* commit '3dd4548ec6105ca774e84ab3223bdbcea1e4902e':
  Only add spaces automatically when appropriate.
 2012-11-15 19:14:00 -08:00
Jean Chalard
191d49ae8a Merge "Only add spaces automatically when appropriate." into jb-mr1.1-dev 2012-11-15 19:09:04 -08:00
Jean Chalard
6ce66d1c7d Only add spaces automatically when appropriate. 
Bug: 7164981
Change-Id: Id672104a0fda99c52923913fb0e40c3a1ead4787
 2012-11-15 17:57:16 +09:00
Jean Chalard
8c470f16db am 5dee6e69: am 187e683a: Merge "Fix a bug with some text fields" into jb-mr1.1-dev 
* commit '5dee6e69f1de114df1f258fdc62559237989dc75':
  Fix a bug with some text fields
 2012-11-14 20:40:33 -08:00
Jean Chalard
187e683aea Merge "Fix a bug with some text fields" into jb-mr1.1-dev 2012-11-14 20:37:19 -08:00
Tadashi G. Takaoka
0dfb89b41e am eea28db3: am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev 
* commit 'eea28db3333a734bf73e688b8335245929d5f322':
  Update shift state only when input field is restarted
 2012-11-14 16:34:42 -08:00
Tadashi G. Takaoka
eea28db333 am d4886ff5: am 929bfdd0: Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev 
* commit 'd4886ff5419003c3bf996939ba87e4b49bcdbfae':
  Update shift state only when input field is restarted
 2012-11-14 16:33:20 -08:00
Tadashi G. Takaoka
dda024cf30 am 428d1b64: am 4826c3ff: Merge "Fix language switch key behavior (DO NOT MERGE)" into jb-mr1.1-dev 
* commit '428d1b6469b5bc9041c35a7e1ee1476d5aacedd7':
  Fix language switch key behavior (DO NOT MERGE)
 2012-11-14 16:33:19 -08:00
Tadashi G. Takaoka
929bfdd059 Merge "Update shift state only when input field is restarted" into jb-mr1.1-dev 2012-11-14 16:29:43 -08:00
Tadashi G. Takaoka
d0725a6842 Update shift state only when input field is restarted 
Bug: 7482766
Change-Id: Ifdfa110c44b95acfbcd3e0aa34f675c70b7d7285
 2012-11-14 18:44:43 +09:00
Tadashi G. Takaoka
4a3d4620fc Merge "Fix language switch key behavior" 2012-11-14 01:42:12 -08:00
Tadashi G. Takaoka
d62be28515 Fix language switch key behavior (DO NOT MERGE) 
Bug: 7075923
Change-Id: If139411db4aa65eed64337bf2a79387cfcd04496
 2012-11-14 18:29:01 +09:00
Tadashi G. Takaoka
1931c1cab1 Fix language switch key behavior 
Bug: 7075923
Change-Id: I306e1ff5d9f873541e84e1fafb64b9473947f623
 2012-11-14 18:27:00 +09:00
Tadashi G. Takaoka
ee672144c9 Merge "Swap single and double quotation marks in Spanish tablet keyboard" 2012-11-13 23:00:53 -08:00
Tadashi G. Takaoka
0d3eb7d963 Swap single and double quotation marks in Spanish tablet keyboard 
Bug: 6672279
Change-Id: I120613e36ba6a690e54447fa6c9c90e131f2a155
 2012-11-14 15:54:19 +09:00
Satoshi Kataoka
1ee6e14507 Hide statustics logging option 
Change-Id: I1ee258948a8335af7996f9e3afcc0508adbb1ac0
 2012-11-14 14:01:52 +09:00
Jean Chalard
00c0010ccf Fix a bug with some text fields 
Not sure when this happens exactly, but it is possible that
InputConnection#getTextBeforeCursor returns null. This
happens for example upon rotating the screen with the
composing field empty in Gmail.
In this case, StringBuilder#append will convert the null
pointer into the string "null", which is sure better than a
crash, but can have a number of bad side-effects, like
auto-caps not working.

Bug: 7533034
Change-Id: Ia1cfab432c13a12ff1c2f013c59bac05a587f553
 2012-11-14 12:22:40 +09:00
Jean Chalard
372f9da4f9 am 18ff5612: am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev 
* commit '18ff56125345746e288118d177fcabf3c079ead3':
  Make sure all FDs are correctly closed.
 2012-11-13 18:47:02 -08:00
Jean Chalard
18ff561253 am f592270a: am 7648b37d: Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev 
* commit 'f592270a0f092c5ef52bbb0f24c8873f46e75503':
  Make sure all FDs are correctly closed.
 2012-11-13 18:45:42 -08:00
Jean Chalard
7648b37d1e Merge "Make sure all FDs are correctly closed." into jb-mr1.1-dev 2012-11-13 18:42:35 -08:00
Jean Chalard
5c32b6da44 Make sure all FDs are correctly closed. 
In this kind of series of calls, it's possible that an outer call to a
constructor fails, but the inner succeeded.
Example:
try {
    is = new A(new B());
} finally {
    if (null != is) is.close();
}
In this case, if new B() succeeds but new A() throws an
exception, is stays null and the intermediate object is never
closed. This is what was happening in this instance.

Bug: 7377336
Change-Id: I3fae9fec1135244982fcf5098c76d93f3e0f2add
 2012-11-13 16:53:07 +09:00
Jean Chalard
80d7d32424 am d2116eb2: am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev 
* commit 'd2116eb2ea7d08e81b7efe5e342772ffcd8a7efc':
  Don't restrict reset composing state to non-identical setText
 2012-11-12 23:48:20 -08:00
Jean Chalard
1b909c2846 Resolve conflicts for merge of 3a9ba17f to master" 
Change-Id: I8a1a84a81745a708f63e4211267c4afc3a6b8e49
 2012-11-13 16:34:23 +09:00
Jean Chalard
d2116eb2ea am 7d34763e: am fac619a3: Merge "Don\'t restrict reset composing state to non-identical setText" into jb-mr1.1-dev 
* commit '7d34763e23cb49c8c96dbf9b4c613e17098dd919':
  Don't restrict reset composing state to non-identical setText
 2012-11-12 23:04:39 -08:00
Jean Chalard
3a9ba17fd2 am a13a8a58: am 0e84041b: Refactor all phantom-space-inserted spaces in one place 
* commit 'a13a8a58e05ecd3f9eccdc47ceca972a814d247e':
  Refactor all phantom-space-inserted spaces in one place
 2012-11-12 23:04:37 -08:00
Jean Chalard
fac619a34c Merge "Don't restrict reset composing state to non-identical setText" into jb-mr1.1-dev 2012-11-12 23:00:12 -08:00
Jean Chalard
0e84041bf7 Refactor all phantom-space-inserted spaces in one place 
Bug: 7164981
Change-Id: If1635c212b2d5d9cf51f5fb074f3b20dd7ec7b2a
 2012-11-13 12:53:55 +09:00
Jean Chalard
61cc2a3391 Don't restrict reset composing state to non-identical setText 
Bug: 7497063
Change-Id: Ifbd5c37408131867458fd921bdef46ef90d81478
 2012-11-12 18:34:18 +09:00
Tadashi G. Takaoka
eaaee28647 Merge "Enhance ImfUtils to InputMethodManagerWrapper class" 2012-11-11 22:43:07 -08:00
Tadashi G. Takaoka
6fbbab3b84 Enhance ImfUtils to InputMethodManagerWrapper class 
Change-Id: I6ff86ee819a446dd3ed5f9c3400d23564027b020
 2012-11-12 15:23:43 +09:00
Tadashi G. Takaoka
21177c1afe Remove gesture typing settings when disabled by configuration 
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
 2012-11-09 07:58:27 -08:00
Jean Chalard
01d47b8096 Fix a logic flaw. 
This test is seriously wrong : although we do have a method that
does exactly the right thing, this looks at a very specific, unrelated
variable state in hope it happens to be set only in the relevant
cases by the play of logic.
I don't think this changes anything concretely, as the assumption
was probably true in the practice ; still, this code is very hard to
read and prone to unexpected breakage.

Change-Id: I77ab576f90762429fcc752df31ed30e1c81871dc
 2012-11-09 19:16:37 +09:00
Ken Wakasa
710d06cea9 Suppress dictionary pack support when IS_EXPERIMENTAL is true 
Change-Id: If8813cb989c1fa8744a3bf36e8514ced3c8f46a3
 2012-11-09 15:03:31 +09:00
Tadashi G. Takaoka
c43ff6f66c Remove gesture typing settings when disabled by configuration 
Bug: 7506408
Change-Id: I4de53ace170d5ddc9779f42ac344c4190c80a019
 2012-11-09 12:44:40 +09:00
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
Ken Wakasa
1e61493c50 Use 32-bit code points for suggestions output 
This is a multi-project commit with Ic43dd666

bug: 6526418
Change-Id: I39c1acb4e91d04cd8a4ec5a943c8cf575da75ebc
 2012-11-01 00:09:51 +09:00
Tadashi G. Takaoka
0ea2c80d8d Merge "Consolidate two helper methods (refactor step 3)" 2012-10-31 03:58:47 -07:00
Tadashi G. Takaoka
661bc810e5 Merge "Flatten nested if-else blocks into plain if-else blocks (refactor step 2.5)" 2012-10-31 03:46:05 -07:00