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

6570 commits

Author SHA1 Message Date
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
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