Commit Graph

5744 Commits (af348131270d5865865df32f1768311a8f26a5cb)

Author SHA1 Message Date
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
Baligh Uddin 8fd5aa9583 Merge "Import translations. DO NOT MERGE" 2012-12-06 13:42:52 -08:00
Baligh Uddin ae25e2c408 Import translations. DO NOT MERGE
Change-Id: Iec4037b7d6e6d13dbc057f7d5fcd94785a63b542
Auto-generated-cl: translation import
2012-12-06 10:59:24 -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 d582c38ba8 Merge "Remove a couple Eclipse and Android Lint warnings" 2012-12-06 04:34:39 -08:00
Jean Chalard 2da8866518 Remove a couple Eclipse and Android Lint warnings
Change-Id: I0c29c5d2abcbf80759b996d34b534deb083cd7d3
2012-12-06 21:30:51 +09:00
Jason Chen 5cb40f8a76 Fix IME settings icons
Imported assets were too small. Fixed by pulling in the correctly
sized assets.

Bug: 7556843
Change-Id: I182181d258f8797ec3fbf9b2cbe1380d71a8075a
2012-12-05 16:05:18 -08: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
Baligh Uddin 6ec4423878 Import translations. DO NOT MERGE
Change-Id: I14e7f5010ca72fe9ea0ab2304ffd018a82525f6f
Auto-generated-cl: translation import
2012-12-05 14:02:25 -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
Baligh Uddin 88dcc967e7 Import translations. DO NOT MERGE
Change-Id: I0b3b03ce1974fba5f25fef74fa1937dce83b102f
Auto-generated-cl: translation import
2012-12-04 12:40:51 -08: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 8918cb46f6 Merge "Fix crashes related to setSpan(-1 ... -1) errors" 2012-12-03 19:32:42 -08: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
Baligh Uddin a89f955d22 Import translations. DO NOT MERGE
Change-Id: I68e4fa66d5fa8b9160161a079263d89d01c037ee
Auto-generated-cl: translation import
2012-12-03 12:34:23 -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
Jean Chalard 2cff609e0f am bb0c18f7: am cb1077b8: Merge "Match RU dictionary header." into jb-mr1.1-dev
* commit 'bb0c18f73d448b6231d8aca9083d3798447e3baf':
  Match RU dictionary header.
2012-11-27 11:34:04 -08:00
Jean Chalard 94f1925d5e am fa98633e: am 240383fd: Merge "Update the dictionaries" into jb-mr1.1-dev
* commit 'fa98633ed45715b38fbd3c355bc4dc224ae09163':
  Update the dictionaries
2012-11-27 11:34:02 -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
Jean Chalard cb1077b842 Merge "Match RU dictionary header." into jb-mr1.1-dev 2012-11-26 21:11:54 -08:00
Jean Chalard 240383fd84 Merge "Update the dictionaries" into jb-mr1.1-dev 2012-11-26 19:57:58 -08:00
Tadashi G. Takaoka ebbb586693 Fix Gingerbread theme color for gesture typing
Change-Id: I96a660ce8ee35fe90dc29e6d7f52528c0b34b7cb
2012-11-27 12:17:25 +09:00
Jean Chalard 4d645255cb Match RU dictionary header.
This brings the changes of I837831b1 to MR1.1
>>> dictionaries/ru_wordlist.combined.gz
>>> java/res/raw/main_ru.dict
Header :
  date : 1353500945 <=> 1353567943
  MULTIPLE_WORDS_DEMOTION_RATE : null <=> 0
Body :
  No differences

Bug: 7540132
Change-Id: I81f281fda881ad1252cdf6cf2d0947a12a2dac27
2012-11-26 12:42:34 +09:00
Jean Chalard 71e1496ab0 Merge "Update RU dictionary header." 2012-11-25 19:31:16 -08:00
Tadashi G. Takaoka d4b6cbfd94 Merge "Cancel gesture typing by sliding out from keyboard" 2012-11-22 00:50:26 -08: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
Jean Chalard b40a1ce50b Update RU dictionary header.
>>> dictionaries/ru_wordlist.combined.gz
>>> java/res/raw/main_ru.dict
Header :
  date : 1353500945 <=> 1353567943
  MULTIPLE_WORDS_DEMOTION_RATE : null <=> 0
Body :
  No differences

Bug: 7540132
Change-Id: I837831b1e214da64962cf1bb68c840a3d4e6bf76
2012-11-22 16:21:10 +09:00
Jean Chalard 526371f2c4 Update the dictionaries
This brings the dictionaries to the same level as
master. The change in master reflected by this
change is I94fe7f8f.

- XML de dict :
  Update header only.
- XML en dict :
  Add the not_a_word flag to all whitelist entries.
  Demote "il:92" and "shel:52" to freq 0.
- XML en_GB dict :
  Add the not_a_word flag to all whitelist entries.
  Add "milk:122" and "practice:143"
- XML fr dict :
  Add missing words : "Nostradamus:40" "défendais:30"
  "gmail:50" "générale:140" "hm:0" "hmm:0" "y'en:130"
  "l'apocalypse:31" "m'épuise:30" "recontacter:80"
  "t'annonce:30"
  Set freq of non-word shortcuts for digraphs to 1 instead
  of 0, allowing to gesture them.
- XML ru dict :
  Remove a lot of two-character non-words.

- Binary de dict :
  Remove the obsolete "options" header, and add the "dictionary"
  header.
- Binary en dict :
  Flag "hoe" "hoes" "il" "shel" as non-words.
  Also drop freq of "il" and "shel" to 0
  Add the "locale" header that was missing.
- Binary es dict :
  Add the "dictionary" header.
- Binary fr dict :
  Add the same words as above. Non-word shortcuts were already
  set to 1.
- Binary it dict :
  Add a "dictionary" header. Also change freq of
  "Šarapova" from 50 to 37; not sure why it was 50.
- Binary pt_BR dict :
  Add a "dictionary" header.
- Binary ru dict :
  Add a "dictionary" header and remove the same words as above.

Bug: 7458565
Change-Id: I22dd176ed2df99b847047f2d1045f6d861ccb8b0
2012-11-22 15:32:45 +09:00
Jean Chalard 9380e64188 Merge "Update dictionaries and fix mistakes" 2012-11-21 21:49:25 -08:00
Tadashi G. Takaoka befc1a05c9 Fix keyboard theme initializing bug
Change-Id: If7037f3e0606ee34d1a6739cc39da23de18cc35c
2012-11-22 11:41:53 +09:00
Jean Chalard d5f53710c5 Update dictionaries and fix mistakes
- Combined de dict :
  Remove digraph shortcuts that were in by mistake.
- Combined en dict :
  Set freq of "baton" "batons" "mace" "puff"
  "puffs" and "tasers" to zero. They are offensive
  in en_GB.
- Combined en_GB dict :
  Change freq of "il" to 0 and flag it "not a word". Still
  in the dict as a whitelist entry for "I'll"; for some
  reason it had freq 99.
  Add "milk:122" and "practice:143"
- Combined fr dict :
  Add missing words : "Nostradamus:40" "défendais:30"
  "gmail:50" "générale:140" "hm:0" "hmm:0" "y'en:130"
  "l'apocalypse:31" "m'épuise:30" "recontacter:80"
  "t'annonce:30"
  Set freq of non-word shortcuts for digraphs to 1 instead
  of 0, allowing to gesture them.
- Combined ru dict :
  Remove a lot of two-character non-words.

- Binary de dict :
  Remove the obsolete "options" header, and add the "dictionary"
  header.
- Binary en dict :
  Flag "hoe" "hoes" "il" "shel" as non-words.
  Also drop freq of "il" and "shel" to 0
  Add the "locale" header that was missing.
- Binary es dict :
  Add the "dictionary" header.
- Binary fr dict :
  Add the same words as above. Non-word shortcuts were already
  set to 1.
- Binary it dict :
  Add a "dictionary" header. Also change freq of
  "Šarapova" from 50 to 37; not sure why it was 50.
- Binary pt_BR dict :
  Add a "dictionary" header.
- Binary ru dict :
  Add a "dictionary" header and remove the same words as above.

For all dictionaries : bump the version to 27.

Change-Id: I94fe7f8f42b31fdad223085c00a94115e14d2276
2012-11-21 22:03:24 +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 40f7b43b3f am 82cc7349: am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit '82cc7349254e1ca3722ead1f108b6c53820432d5':
  Correctly add double quote to the space strippers
2012-11-20 20:14:13 -08: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 82cc734925 am b9385ff9: am cdbf6fb5: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit 'b9385ff9be484487a523c1eb6db4eba33ef2359d':
  Correctly add double quote to the space strippers
2012-11-20 19:42:18 -08: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 cdbf6fb541 Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev 2012-11-20 19:37:54 -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
Jean Chalard c5653daf72 Correctly add double quote to the space strippers
...without removing space, this time.
Also add a test to make sure it is working.

Bug: 7531719
Change-Id: I3afcc433c6cdc2774e7deeb6d358356db5035d35
2012-11-19 17:48:19 +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 9904c9ebbd am 333881c4: am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
* commit '333881c434f3905763dd92a585b17f9c515dd8a8':
  Revert "Correctly add double quote to the space strippers"
2012-11-16 18:38:02 -08: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 333881c434 am 1f256e94: am 66cee1f9: Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev
* commit '1f256e941b746a3ccfbd0b60d5e6ccd09d3a3af1':
  Revert "Correctly add double quote to the space strippers"
2012-11-16 18:25:57 -08:00
Ken Wakasa 66cee1f92d Merge "Revert "Correctly add double quote to the space strippers"" into jb-mr1.1-dev 2012-11-16 18:20:49 -08:00
Ken Wakasa 86e554739f Revert "Correctly add double quote to the space strippers"
This reverts commit af7264abb7

Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877
bug: 7561815
2012-11-16 18:17:10 -08: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
Jean Chalard 2feb6b5b52 am 12c2e437: am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit '12c2e437949414ce52b7e40ad191f15c844726e9':
  Correctly add double quote to the space strippers
2012-11-16 10:36:12 -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 12c2e43794 am d7dbaa9c: am e4958d5c: Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev
* commit 'd7dbaa9cb6d6b511ad80ac770bc1de328ad95d76':
  Correctly add double quote to the space strippers
2012-11-14 20:39:08 -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
Jean Chalard e4958d5c18 Merge "Correctly add double quote to the space strippers" into jb-mr1.1-dev 2012-11-14 20:35:19 -08:00