Commit Graph

11290 Commits (c1dec87a76565c5dfa223c7d4d5f10a345ab3799)

Author SHA1 Message Date
The Android Open Source Project c1dec87a76 am b35915fb: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'b35915fb5095f18554d62dfc148eb1027cefa005':
2013-03-29 09:54:38 -07:00
The Android Open Source Project b35915fb50 Reconcile with jb-mr2-release - do not merge
Change-Id: Iba9f399b20d62611002d4353e00355b2550dbb1d
2013-03-29 09:49:25 -07:00
Satoshi Kataoka 97a3ce022c Merge "Refactor" 2013-03-29 10:57:45 +00:00
Satoshi Kataoka 394b0bd345 Refactor
Change-Id: Ie50fdd1081d306e520300245498a605e79e03818
2013-03-29 18:49:50 +09: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
The Android Automerger 0574e46c73 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-28 05:56:26 -07: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 fbb6500d7d am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit '5bcbc21a59043f73a30380cf3c231104d65921f9':
  Import translations. DO NOT MERGE
2013-03-27 22:09:49 -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
Baligh Uddin 5bcbc21a59 am c08b8245: (-s ours) Import translations. DO NOT MERGE
* commit 'c08b8245d92107f7300267e3d04ff302dfdb4281':
  Import translations. DO NOT MERGE
2013-03-27 22:05:16 -07:00
The Android Automerger 1237c8722b am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit 'a02de1f71d8f7a0dff87c573f3dc2e8a06b0728b':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
2013-03-27 22:01:16 -07:00
Tadashi G. Takaoka abd2239302 am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '8b120b985e62fbced7f31283c0585fbd4e3bb662':
2013-03-27 22:01:15 -07:00
Tadashi G. Takaoka 830a8cbb08 am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
* commit '33fa6a0b3bde25daabf330d152e9d400db42970e':
2013-03-27 22:01:14 -07:00
Satoshi Kataoka d3c823c161 am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
* commit 'dd8ca1f821c4f64f561e1d1badcfa5deb13de96d':
2013-03-27 22:01:12 -07:00
Tadashi G. Takaoka d0495a354f am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
* commit '56b1bd866a97b4662401ff98c287c56f4f26432a':
2013-03-27 22:01:11 -07:00
Baligh Uddin f0213d1afe am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit 'c1cb476697a3d063997996e98d7c670d53e7910f':
2013-03-27 22:01:09 -07:00
Baligh Uddin f0346d7079 am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit 'fc135df5840a30eb99c9253d1394549fc192047e':
2013-03-27 22:01:08 -07:00
Baligh Uddin 14ef11a8a3 am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
* commit '93c5c7a41dd7715466cb6fe54533758578cd8b1f':
  Import translations. DO NOT MERGE
2013-03-27 22:01:07 -07:00
Tadashi G. Takaoka 2b04e787ac am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
* commit '71fb8af7c55f6821bf190261e29728e51e895266':
2013-03-27 22:01:06 -07:00
Baligh Uddin e67698be3a am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '8051fd0d73f169c968a2a2dd02d8099842775633':
2013-03-27 22:01:05 -07:00
Baligh Uddin 7ea45c0755 am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '7f859d683e5390f9738d375cc6b5fed93ea2c1f9':
2013-03-27 22:01:03 -07:00
Baligh Uddin 599290d53f am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit 'b4039d96001173bcf9dcd3a3bb3d7a1bcd112385':
  Import translations. DO NOT MERGE
2013-03-27 22:01:02 -07:00
The Android Automerger a02de1f71d am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
* commit '5c3d51e28cad4075faf639a16a7e8a3c8d50c6f0':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
2013-03-27 21:59:47 -07:00
Tadashi G. Takaoka 8b120b985e am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
* commit '50cc14b5495f8a712296a21517efe9e405a2322c':
  Add const_cast to live with host's jni.h
2013-03-27 21:59:47 -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
Baligh Uddin c1cb476697 am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import translations. DO NOT MERGE
* commit '6537280fd524c5297dc50079cdbfce8db6f64b75':
2013-03-27 21:59:42 -07:00
Baligh Uddin fc135df584 am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
* commit '24daa2a17c22fb2c2f40f212a3fd96ed77805819':
  Import translations. DO NOT MERGE
2013-03-27 21:59:41 -07:00
Baligh Uddin 93c5c7a41d am 2898aac8: Import translations. DO NOT MERGE
* commit '2898aac8f2692d1b01df1ad70cb6c41a006ab1eb':
  Import translations. DO NOT MERGE
2013-03-27 21:59:40 -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
Baligh Uddin 8051fd0d73 am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '2a01fc22d40d00192dd53dd6413ab9cce56d778b':
2013-03-27 21:59:37 -07:00
Baligh Uddin 7f859d683e am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '8636ba03a7163d4bc2c81b8bddb1152944f9981d':
  Import translations. DO NOT MERGE
2013-03-27 21:59:36 -07:00
Baligh Uddin b4039d9600 am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
* commit '5709e859a542493c139911542aec3f3befa3db78':
  Import translations. DO NOT MERGE
2013-03-27 21:59:36 -07:00
Alan Viverette c5ec754577 am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit '8f8075822645e526b3171ab6cc6a7e5f2c993706':
2013-03-27 21:47:00 -07:00
Satoshi Kataoka 54b8582760 am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
* commit '189c1b0ee86350e1f7cf736042cdf74abdef2200':
2013-03-27 21:46:59 -07:00
Tadashi G. Takaoka 5a4700a046 am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
* commit '0992fd245b33828577742238492249f009defde6':
2013-03-27 21:46:58 -07:00
Tadashi G. Takaoka 4841df87de am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit 'bb679a224f4daf00d8f65c2903bf90a9253b5e1b':
2013-03-27 21:46:57 -07:00
Satoshi Kataoka 1349862034 am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
* commit '4bb504cedbe3c86f7f54c98afd36e5301ff1c9f9':
2013-03-27 21:46:55 -07:00
Baligh Uddin 4021464cba am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit '4b66d0c483ed1724cd24cfcf959a7b974fc2ef4b':
2013-03-27 21:46:54 -07:00
Satoshi Kataoka ac2d54b56b am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
* commit '0cc63149580a2cc567435173843f3aa653e57a3b':
2013-03-27 21:46:53 -07:00
Tadashi G. Takaoka bb0c999ba0 am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
* commit 'dbb90d08b548bc59bec26d464757427cd07a4ef1':
2013-03-27 21:46:51 -07:00
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
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