Ken Wakasa
a56c702088
am d4ab58a0: Add translatable="false" for appropriate entries
...
* commit 'd4ab58a0f7bdf5aee51947607e1b17998912285c':
Add translatable="false" for appropriate entries
2013-04-19 10:09:50 -07:00
Ken Wakasa
d4ab58a0f7
Add translatable="false" for appropriate entries
...
bug: 8662567
Change-Id: I1ac9b4b8834f3b0ea537ad3142fa533dea10f23e
2013-04-19 19:37:59 +09:00
Jean Chalard
f1dde6a1bf
am 758c74fe: Merge "Fix an NPE in recorrection" into jb-mr2-dev
...
* commit '758c74fe82683aef08d93a935433c027a7bc21a7':
Fix an NPE in recorrection
2013-04-19 00:07:37 -07:00
Jean Chalard
3629605b7c
am 77226ed0: Merge "Fix an NPE in recapitalize" into jb-mr2-dev
...
* commit '77226ed006ba32228cd5db19031e04d13d87b27e':
Fix an NPE in recapitalize
2013-04-19 00:04:13 -07:00
Jean Chalard
758c74fe82
Merge "Fix an NPE in recorrection" into jb-mr2-dev
2013-04-19 07:03:19 +00:00
Jean Chalard
77226ed006
Merge "Fix an NPE in recapitalize" into jb-mr2-dev
2013-04-19 07:01:10 +00:00
Jean Chalard
ae7d1530b4
Fix an NPE in recorrection
...
Also, theoretically, we don't want to retrieve older suggestions if
there are no results for a recorrection - that would look random.
This bug addresses this too.
Bug: 8657919
Change-Id: I44f36d34a708a968ab71fa0592da57f4c97d4b7f
2013-04-19 15:53:33 +09:00
Jean Chalard
3bdf341ea0
Fix an NPE in recapitalize
...
Bug: 8657736
Change-Id: I459d1c200826c1c394f8207475ecf60a4f356793
2013-04-19 15:44:20 +09:00
Baligh Uddin
dcc59297ac
am 1844bec2: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '1844bec2024859f1c8dbc331893a74d5af9152d8':
Import translations. DO NOT MERGE
2013-04-18 09:42:23 -07:00
Baligh Uddin
1844bec202
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-04-18 16:39:35 +00:00
Ken Wakasa
55b306c9e0
am 64eda4f4: Merge "Fix an infinite loop" into jb-mr2-dev
...
* commit '64eda4f4fa30fc60daeb5a8af462e688d4573700':
Fix an infinite loop
2013-04-18 09:28:10 -07:00
Jean Chalard
a5d2da82a6
am d91268ad: Initialize dictionaries at onStartInputView
...
* commit 'd91268ad9fb69b4733044b4e466e1d33f6c4725f':
Initialize dictionaries at onStartInputView
2013-04-18 09:24:45 -07:00
Ken Wakasa
64eda4f4fa
Merge "Fix an infinite loop" into jb-mr2-dev
2013-04-18 16:24:01 +00:00
Jean Chalard
77e26e1c29
Fix an infinite loop
...
What do you mean "Can't happen"?
It happens all the time - the empty string is the default ID, and it
needs to be updated like everyone else.
Bug: 8651858
Change-Id: I5a2f2ebb5b2ef08b27f26be8fb2c3d2f231ebcfc
2013-04-18 23:14:13 +09:00
Jean Chalard
d91268ad9f
Initialize dictionaries at onStartInputView
...
Bug: 8344402
Change-Id: I41b8440f0d72a66fde3f6feb0db8239c9bb10ea3
2013-04-18 14:48:42 +09:00
Jean Chalard
a1187bd071
am 8f89b9b1: am ccb3dc02: am 0eb58dfe: am 10373006: am 5c874a7b: am bb94c643: am 5b248590: am 1c63efc9: am a657afc3: am d555a0d7: Merge "Cleanup"
...
* commit '8f89b9b13da770c0e4934ecd36b6fd4a2fe8d74d':
2013-04-17 19:50:27 -07:00
Baligh Uddin
04ef41417b
am 42f36bb6: am 2456eb3a: am faa708c3: am 36583063: am 8ed884e7: am ca8ea431: am a3ed3254: am 05b7988a: am 53698f8d: am fd0e40ef: am 78b07d8b: am 0cd02c2b: keep history after reset to jb-ub-latinimegoogle-azuki
...
* commit '42f36bb6ea2fc3ef46c4645328c42b2f0cb4fd77':
2013-04-17 19:50:25 -07:00
Baligh Uddin
26e105b609
am 5e79a344: (-s ours) am f205c258: am dbf9168f: am b3fbdd58: (-s ours) am f939332c: am 94065faf: am c6660830: (-s ours) am 68a0afc3: am 0c777365: am fbb6500d: (-s ours) am 5bcbc21a: (-s ours) am c08b8245: (-s ours) Import translations. DO NOT MERGE
...
* commit '5e79a3446194be7f65ca9de78b2e4a372496a8e4':
2013-04-17 19:50:24 -07:00
The Android Automerger
8435a9b8ac
am abaea38f: am 13ac43b3: am 2cb2c001: am 6e6f705e: am c82a56b4: am ccc3c232: am 228e26f7: am ea46fdcb: am 65dfe94d: am 1237c872: am a02de1f7: am 5c3d51e2: merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle
...
* commit 'abaea38f584001b75225d57e2da2136fde6a1933':
2013-04-17 19:50:22 -07:00
Tadashi G. Takaoka
52a89e5adf
am c7420082: am f6f20ab2: am 19b5a104: am ae3ead49: am faadc0a7: am b5843222: am 62b07bf9: am 561a04f3: am 1911c513: am abd22393: am 8b120b98: am 50cc14b5: am ef86bbce: Add const_cast to live with host\'s jni.h
...
* commit 'c7420082be85f138f5d1b17062f5ab5ef1203921':
2013-04-17 19:50:21 -07:00
Tadashi G. Takaoka
e5561f5241
am 707d7d03: am 9a2c21ba: am 6e536321: am 31f350bc: am fc369029: am 9c59fb54: am fc0fc521: am e01d1960: am c17e0bba: am 830a8cbb: am 33fa6a0b: am cc75c950: am 73d00e68: Merge "Use XmlPullParser.getEventType()"
...
* commit '707d7d036c51be5ecb1e4ce4c30ace98a610153f':
2013-04-17 19:50:19 -07:00
Satoshi Kataoka
ef6e62dd75
am 1ca78739: am 6a8da44f: am 5d1d7863: am 4b24e49b: am a1cd7970: am 71f1b270: am 8138c8d2: am f4f4d6c9: am b3438173: am d3c823c1: am dd8ca1f8: am bc586fb1: am 0b327101: Merge "Fix possible NPE"
...
* commit '1ca787391e776f980312f93d7fee926fb7d2be15':
2013-04-17 19:50:18 -07:00
Tadashi G. Takaoka
398c686243
am 8c897819: am b97fe385: am 47d68e5d: am 6ed9580f: am 098ecd55: am 5283b90a: am 60083e3e: am 49d59d4a: am a469cdfe: am d0495a35: am 56b1bd86: am f892f775: am d17b69ec: Clean up XmlParserUtils
...
* commit '8c8978196a03b43e3bb49b6aad96ce8d8ab265da':
2013-04-17 19:50:16 -07:00
Baligh Uddin
352e94b016
am 13f39210: am ce453840: am 32e84531: am 8632fea5: (-s ours) am 88db1331: am 6626fb25: am 51c7dbea: (-s ours) am 4379dbea: am 324b1880: am f0213d1a: (-s ours) am c1cb4766: (-s ours) am 6537280f: am 5f976d1c: (-s ours) am ff41125b: (-s ours) am fba54597: Import transl
...
* commit '13f392100cd9713762528d5008f525b605086856':
2013-04-17 19:50:15 -07:00
Baligh Uddin
33a9c2b26a
am c346b2dc: (-s ours) am de5560e2: am 0218ddb3: am 52d6480a: (-s ours) am f81c9132: am 1e8d1f41: am d72347f9: (-s ours) am 67f7bb2e: am 284d4285: am f0346d70: (-s ours) am fc135df5: (-s ours) am 24daa2a1: am 6616188e: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c346b2dcfac3cac9defedf54f9f7a47fc0b5a0a6':
2013-04-17 19:50:13 -07:00
Baligh Uddin
8f89ca1d25
am b233e047: (-s ours) am 062a6c02: am dbd8eec7: am 643f8f08: (-s ours) am a3328255: am 38f2bbb3: am 210d473d: (-s ours) am a62edb47: am 3d082f1b: am 14ef11a8: (-s ours) am 93c5c7a4: (-s ours) am 2898aac8: Import translations. DO NOT MERGE
...
* commit 'b233e047f754e51530e5119ed5b3ed66372d8b7c':
2013-04-17 19:50:12 -07:00
Tadashi G. Takaoka
b53d753dcf
am d88350e2: am 2721db44: am b779b268: am 6ed94c43: am 70252ecf: am 5eb7a00e: am 1047bf17: am 32d89afa: am e2ccd61b: am 2b04e787: am 71fb8af7: am ec183b50: am fb658d6c: Fix possible ArrayIndexOutOfBoundsException
...
* commit 'd88350e271be4318253aa003250fadb658d0f6cc':
2013-04-17 19:50:10 -07:00
Baligh Uddin
aa52681bfc
am 627db009: am ac58dcf1: am f3b10815: am 0849b210: (-s ours) am 1cf0e85d: am 97687031: am 0ad31c8d: (-s ours) am a5bc58ac: am 5301db94: am e67698be: (-s ours) am 8051fd0d: (-s ours) am 2a01fc22: am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import transl
...
* commit '627db0092e0fdcab8b2d4bab9caa0477611e403e':
2013-04-17 19:50:09 -07:00
Baligh Uddin
719f8865fd
am 2b19100a: (-s ours) am 58a4a153: am a9a84c95: am 3d8f50ea: (-s ours) am 755db5bd: am 3a97d388: am 273a21ca: (-s ours) am 772dfa51: am ae8b69fd: am 7ea45c07: (-s ours) am 7f859d68: (-s ours) am 8636ba03: am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '2b19100ad6748aea1f4f9de768f2e45203738c44':
2013-04-17 19:50:07 -07:00
Baligh Uddin
dff9a64655
am 87ad4a8c: (-s ours) am b74cc3f9: am 1a24764e: am 03fbe97c: (-s ours) am c46a975c: am 9f291d17: am 2f8e381b: (-s ours) am 92adcda6: am 42c255c2: (-s ours) am 599290d5: (-s ours) am b4039d96: (-s ours) am 5709e859: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub
...
* commit '87ad4a8c5f40492234c5a80f9c3b22af96e10aa5':
2013-04-17 19:50:06 -07:00
Alan Viverette
c795a288b3
am 69ef660f: am 3de1ae1a: am 849c7858: am eff2ee76: am 45b1a302: am 80a2e251: am 14f65cff: am 8e5fa88a: am f518e71a: am c5ec7545: am 8f807582: am e47ee181: am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
...
* commit '69ef660fe717a74b507d76e0f54d381bc66140d6':
2013-04-17 19:50:04 -07:00
Satoshi Kataoka
d1935d0548
am d0642a34: am 775ef9bc: am cb132ce1: am 81295fd2: am 119e6979: am 745725e1: am 103b1118: am 33c91be3: am 40be0244: am 54b85827: am 189c1b0e: am 97ddbf22: am 19a70087: Merge "Fix appname"
...
* commit 'd0642a340f4791bf4e5e6ce295040b9233092393':
2013-04-17 19:50:03 -07:00
Tadashi G. Takaoka
37232a10d2
am 58db8c60: am c0d71c3b: am 3a2e78f9: am 30d9817b: am 7dcc22b6: am 5f81bb8c: am 3ef47fd3: am e0aa9383: am a7353dda: am 5a4700a0: am 0992fd24: am 1e3c73de: am 3a8a63c3: Remove unused import
...
* commit '58db8c60a3f3e6c49f41c1f1af3c0f1692f10bd1':
2013-04-17 19:50:01 -07:00
Tadashi G. Takaoka
c1e417dd2b
am e010bb8a: am 18be37b0: am 96d53923: am 104923e4: am 863d83ea: am 02a59e55: am 1f722ca9: am 4e627c21: am 56796cd7: am 4841df87: am bb679a22: am 3d0fee4e: am c6452f25: Merge "Remove reference to string.english_ime_name"
...
* commit 'e010bb8ad53dee9ce06a4b198657041774a5f278':
2013-04-17 19:49:59 -07:00
Satoshi Kataoka
4bb35fea2d
am 8e8ea448: am 9e78d2ba: am 54f46879: am 1af04dc6: am 249ad4d5: am 79376326: am f555b255: am 5d33d2c2: am 9b969b26: am 13498620: am 4bb504ce: am 45728330: am f4352c2c: Merge "Use correct appname resource"
...
* commit '8e8ea44848c917d6c6806113c45460c0d2ddd849':
2013-04-17 19:49:57 -07:00
Baligh Uddin
daad9c687e
am 5bc76be0: am 15a357a3: am 2060aa13: am 97046d19: am 1d024eca: am 307d2aa2: am 8e48a618: am 18e45a93: am f1c2946c: am 4021464c: am 4b66d0c4: am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
...
* commit '5bc76be0a788b271007ef6fb00f02d22034bf9cd':
2013-04-17 19:49:55 -07:00
Satoshi Kataoka
204243c3e1
am 071c3c6d: am e8374789: am 9e45f9e8: am 24cf39e7: am 894a8ffc: am 9f419592: am c3c1b4db: am 5d9459df: am 67d1bdd4: am ac2d54b5: am 0cc63149: am c1c3e03c: am 140b6705: Merge "Fix appname"
...
* commit '071c3c6d0f9d9a234f5b2e84162037a871f59076':
2013-04-17 19:49:54 -07:00
Tadashi G. Takaoka
eeb0459e68
am a446f8f7: am fd06763b: am 7bc7bd79: am 59b23bcf: am 680d689d: am c61393c8: am 56642281: am d7bcc52d: am f510d154: am bb0c999b: am dbb90d08: am bd7b4fcc: am ee91bde1: Clean up InflateException reference from KeyboardBuilder
...
* commit 'a446f8f7b71f5c77b3264a9f4d0deb92bcd3220f':
2013-04-17 19:49:49 -07:00
The Android Open Source Project
41b61150d0
am adef73a7: am eb2fee1d: am 7db5bfa0: am 20995333: (-s ours) am 5d674b16: am 55172624: am b2c2ce31: (-s ours) am 7de82b0e: am 6ab186a1: am c4176236: (-s ours) am 210226c5: (-s ours) am 54f0ae27: am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-rele
...
* commit 'adef73a7f8e47e128cfc0598724513afd906788a':
2013-04-17 19:49:47 -07:00
Alan Viverette
3694cc826a
am e4f98a02: am 79ef0a17: am 4b45830a: am 7c9b7f24: am e592be58: am 046a311a: am d19c71d9: am 3c082157: am 44678fcf: am f1bcc1d7: am 9ecac40d: am 4f11af0c: am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
...
* commit 'e4f98a02abc09a865e2e7fef681e151407029f52':
2013-04-17 19:49:45 -07:00
Jean Chalard
c825c55779
am b2af86cf: (-s ours) am c5424013: am 186cf922: am 288deb7a: (-s ours) am 11034c34: am dee08de2: am 724ff298: (-s ours) am 4ddfde7b: am a050834c: am 11b600b9: (-s ours) am 2f73105a: (-s ours) am db5e07f7: Merge "[DO NOT MERGE] Increase string limits" into jb-mr2-dev
...
* commit 'b2af86cf0af6ca95378c616c857b7cab1de15dfc':
2013-04-17 19:49:43 -07:00
Jean Chalard
3043965165
am a4156a8e: am 5a59a986: am 2cef4323: am db3713a1: am 9f9050d1: am 2cb50a05: am 93465ea3: am a747d762: am 6e78878f: am 844e5014: Merge "Increase string limits"
...
* commit 'a4156a8e55ad1ae7291ce021061b8f4f3fbedb38':
2013-04-17 19:49:41 -07:00
Baligh Uddin
79971a1f25
am 8a0205e2: (-s ours) am 2d607977: am e04cee4f: am 49201626: (-s ours) am 0b758ec7: am e7edb561: am 1368eeee: (-s ours) am 108ee452: am f980ec6c: am fc801fe8: (-s ours) am c57cf2b7: (-s ours) am 841e6016: Import translations. DO NOT MERGE
...
* commit '8a0205e249b4106cd38cf8c288d2f33c106cdb52':
2013-04-17 19:49:40 -07:00
Baligh Uddin
ea1510321d
am 4d085cfa: (-s ours) am ffb269b1: am 3df28d14: am 14d778b2: (-s ours) am 3847aa30: am 781195f4: am 119eaf7a: (-s ours) am c1283003: am 6e0e8dd6: am 8ca085db: (-s ours) Import translations. DO NOT MERGE
...
* commit '4d085cfa9b9704928fca945daef534dd25843234':
2013-04-17 19:49:38 -07:00
Baligh Uddin
e0789c736b
am 9ef4b7dd: (-s ours) am bc1bc4d0: am 719e5729: am e71516b2: (-s ours) am 5244d637: am 41db26ed: am 68889f1c: (-s ours) am 0b227bb9: am 57b68207: Import translations. DO NOT MERGE
...
* commit '9ef4b7ddf8302a4ff81d74dc9584c524bdf57971':
2013-04-17 19:49:37 -07:00
Satoshi Kataoka
dcfff5c0d2
am 4109952b: am 7a4430ac: am 5db28826: am b3796ab2: am 82a67bc8: am e3c0cca4: am e8a3e964: am 395e500b: am bb9a8e08: am f463b45d: Merge "Fix Possible NPE"
...
* commit '4109952ba8aaad8454d399094b9b588e28013316':
2013-04-17 19:49:35 -07:00
Satoshi Kataoka
3d82dbcaae
am d3022faf: am 01eb9b25: am 71f828b1: am 9ff33b6d: am d430c1b6: am d6f56350: am 619d1f73: am 0c99a379: am e42522f3: am 2cdf5351: Merge "Fix possible SIOOBE"
...
* commit 'd3022faf0c14f3d0338b38011fd9f6e75fd4e533':
2013-04-17 19:49:33 -07:00
Kurt Partridge
023bee608b
am abf64529: am 66366029: am a6092dc8: am 504bbe38: am 798820ab: am 3012c891: am 867b2380: am 35e02ccd: am bf62dc03: am ef103e1f: Merge "Close ResearchLogger upon onFinishInputView"
...
* commit 'abf645295569f6529c6eb0e9250cc2b69abcbb2d':
2013-04-17 19:49:31 -07:00
The Android Open Source Project
b241b243c8
am 740243cb: (-s ours) am cf0c1a7d: am 19289df5: am e279de02: (-s ours) am ab6fa041: am e72a088f: am a6dcb55e: (-s ours) am 62adeccd: am 577f08a3: am 22384b57: (-s ours) am 0ed901ff: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '740243cb69e39efee5f70eedb03ee3ce17529d18':
2013-04-17 19:49:27 -07:00
The Android Open Source Project
3675b5bb96
am 1996320a: (-s ours) am faa9a5ec: am d9f9ba39: am 4b176a01: (-s ours) am 83346295: am 2c7b1b82: am d2582473: (-s ours) am 22953740: Reconcile with jb-mr2-release - do not merge
...
* commit '1996320a72581fbb91c0b8bc5ad187fe4f86379c':
2013-04-17 19:49:25 -07:00
