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

6724 commits

Author SHA1 Message Date
Kurt Partridge
1f70a4d681 Merge "Allow logging while replaying" 2013-04-09 02:33:09 +00:00
Kurt Partridge
d117c1a116 Merge "Do not record log split time when handling separator" 2013-04-09 02:31:48 +00:00
Baligh Uddin
e4760624ce Import translations. DO NOT MERGE 
Change-Id: I3605a7fd941d9ebe76460d114f384b1e233b3440
Auto-generated-cl: translation import
 2013-04-08 14:47:06 -07:00
Ken Wakasa
d17c8bd929 Update comments 
Change-Id: I6aef328ec9041666cc168c8323bed04d39591b71
 2013-04-08 23:05:45 +09:00
Ken Wakasa
370461ef9f Clean up a few option strings under the Advanced settings 
Change-Id: If41ac016128fce401dedcab0fa7d6c23edaca158
 2013-04-08 01:16:32 +09:00
Jean Chalard
c87449497c Fix bugs and add tests 
Change-Id: I6b56b91ace57f4a49584b5dceb71b145859f839e
 2013-04-05 12:11:19 +09:00
Jean Chalard
7d3836d63a Move a generic string utility to StringUtils 
Change-Id: I9cc2e9a7ac0b3346af40bcb083f939333336cf09
 2013-04-05 12:09:14 +09:00
Kurt Partridge
3547bd2932 am 228d4533: am 5779bc91: Merge "Split LogUnits differently." 
* commit '228d45337bdf3bd2bcd0170ddf73ab05b4f7e53f':
  Split LogUnits differently.
 2013-04-03 19:33:00 -07:00
Kurt Partridge
3ec6a8bdf9 am 6c522b53: am 0c0ab2b4: Merge "Reorder ResearchLogger call" 
* commit '6c522b53f0950fa511bf93e1e506434e7cdef6ad':
  Reorder ResearchLogger call
 2013-04-03 19:27:26 -07:00
Tadashi G. Takaoka
b1533116f5 am b08506c2: am 9413e957: Merge "Interpolate gesture preview trails" 
* commit 'b08506c2211490fb42617f30dbd8901bf5651b47':
  Interpolate gesture preview trails
 2013-04-03 19:27:22 -07:00
Jean Chalard
873c20ba06 am e40d5633: am 43341ba0: Merge "Ask the client to make itself known when it\'s not" 
* commit 'e40d5633659a401e1357e1c530238ed74cc158f6':
  Ask the client to make itself known when it's not
 2013-04-03 19:27:20 -07:00
Jean Chalard
3b9d7fd179 am 151e4e18: am 065f126f: Merge "Fix two nasty bugs with surrogate pairs." 
* commit '151e4e182c86a2b7aea534bda777e9e9aafa549b':
  Fix two nasty bugs with surrogate pairs.
 2013-04-03 19:27:19 -07:00
Jean Chalard
4c535232bc am a38d907b: am 740da0d8: Fix an NPE 
* commit 'a38d907b96882f41174d6cf7d0da6faefcc97228':
  Fix an NPE
 2013-04-03 19:27:15 -07:00
Tadashi G. Takaoka
76c00decc9 am 7580e994: am 48d8d8d0: Fix potential NPE in MainKeyboardView.KeyTimerHandler 
* commit '7580e9945ba096a2a084a6f571c2bd1a945dec8c':
  Fix potential NPE in MainKeyboardView.KeyTimerHandler
 2013-04-03 19:27:13 -07:00
Jean Chalard
86b8b7b407 am 9bf1dfeb: am 2188cbae: Merge "Fix an NPE" 
* commit '9bf1dfebd8e51fb16ac26c59de9aa646b4499765':
  Fix an NPE
 2013-04-03 19:27:12 -07:00
Jean Chalard
1c63efc975 am a657afc3: am d555a0d7: Merge "Cleanup" 
* commit 'a657afc32e099d1b12516788e1a32d1303ced295':
  Cleanup
 2013-04-03 19:27:11 -07:00
Jean Chalard
a747d76285 am 6e78878f: am 844e5014: Merge "Increase string limits" 
* commit '6e78878f7b038afa46afc75117cd773e2d181a5c':
  Increase string limits
 2013-04-03 19:21:06 -07:00
Satoshi Kataoka
395e500b09 am bb9a8e08: am f463b45d: Merge "Fix Possible NPE" 
* commit 'bb9a8e082aebbcdd46e4d2378d9839f896c15476':
  Fix Possible NPE
 2013-04-03 19:21:01 -07:00
Satoshi Kataoka
0c99a379bd am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE" 
* commit 'e42522f33566857402a8db645f58de2818456dc7':
  Fix possible SIOOBE
 2013-04-03 19:21:00 -07:00
Kurt Partridge
35e02ccdda am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView" 
* commit 'bf62dc036f1e71751c8713ff13e686bbf635d6c3':
  Close ResearchLogger upon onFinishInputView
 2013-04-03 19:20:59 -07:00
Baligh Uddin
4b8494c4fc Import translations. DO NOT MERGE 
Change-Id: I66b30c5f9673fc4ed3b96753cfec023e7d498dec
Auto-generated-cl: translation import
 2013-04-03 13:13:26 -07:00
Baligh Uddin
4cdb7ccb32 Import translations. DO NOT MERGE 
Change-Id: Ic405d085ced9e64efd9b7da38097734c71808fbc
Auto-generated-cl: translation import
 2013-04-03 13:06:22 -07:00
Tadashi G. Takaoka
6e3f307266 Refactor SpellCheckerProximityInfo as extending ProximityInfo 
Change-Id: I544eec9d661796d57749dbaa2163bc1e2a891353
 2013-04-02 19:06:32 +09:00
Jean Chalard
ecb59eff90 Revert "[DO NOT MERGE] Activate hardware keyboard handling" 
This reverts commit c741f1f83b
DO NOT MERGE is ignored and this is merged anyway :(

Change-Id: Ie044cdfc6021933379ec97ad7346c5c8591f70bf
 2013-04-02 16:08:48 +09:00
Jean Chalard
c741f1f83b [DO NOT MERGE] Activate hardware keyboard handling 
Change-Id: Ifdec9338a454291621b2b87c899f5d4301480b27
 2013-04-02 15:38:13 +09:00
Kurt Partridge
30772c3758 Allow logging while replaying 
Previously logging was disabled during replay.  This makes it impossible to use logged data as a
regression test, since the new log was unavailable.  This change corrects this problem.

Change-Id: I19dc31def2f2f87fd219dc561c739d18e4ab9c9c
 2013-04-01 16:49:39 -07:00
Kurt Partridge
636b8c4231 Do not record log split time when handling separator 
Previously handleSeparator() caused the ResearchLogger to mark the time at which a LogUnit should be
broken.  However, this causes the motion data associated with a separator to be associated with the
LogUnit of the previous word.  This change corrects this bug.

Change-Id: I8b4d4fa6de2a013de9e2a28bb668c446a07f1957
 2013-04-01 16:48:15 -07:00
Kurt Partridge
5779bc91e6 Merge "Split LogUnits differently." 2013-04-01 23:08:21 +00:00
Baligh Uddin
02fc1ed512 Merge "Import translations. DO NOT MERGE" 2013-04-01 20:54:38 +00:00
Baligh Uddin
2caa1d81ce Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-04-01 20:53:56 +00:00
Kurt Partridge
0c0ab2b4d9 Merge "Reorder ResearchLogger call" 2013-04-01 15:19:45 +00:00
Jean Chalard
0745fe83d4 am b8869ec1: am 0fcc4960: Deactivate hardware keyboard handling. 
* commit 'b8869ec1e39c1751825841e790d21fc854dca9ce':
  Deactivate hardware keyboard handling.
 2013-04-01 05:42:42 -07:00
Jean Chalard
b8869ec1e3 am 0fcc4960: Deactivate hardware keyboard handling. 
* commit '0fcc4960bcd037b7e1482098f85342743eb2ddee':
  Deactivate hardware keyboard handling.
 2013-04-01 05:40:07 -07:00
Jean Chalard
0fcc4960bc Deactivate hardware keyboard handling. 
Bug: 8000119

Change-Id: I021481343d6d87efd8ff6110e9aa0906a1a3d11d
 2013-04-01 21:35:45 +09:00
Tadashi G. Takaoka
75028af28c Interpolate gesture preview trails 
There is the boolean flag to kill interpolation.

Bug: 7167303
Change-Id: Iac7e4cb88cf437c2ee77c003c9cddb92416025c7
 2013-04-01 19:15:36 +09:00
Jean Chalard
43341ba042 Merge "Ask the client to make itself known when it's not" 2013-04-01 09:00:25 +00:00
Jean Chalard
76d5f512f9 Ask the client to make itself known when it's not 
Upon invoking the settings of the dictionary pack with an unknown
client, we now launch an intent to ask the client to make itself known.
This change also includes the code that receives this intent and
acts upon it.

Bug: 8492879
Change-Id: I2c6496dea845646961ecafcf64e282cb93ee91dc
 2013-04-01 17:37:22 +09:00
Jean Chalard
065f126f1d Merge "Fix two nasty bugs with surrogate pairs." 2013-04-01 08:28:08 +00:00
Jean Chalard
a411595b16 Fix two nasty bugs with surrogate pairs. 
The important bug is in findWordInTree. The problem, which is
not obvious, is that we were calling codePointAt() with the
code point index in the string, instead of the char index.
The other bug this change fixes was harmless in the practice,
because it's in the iteration which is only used for debug and
pretty printing purposes. It's very similar in that it would
substract a length in code point to a length in chars and
truncate a StringBuilder at that length, so it would fail in a
quite similar manner. This changes the meaning of the "length"
attribute in Position, but it's clearer this way anyway.

Bug: 8450145
Change-Id: If396f883a9e6449de39351553ba83f5be5bd30f0
 2013-04-01 17:06:19 +09:00
Baligh Uddin
bd4fdf8e4e Import translations. DO NOT MERGE 
Change-Id: I8752437b40f9f8bcb7b8920bc1dc4342e51b3621
Auto-generated-cl: translation import
 2013-03-29 21:27:10 -07:00
Baligh Uddin
cea6a7a2a3 Import translations. DO NOT MERGE 
Change-Id: I19c04b125fc3d2a6dd7b0a32ee90f098d931f83b
Auto-generated-cl: translation import
 2013-03-29 21:21:20 -07:00
Jean Chalard
740da0d8d0 Fix an NPE 
Also remove an unused method and make 2 private variables
final.

Bug: 8461093
Change-Id: I676d93fda28e82eb5a6978f2e7ad5a0add2cbecf
 2013-03-29 18:41:29 +09:00
Tadashi G. Takaoka
48d8d8d0ae Fix potential NPE in MainKeyboardView.KeyTimerHandler 
Bug: 8469652
Change-Id: Ib7a548e6a24d2e02de85ab444c0ec99d8f6b82c3
 2013-03-28 17:54:36 +09:00
Jean Chalard
2188cbae63 Merge "Fix an NPE" 2013-03-28 06:56:49 +00:00
Jean Chalard
d555a0d77a Merge "Cleanup" 2013-03-28 06:16:40 +00:00
Jean Chalard
28d5f4577f Fix an NPE 
The code was passing the wrong parameter.

Bug: 8492879
Change-Id: I091d62ca29601e3807eed287c7bdad38bf43a502
 2013-03-28 15:08:05 +09:00
Jean Chalard
dae90cfb01 Cleanup 
Seems there was an unclosed cursor :o

Change-Id: I7616849ace5217d8c6f54465f7b3a634e3c14116
 2013-03-28 14:43:32 +09:00
Baligh Uddin
fd0e40ef91 am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki 
* commit '78b07d8b574fe2d1a43e796775b89b116f8f411f':
 2013-03-27 22:09:51 -07:00
Baligh Uddin
78b07d8b57 am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki 
* commit '0cd02c2bd732383766099aa2ec94abc8a8ac174a':
 2013-03-27 22:05:16 -07:00
Tadashi G. Takaoka
33fa6a0b3b am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()" 
* commit 'cc75c950410f206c5bc6406071d256071aeabca9':
  Use XmlPullParser.getEventType()
 2013-03-27 21:59:46 -07:00
Satoshi Kataoka
dd8ca1f821 am bc586fb1: am 0b327101: Merge "Fix possible NPE" 
* commit 'bc586fb1ff553bc640676b348b3b24ee2626bf42':
  Fix possible NPE
 2013-03-27 21:59:44 -07:00
Tadashi G. Takaoka
56b1bd866a am f892f775: am d17b69ec: Clean up XmlParserUtils 
* commit 'f892f7751e1263b71dd1b0a49618f922a16df1ae':
  Clean up XmlParserUtils
 2013-03-27 21:59:43 -07:00
Tadashi G. Takaoka
71fb8af7c5 am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException 
* commit 'ec183b50ff1b44390a44ec94f8910373f7dbf985':
  Fix possible ArrayIndexOutOfBoundsException
 2013-03-27 21:59:39 -07:00
Alan Viverette
8f80758226 am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode. 
* commit 'e47ee18192554877cd202455cbc3c9e932b86728':
  Don't announce changes for A11y within the same keyboard mode.
 2013-03-27 21:45:08 -07:00
Satoshi Kataoka
189c1b0ee8 am 97ddbf22: am 19a70087: Merge "Fix appname" 
* commit '97ddbf22d5c6d4791b3115526fdc885a40009695':
  Fix appname
 2013-03-27 21:45:07 -07:00
Tadashi G. Takaoka
0992fd245b am 1e3c73de: am 3a8a63c3: Remove unused import 
* commit '1e3c73de06caeeba31cb43099f4555e1ed17dba4':
  Remove unused import
 2013-03-27 21:45:06 -07:00
Tadashi G. Takaoka
bb679a224f am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name" 
* commit '3d0fee4e09050676c71276cc1bbd0c8bdeaf14d1':
  Remove reference to string.english_ime_name
 2013-03-27 21:45:05 -07:00
Satoshi Kataoka
4bb504cedb am 45728330: am f4352c2c: Merge "Use correct appname resource" 
* commit '457283308a2bb929a473086040b402c673aca390':
  Use correct appname resource
 2013-03-27 21:45:03 -07:00
Satoshi Kataoka
0cc6314958 am c1c3e03c: am 140b6705: Merge "Fix appname" 
* commit 'c1c3e03c12891dfd8a87f1254c8bc9d9ccc9333a':
  Fix appname
 2013-03-27 21:45:00 -07:00
Tadashi G. Takaoka
dbb90d08b5 am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder 
* commit 'bd7b4fcce0ddf5bca612bcf275e073ddfd49b205':
  Clean up InflateException reference from KeyboardBuilder
 2013-03-27 21:44:59 -07:00
Jean Chalard
844e5014fa Merge "Increase string limits" 2013-03-28 04:07:24 +00:00
Jean Chalard
db5e07f756 Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev 2013-03-28 04:04:28 +00:00
Jean Chalard
eda69e5272 Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144

Change-Id: I7062e533e5d4521d2866a6c5f947c8f25b790675
 2013-03-28 13:03:49 +09:00
Jean Chalard
830cd7b915 [DO NOT MERGE] Increase string limits 
These have been requested by the translators. For some reason the limits
were shorter than the actual source strings. Both these messages are
meant to be displayed alone on the screen, and 50 chars should fit
comfortably.

Bug: 8442366
Bug: 8442144
Change-Id: I7845f85ddee992313f658e0268d090eae73778b3
 2013-03-28 13:01:41 +09:00
Baligh Uddin
8ca085db42 Import translations. DO NOT MERGE 
Change-Id: Ic1a341b949098fc55c0e5f46c976547ba02f8eca
Auto-generated-cl: translation import
 2013-03-27 12:39:26 -07:00
Baligh Uddin
c08b8245d9 Import translations. DO NOT MERGE 
Change-Id: If21c77c39e8945f39c3ecb5186b80fd8229a7659
Auto-generated-cl: translation import
 2013-03-27 12:34:24 -07:00
Baligh Uddin
841e60163b Import translations. DO NOT MERGE 
Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec
Auto-generated-cl: translation import
 2013-03-27 12:32:41 -07:00
Satoshi Kataoka
f463b45d8e Merge "Fix Possible NPE" 2013-03-27 04:51:48 +00:00
Satoshi Kataoka
2cdf5351aa Merge "Fix possible SIOOBE" 2013-03-27 03:28:49 +00:00
Satoshi Kataoka
33306acfa4 Fix possible SIOOBE 
Bug: 8461021

Change-Id: I8b0385610b80b5a672ec380935c485a0e01ae984
 2013-03-27 12:25:02 +09:00
Kurt Partridge
39cb0334d9 Avoid NPE 
Initialize FeedbackLog earlier to avoid NPE

Change-Id: I646944c68a7d092345def16060b2a4edd8c7dbef
 2013-03-26 16:46:43 -07:00
Kurt Partridge
189be5196a Split LogUnits differently. 
Previously an autocorrection caused a new LogUnit to be started,
splitting off the previous LogUnit right at the autocorrection method
time.  This change causes the split to happen before the MotionEvents
that led to the autocorrection being called.

Change-Id: I2504df8eb47ee77e5f46bac34a8450636c03fd9f
 2013-03-26 16:46:43 -07:00
Kurt Partridge
cb25e1fe37 Reorder ResearchLogger call 
Previously, ResearchLogger#onWordFinished() was called with an outdated parameter value for
isBatchMode, causing it to report false even for gestures.  This changes fixes this problem.

Change-Id: Ifcabee236ba5fe20376ad882155d3f3142cd7613
 2013-03-26 14:37:57 -07:00
Kurt Partridge
ef103e1f2e Merge "Close ResearchLogger upon onFinishInputView" 2013-03-26 19:23:00 +00:00
Tadashi G. Takaoka
73d00e68d8 Merge "Use XmlPullParser.getEventType()" 2013-03-26 05:38:18 +00:00
Satoshi Kataoka
435cccb2c5 Fix Possible NPE 
Bug: 8448448
Change-Id: Ibe89c9abd24c4debb33a69c372eadf2afb09ea1c
 2013-03-26 13:02:23 +09:00
Satoshi Kataoka
0b3271010f Merge "Fix possible NPE" 2013-03-26 03:49:06 +00:00
Tadashi G. Takaoka
52f4b04768 Use XmlPullParser.getEventType() 
Change-Id: Ie423d3416639f81409cc920658c8088b7519b045
 2013-03-26 12:13:56 +09:00
Tadashi G. Takaoka
d17b69ec00 Clean up XmlParserUtils 
Change-Id: I636e8f359d47f39e61a7f77e3e686f2721779b6f
 2013-03-26 12:03:07 +09:00
Kurt Partridge
6d71d238e2 [FileEncap18] Clean up uploading scheduling 
- Move scheduling logic from ResearchLogger.java to
  UploaderService.java
- Switch to a one-shot timer.  Previously the uploader was scheduled
  on an inexact repeating schedule.  It's better to reschedule the
  next upload after the current one is finished to reduce the chances
  of multiple uploads happening at the same time.
- Avoid double-execution
    - Previously a scheduled upload might run right after an explicit
      one if they occured at the same time.  This change reduces the
      chances of this.
- Some method extraction and naming

Change-Id: I9efda11be77d334c7f61bd40a36d65f0421ebde4
 2013-03-25 17:50:26 -07:00
Kurt Partridge
87bc3a4a62 Close ResearchLogger upon onFinishInputView 
Previously, ResearchLogger#stop() was called both in
LatinIME#onFinishInputView() and in LatinIME#onWindowHidden().  This
resulted in multiple logs being written.

Since onFinishInputView is the more reliable of the two (it is called
in InputMethodService#onDestroy; onWindowHidden is not), the code now
uses onFinishInputView as a stopping signal.

Change-Id: Iae4b8c3bdab226027624eeab19b3737367e4a108
 2013-03-25 17:31:25 -07:00
Baligh Uddin
6616188ea6 Import translations. DO NOT MERGE 
Change-Id: I8468f1e69374a5ada2ea03e427895b771b8dc048
Auto-generated-cl: translation import
 2013-03-25 15:45:33 -07:00
Baligh Uddin
fba5459750 Import translations. DO NOT MERGE 
Change-Id: I502c6b5a38d4495774179eb587775e713d5c98c9
Auto-generated-cl: translation import
 2013-03-25 15:38:08 -07:00
Satoshi Kataoka
a17dccbfc6 Fix possible NPE 
Bug: 8457109
Change-Id: I321fbef53e20a7c36ef4bd9f544b50abe6a52be9
 2013-03-25 19:00:38 +09:00
Tadashi G. Takaoka
fb658d6c53 Fix possible ArrayIndexOutOfBoundsException 
Bug: 8461864
Change-Id: Icd8f4f51ec064461c08d00c1c58bedf5fbae2553
 2013-03-25 12:37:04 +09:00
Baligh Uddin
afe343c16f Merge "Import translations. DO NOT MERGE" 2013-03-23 01:48:28 +00:00
Baligh Uddin
56a2088e7d Import translations. DO NOT MERGE 
Change-Id: I84d0b4a11df3ac9a5706419e5c9f76eeb8c5cfd1
Auto-generated-cl: translation import
 2013-03-22 13:39:40 -07:00
Baligh Uddin
21160c4eba Import translations. DO NOT MERGE 
Change-Id: I7531241854018cd052606f7f4a9b82fccd2e725c
Auto-generated-cl: translation import
 2013-03-22 13:31:54 -07:00
Alan Viverette
a7b4398c35 Don't announce changes for A11y within the same keyboard mode. 
Bug: 8439108
Change-Id: If9f14bb65625468dcd399df47ad0d2123be30be7
 2013-03-22 11:53:12 -07:00
Satoshi Kataoka
19a7008728 Merge "Fix appname" 2013-03-22 07:23:08 +00:00
Satoshi Kataoka
3c8117c88f Fix appname 
Bug: 6789579
Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528
 2013-03-22 16:19:44 +09:00
Tadashi G. Takaoka
3a8a63c399 Remove unused import 
This is a follow up of I062c076f.

Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83
 2013-03-22 15:23:06 +09:00
Tadashi G. Takaoka
c6452f2569 Merge "Remove reference to string.english_ime_name" 2013-03-22 05:11:50 +00:00
Satoshi Kataoka
f4352c2ce3 Merge "Use correct appname resource" 2013-03-22 05:11:26 +00:00
Satoshi Kataoka
242c066dde Use correct appname resource 
Bug: 6789579
Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8
 2013-03-22 14:08:38 +09:00
Tadashi G. Takaoka
9f3774c194 Remove reference to string.english_ime_name 
Bug: 6789579
Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d
 2013-03-22 14:08:23 +09:00
Baligh Uddin
a3e47f8780 am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev 
* commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...
 2013-03-22 05:01:10 +00:00
Satoshi Kataoka
c1c3e03c12 am 140b6705: Merge "Fix appname" 
* commit '140b6705ece0559f2ea9647044b3baf6a314f3d3':
  Fix appname
 2013-03-21 20:45:30 -07:00
Satoshi Kataoka
140b6705ec Merge "Fix appname" 2013-03-22 03:42:54 +00:00
Satoshi Kataoka
4f6804e5b4 Fix appname 
Bug: 6789579
Change-Id: I224bd1b734f74db31c006601129339c099616ed6
 2013-03-22 11:54:35 +09:00
Tadashi G. Takaoka
bd7b4fcce0 am ee91bde1: Clean up InflateException reference from KeyboardBuilder 
* commit 'ee91bde16c34af80201efb5f8d056caecbbbf338':
  Clean up InflateException reference from KeyboardBuilder
 2013-03-20 23:19:17 -07:00
Tadashi G. Takaoka
ee91bde16c Clean up InflateException reference from KeyboardBuilder 
Change-Id: If9daa00b6d829ce2069a027e4bfec310ec108615
 2013-03-21 12:27:33 +09:00
Alan Viverette
525bbec9ec am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. 
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
 2013-03-20 04:24:19 +00:00
Alan Viverette
4f11af0c78 am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. 
* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
 2013-03-19 17:02:14 -07:00
Alan Viverette
9da7fa0f50 am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view. 
* commit '559616fb0c39e2f0bacdf294b84ba16ad1e8f371':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
 2013-03-19 23:59:56 +00:00
Alan Viverette
559616fb0c Prevent keyboard A11y proxy from referencing a null keyboard view. 
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
 2013-03-19 13:17:42 -07:00
Satoshi Kataoka
c1125b6dd1 am a462cd80: Support feedback 
* commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645':
  Support feedback
 2013-03-19 01:30:29 -07:00
Satoshi Kataoka
a462cd80ae Support feedback 
Bug: 8143554
Change-Id: If0a6bafc94da040f97f27c6d046fb58bed9fd615
 2013-03-19 17:25:55 +09:00
Jean Chalard
458f56b679 am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to build 
* commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7':
  Break dependencies to allow offdevice tests to build
 2013-03-19 01:15:13 -07:00
Jean Chalard
3c5b7d4814 am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME. 
* commit '6d90a10a343723b8613fd22d323c586ecc33b284':
  Merge the dictionary pack in Latin IME.
 2013-03-19 01:15:12 -07:00
Jean Chalard
8e005f2989 am 1061bfdb: Break dependencies to allow offdevice tests to build 
* commit '1061bfdb34bbcb63bf0046eec42313d264ac33fa':
  Break dependencies to allow offdevice tests to build
 2013-03-19 08:12:50 +00:00
Jean Chalard
6d90a10a34 am 0cc0544a: Merge the dictionary pack in Latin IME. 
* commit '0cc0544a2995c7eb54a830ae54db60af89d4073d':
  Merge the dictionary pack in Latin IME.
 2013-03-19 08:12:49 +00:00
Jean Chalard
1061bfdb34 Break dependencies to allow offdevice tests to build 
Change-Id: Ia9a2e8f0672b3f72943f26fb15de1d3c7c5ce7f1
 2013-03-19 16:45:25 +09:00
Jean Chalard
0cc0544a29 Merge the dictionary pack in Latin IME. 
Bug: 8161354
Change-Id: I17c23f56dd3bc2f27726556bf2c5a9d5520bd172
 2013-03-19 15:40:14 +09:00
Tadashi G. Takaoka
3b93f0e9a7 am 841c295f: resolved conflicts for merge of 5b048292 to master 
* commit '841c295f3c99214f45924434d9c0bb5b4760578d':
  Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
 2013-03-18 18:55:25 -07:00
Tadashi G. Takaoka
841c295f3c resolved conflicts for merge of 5b048292 to master 
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
 2013-03-19 10:48:10 +09:00
Ken Wakasa
5b04829254 Merge "Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS" into jb-mr2-dev 2013-03-19 00:33:13 +00:00
Baligh Uddin
c542a5882e Import translations. DO NOT MERGE 
Change-Id: Ie70585ed9a13c8f17b8744664bee6ab7eb511c36
Auto-generated-cl: translation import
 2013-03-18 13:28:15 -07:00
Baligh Uddin
2ffdb07845 Import translations. DO NOT MERGE 
Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873
Auto-generated-cl: translation import
 2013-03-18 13:22:51 -07:00
Baligh Uddin
20591e43c4 Import translations. DO NOT MERGE 
Change-Id: I0400e547eb41b707eeb8284bd96463068baab957
Auto-generated-cl: translation import
 2013-03-18 13:22:00 -07:00
Ken Wakasa
9c3860ce46 Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS 
bug: 8393568
Change-Id: Ie5edf44a3627aca9416145aff56bf05bbf2a05f3
 2013-03-18 23:15:47 +09:00
Jean Chalard
df6e492351 am f8325ec4: am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev 
* commit 'f8325ec4bb83f91d53949562556652bff315f088':
  Access the dictionary pack only if have INTERNET permission
 2013-03-18 04:10:36 -07:00
Jean Chalard
f8325ec4bb am 5cb0560b: Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev 
* commit '5cb0560b000f37b3fb3937f01b6d3e928afef57a':
  Access the dictionary pack only if have INTERNET permission
 2013-03-18 11:08:52 +00:00
Jean Chalard
5cb0560b00 Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev 2013-03-18 11:04:53 +00:00
Jean Chalard
ce487bcf33 Access the dictionary pack only if have INTERNET permission 
Bug: 8161354
Change-Id: I68ee3acb2955a017d25666cc2dad791798f9064a
 2013-03-18 18:40:33 +09:00
Satoshi Kataoka
bbaf50f275 am 62ed594c: am e0e67373: Refactor parameters by naming convention 
* commit '62ed594c373e172ba7b32d099911b318dcbfc7b2':
  Refactor parameters by naming convention
 2013-03-17 23:48:25 -07:00
Satoshi Kataoka
62ed594c37 am e0e67373: Refactor parameters by naming convention 
* commit 'e0e67373735918c78eaeaf24f127e1d28816aa29':
  Refactor parameters by naming convention
 2013-03-18 06:47:10 +00:00
Satoshi Kataoka
e0e6737373 Refactor parameters by naming convention 
Change-Id: I8bda8075b33f656ecbec08320afcd864b620fe77
 2013-03-18 15:42:15 +09:00
Tadashi G. Takaoka
a75ada5000 am 3268a44e: am a5067333: Disable the header list of DebugSettingsActivity 
* commit '3268a44e1cde2f4e14d01ac62e2e1a6e9a70a601':
  Disable the header list of DebugSettingsActivity
 2013-03-15 00:10:53 -07:00
Tadashi G. Takaoka
3268a44e1c am a5067333: Disable the header list of DebugSettingsActivity 
* commit 'a50673330e012f6cca02b83eca1c047b8da319e0':
  Disable the header list of DebugSettingsActivity
 2013-03-15 07:10:00 +00:00
Tadashi G. Takaoka
a50673330e Disable the header list of DebugSettingsActivity 
This change addresses the issue that the debug settings on 10-inch
tablet doesn't show up.

Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1
 2013-03-15 15:33:27 +09:00
Kurt Partridge
ec981aa963 am f33f1cab: [FileEncap9] Extract ResearchLogDirectory class 
* commit 'f33f1cab2fd57fe39955593e68902554ed57a053':
  [FileEncap9] Extract ResearchLogDirectory class
 2013-03-14 09:01:42 -07:00
Kurt Partridge
f33f1cab2f [FileEncap9] Extract ResearchLogDirectory class 
Previously used a monotonically increasing int.  Now uses uuid and nanoseconds.

squashed in:
    [FileEncap11] Read preference from ResearchSettings
    Change-Id: Ic779e0a69db6b16e92c6f4b63dbe7b7add566ab6

    [FileEncap12] Simplify directory cleanup invocation
    Change-Id: I688047409c0343d32b11447fb625dfb726c731ec

    [FileEncap14] Change log filename syntax
    Change-Id: I9243b20b2eb392f81ab8c5c3d19315211240e0bc

Change-Id: I5c9d70e0cb7b0965158e17dd71dfab796bd9a440
 2013-03-14 06:37:56 -07:00
Kurt Partridge
60f565caab am 7faa2caa: Merge "[Lazy4] Remove useless debug code" 
* commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27':
  [Lazy4] Remove useless debug code
 2013-03-14 06:16:16 -07:00
Kurt Partridge
7faa2caa80 Merge "[Lazy4] Remove useless debug code" 2013-03-14 13:13:57 +00:00
Baligh Uddin
95e09ea7b8 Merge "Import translations. DO NOT MERGE" 2013-03-14 05:19:07 +00:00
Baligh Uddin
01f188a781 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-03-14 05:15:42 +00:00
Baligh Uddin
620be98feb Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 2013-03-14 05:15:13 +00:00
Tadashi G. Takaoka
5e04234784 am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev 
* commit 'fb606c6277fdf7385bf8ce876102bda016465e8f':
  Clean up StaticInnerHandlerWrapper a bit
 2013-03-13 20:45:44 -07:00
Tadashi G. Takaoka
fb606c6277 am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev 
* commit 'f0864b1d95411ce9886a5ade13f42cb17f578828':
  Clean up StaticInnerHandlerWrapper a bit
 2013-03-14 03:44:00 +00:00
Tadashi G. Takaoka
3153863f04 am 1ab33383: am 0d5f214a: Fix NPE found in monkey test 
* commit '1ab33383f983082621084a65a168101e5fb526e0':
  Fix NPE found in monkey test
 2013-03-13 20:41:31 -07:00
Tadashi G. Takaoka
f0864b1d95 Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev 2013-03-14 03:41:01 +00:00
Tadashi G. Takaoka
1ab33383f9 am 0d5f214a: Fix NPE found in monkey test 
* commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b':
  Fix NPE found in monkey test
 2013-03-14 03:39:38 +00:00
Tadashi G. Takaoka
41e60bf6dd Clean up StaticInnerHandlerWrapper a bit 
Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b
 2013-03-14 12:35:47 +09:00
Tadashi G. Takaoka
0d5f214aa7 Fix NPE found in monkey test 
Bug: 8383127
Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833
 2013-03-14 12:19:10 +09:00
Tadashi G. Takaoka
fc00d2bfbe am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev 
* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927':
  Move checking non-persistent checkbox to onResume
 2013-03-13 19:38:47 -07:00
Tadashi G. Takaoka
f5caf5be99 am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev 
* commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599':
  Move checking non-persistent checkbox to onResume
 2013-03-14 02:33:28 +00:00
Satoshi Kataoka
cb8ed32be5 am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev 
* commit '0b2512017edb0161d51643560cd41dac9b1a1559':
  Make isInternal mutable
 2013-03-13 10:27:12 -07:00
Satoshi Kataoka
0b2512017e am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev 
* commit '0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825':
  Make isInternal mutable
 2013-03-13 17:24:49 +00:00
Kurt Partridge
f6d68ee385 am 64b95965: Merge "[Lazy2] Pass a runnable to abort" 
* commit '64b9596544acbeec1a416185e9472cfbd49cde60':
  [Lazy2] Pass a runnable to abort
 2013-03-13 06:22:31 -07:00
Kurt Partridge
64b9596544 Merge "[Lazy2] Pass a runnable to abort" 2013-03-13 13:20:55 +00:00
Jean Chalard
8067b769f1 Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev 2013-03-13 10:55:04 +00:00
Tadashi G. Takaoka
601a8582d0 Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev 2013-03-13 07:52:35 +00:00
Satoshi Kataoka
0ab44b21bd Merge "Make isInternal mutable" into jb-mr2-dev 2013-03-13 07:41:11 +00:00
Satoshi Kataoka
756791e6bf Make isInternal mutable 
Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc
 2013-03-13 16:28:50 +09:00
Tadashi G. Takaoka
24cea7f1fb Move checking non-persistent checkbox to onResume 
Bug: 8336068
Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b
 2013-03-13 15:54:33 +09:00
Jean Chalard
13a82d9530 [Lazy2] Pass a runnable to abort 
Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
 2013-03-12 18:56:57 -07:00
Kurt Partridge
ee698210af am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures" 
* commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9':
  [Lazy1] Switch to blocking log closures
 2013-03-12 17:20:36 -07:00
Kurt Partridge
5e75e15a95 Merge "[Lazy1] Switch to blocking log closures" 2013-03-13 00:18:02 +00:00
Jean Chalard
7423005b96 [Lazy1] Switch to blocking log closures 
Change-Id: I4daec20b7b47b0d71c5aab6e17cd660015e19e71
 2013-03-12 17:09:08 -07:00
Baligh Uddin
df601fd0d1 Import translations. DO NOT MERGE 
Change-Id: I16ec93523721a344e1a09b5242400fe719d07516
Auto-generated-cl: translation import
 2013-03-12 13:14:01 -07:00
Baligh Uddin
7f0aaaef7c Import translations. DO NOT MERGE 
Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6
Auto-generated-cl: translation import
 2013-03-12 13:08:49 -07:00
Baligh Uddin
e1720957b5 Import translations. DO NOT MERGE 
Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c
Auto-generated-cl: translation import
 2013-03-12 13:07:57 -07:00
Tadashi G. Takaoka
1b985607cc am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys 
* commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac':
  Language dependent single/doule quotation more keys
 2013-03-11 22:59:55 -07:00
Tadashi G. Takaoka
dbfd2825c8 am 2bbd3065: Language dependent single/doule quotation more keys 
* commit '2bbd3065d3bd9785ad1638c65f8c73f11bf21922':
  Language dependent single/doule quotation more keys
 2013-03-12 05:57:30 +00:00
Tadashi G. Takaoka
2bbd3065d3 Language dependent single/doule quotation more keys 
The natural way of marking quoted text vary from language to
language. This change introduces the following variations.

* LEFT and RIGHT quotations (English etc.)
* LOW-9 and LEFT quotations (German etc.)
* LOW-9 and RIGHT quotations (Dutch etc.)
* RIGHT and RIGHT quotations (Swedish etc.)
* LEFT ANGLE and RIGHT ANGLE quotations (French etc.)
* RIGHT ANGLE and LEFT ANGLE quotations

Bug: 8356419
Change-Id: I75726ab7ed783d02f189b46236c9d5079737bcff
 2013-03-12 14:43:34 +09:00
Jean Chalard
92eaa6fc7c [DO NOT MERGE] Deactivate H/W keyboard handling 
For MR2, LatinIME should not be handling hardware keyboard
events. The feature is still work in progress.

Change-Id: I56ff18bff84ba6b5a6bc3f8829b42eaf33b72554
 2013-03-12 14:22:06 +09:00
Tadashi G. Takaoka
4660cf5c5b am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev 
* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c':
  Add dotted circle to combination letter
 2013-03-11 02:07:10 -07:00
Tadashi G. Takaoka
d7b4af9b56 am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev 
* commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a':
  Add dotted circle to combination letter
 2013-03-11 09:05:17 +00:00
Tadashi G. Takaoka
67e264de6b Merge "Add dotted circle to combination letter" into jb-mr2-dev 2013-03-11 09:01:19 +00:00
Tadashi G. Takaoka
0b928509c7 Add dotted circle to combination letter 
This dotted circle (U+25CC) hack is needed to the device that runs API
version 14 and 15.  The device that runs API version 16 and 17 has an
issue to draw incomplete successive combining code points of Hindi.
The device that runs API version greater than 17 has no issue to draw
incomplete Hindi combining letters.

Bug: 6233945
Bug: 8344448
Change-Id: I22361da908ccca3ebad0beb32e7f69219e9160d6
 2013-03-11 17:23:56 +09:00
Jean Chalard
220b271dfa [Lazy4] Remove useless debug code 
This code is cluttering readability and getting in the way
of future updates.
Future updates will make it much easier to debug and to
test this code, so this needs to disappear.

Change-Id: I32e28ec608587b6b7c07250a2692b13e8fc98465
 2013-03-08 17:46:00 -08:00
Svetoslav Ganov
9f555dcd5c am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev 
* commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22':
  Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
 2013-03-08 11:26:15 -08:00
Svetoslav Ganov
2d9b7f60dd am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev 
* commit 'af37cbb44ef40fcd15fa02456c9abda8021847ce':
  Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
 2013-03-08 19:24:25 +00:00
Svetoslav Ganov
af37cbb44e Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev 2013-03-08 19:20:00 +00:00
Tadashi G. Takaoka
e6db1b9bfd am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to Key class 
* commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c':
  Move logic of selecting key preview attribute to Key class
 2013-03-08 03:25:24 -08:00
Tadashi G. Takaoka
60906d4d08 am 914d054e: Move logic of selecting key preview attribute to Key class 
* commit '914d054ea26d18a1ba6a60f8c5e749136477bbf2':
  Move logic of selecting key preview attribute to Key class
 2013-03-08 11:24:13 +00:00
Tadashi G. Takaoka
914d054ea2 Move logic of selecting key preview attribute to Key class 
This change also fixes the size of a key preview letter to follow a
keyLabelFlags specification.

Change-Id: Ie13790788a16c5a053c1a2cbcac3d38314b14b7f
 2013-03-08 19:44:22 +09:00
Kurt Partridge
a515f3ef39 am bba39b9b: [FileEncap8] Remove useless "success" variable 
* commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628':
  [FileEncap8] Remove useless "success" variable
 2013-03-07 19:57:34 -08:00
Kurt Partridge
d9fe8049d4 am ee3261ff: [FileEncap7] Extract uploadContents method 
* commit 'ee3261ff558ee734e15af5424f98bb8d8776795f':
  [FileEncap7] Extract uploadContents method
 2013-03-07 19:13:56 -08:00
Kurt Partridge
bba39b9b67 [FileEncap8] Remove useless "success" variable 
Change-Id: Icf76bc0b795b6a9221d9a6d61c38df31af54ab7b
 2013-03-07 17:43:35 -08:00
Kurt Partridge
ee3261ff55 [FileEncap7] Extract uploadContents method 
Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
 2013-03-07 17:43:28 -08:00
Kurt Partridge
0079d3abf4 am bca8348e: Merge "[FileEncap6] Extract Uploader class" 
* commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e':
  [FileEncap6] Extract Uploader class
 2013-03-07 16:38:48 -08:00
Kurt Partridge
bca8348e98 Merge "[FileEncap6] Extract Uploader class" 2013-03-08 00:37:14 +00:00
Kurt Partridge
4436446e9b [FileEncap6] Extract Uploader class 
Gerrit was stuck on original change I9ef4eb7450

Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
 2013-03-07 16:19:44 -08:00
Alan Viverette
c2ee72a214 Announce keyboard mode changes as a WINDOW_STATE_CHANGED event. 
Bug: 8165295
Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
 2013-03-07 10:39:55 -08:00
Baligh Uddin
adfa9b9a94 Import translations. DO NOT MERGE 
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
 2013-03-07 15:05:01 +00:00
Baligh Uddin
8a60ae01d3 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-03-07 05:27:29 +00:00
Kurt Partridge
26df5201cc am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller" 
* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
  [FileEncap5] Move conditional logic to caller
 2013-03-06 13:00:05 -08:00
Kurt Partridge
41c471d93d Merge "[FileEncap5] Move conditional logic to caller" 2013-03-06 20:59:04 +00:00
Baligh Uddin
bc53c95720 Import translations. DO NOT MERGE 
Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38
Auto-generated-cl: translation import
 2013-03-06 12:44:50 -08:00
Baligh Uddin
73dad2ad41 Import translations. DO NOT MERGE 
Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d
Auto-generated-cl: translation import
 2013-03-06 12:43:53 -08:00
Kurt Partridge
be4e180fab am 1bc20700: Merge "[FileEncap4] Simplify logic" 
* commit '1bc20700d594af28bb87575df4279b0bed624c52':
  [FileEncap4] Simplify logic
 2013-03-06 12:06:44 -08:00
Kurt Partridge
1bc20700d5 Merge "[FileEncap4] Simplify logic" 2013-03-06 20:05:47 +00:00
Kurt Partridge
0d4c792316 am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method" 
* commit '719bb3aa39c6456b7d672258432d18ad917ba263':
  [FileEncap3] Extract isUploadingUnconditionally method
 2013-03-06 11:16:00 -08:00
Kurt Partridge
719bb3aa39 Merge "[FileEncap3] Extract isUploadingUnconditionally method" 2013-03-06 19:14:52 +00:00
Kurt Partridge
dd5055862f am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable" 
* commit '5e5b6b78709b055ac5ed71153c0a696c63201a38':
  [FileEncap2] Remove mCanUpload instance variable
 2013-03-06 10:41:16 -08:00
Kurt Partridge
5e5b6b7870 Merge "[FileEncap2] Remove mCanUpload instance variable" 2013-03-06 18:39:07 +00:00
Kurt Partridge
a537cbf132 am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method" 
* commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3':
  [FileEncap1] Extract hasUploadingPermisssions method
 2013-03-06 10:05:01 -08:00
Kurt Partridge
b000e94eea Merge "[FileEncap1] Extract hasUploadingPermisssions method" 2013-03-06 18:02:26 +00:00