Commit graph

11210 commits

Author SHA1 Message Date
The Android Open Source Project
c4176236c2 am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '210226c5594249624421a2385ef5410b88de02e4':
2013-03-27 21:46:50 -07:00
Alan Viverette
f1bcc1d7dc am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit '9ecac40d8516d57480a0a91ccf1acdffd511266e':
2013-03-27 21:46:49 -07:00
The Android Open Source Project
210226c559 am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '54f0ae278b49eb1d1147cdabc3c391fb5c4f869b':
2013-03-27 21:44:58 -07:00
Alan Viverette
9ecac40d85 am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
* commit '4f11af0c783718f3b899d1ccb15f9ddfd9ba1070':
2013-03-27 21:44:57 -07:00
Jean Chalard
11b600b909 am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit '2f73105a862cf97148ecd5fdaa25da9f0b98f32a':
  [DO NOT MERGE] Increase string limits
2013-03-27 21:08:33 -07:00
Jean Chalard
844e5014fa Merge "Increase string limits" 2013-03-28 04:07:24 +00:00
Jean Chalard
2f73105a86 am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
* commit 'db5e07f75633ee89631bd6903378884b84bc1242':
  [DO NOT MERGE] Increase string limits
2013-03-27 21:06:15 -07: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
fc801fe8f8 am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
* commit 'c57cf2b776d5b03d55835e90db6aeaa6cd2e4a00':
  Import translations. DO NOT MERGE
2013-03-27 14:50:22 -07:00
Baligh Uddin
c57cf2b776 am 841e6016: Import translations. DO NOT MERGE
* commit '841e60163b6b1452f37d8731d98a30923c6099b7':
  Import translations. DO NOT MERGE
2013-03-27 14:48:30 -07: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
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
ef103e1f2e Merge "Close ResearchLogger upon onFinishInputView" 2013-03-26 19:23:00 +00:00
The Android Open Source Project
22384b57bd am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '0ed901ff17f583f37d0262e10d5590c80c23fc93':
2013-03-26 12:17:49 -07:00
The Android Open Source Project
0ed901ff17 Reconcile with jb-mr2-release - do not merge
Change-Id: I6f4f70c6f405f6f6703c2a063475714ad48462d7
2013-03-26 10:49:49 -07:00
The Android Automerger
1a334048ab merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-26 05:56:25 -07:00
Tadashi G. Takaoka
ef86bbceae Add const_cast to live with host's jni.h
Bug: 7970626
Change-Id: I2fd09e16dd9df36eebca2d737a0b7cc3ddd1c862
2013-03-26 17:58:17 +09: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
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
5f976d1cef am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit 'ff41125b74053ff3ad006f5dfd824e2351a47ee4':
  Import translations. DO NOT MERGE
2013-03-25 22:55:05 +00:00
Baligh Uddin
ff41125b74 am fba54597: Import translations. DO NOT MERGE
* commit 'fba545975020525c0017bde8424db28dd21d5186':
  Import translations. DO NOT MERGE
2013-03-25 22:52:36 +00: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
The Android Automerger
eaded6bdd8 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-25 05:56:44 -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
1e5add7809 am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '7668deece811d5f11ee652d6b5e5d7611273b270':
  Import translations. DO NOT MERGE
2013-03-23 01:50:08 +00:00
Baligh Uddin
afe343c16f Merge "Import translations. DO NOT MERGE" 2013-03-23 01:48:28 +00:00
Baligh Uddin
7668deece8 am 21160c4e: Import translations. DO NOT MERGE
* commit '21160c4eba74344a583cae423b1909483559c87f':
  Import translations. DO NOT MERGE
2013-03-23 01:47:46 +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
Baligh Uddin
74089a0946 am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit 'ba0e497a0c53ae2a64c070544f6a6f0495442343': (126 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Support feedback
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [FileEncap9] Extract ResearchLogDirectory class
  [Lazy2] Pass a runnable to abort
  [Lazy1] Switch to blocking log closures
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [Lazy4] Remove useless debug code
  [FileEncap8] Remove useless "success" variable
  [FileEncap7] Extract uploadContents method
  [FileEncap6] Extract Uploader class
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [FileEncap5] Move conditional logic to caller
  [FileEncap4] Simplify logic
  [FileEncap3] Extract isUploadingUnconditionally method
  ...
2013-03-22 04:59:59 +00:00