Commit graph

11210 commits

Author SHA1 Message Date
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
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
Baligh Uddin
4b66d0c483 am a01fb001: am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit 'a01fb001b4589eb51fdb5bbea8f8210730a57d79':
2013-03-27 21:45:01 -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
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
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
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
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
841e60163b Import translations. DO NOT MERGE
Change-Id: I7ddec7dead61077b9972ca3a661571c096650bec
Auto-generated-cl: translation import
2013-03-27 12:32:41 -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
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
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
Baligh Uddin
2a01fc22d4 am 1e5add78: (-s ours) am 7668deec: (-s ours) am 21160c4e: Import translations. DO NOT MERGE
* commit '1e5add78094c7716ce063748e839d223b5a115a5':
  Import translations. DO NOT MERGE
2013-03-22 18:53:15 -07: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
8636ba03a7 am afe343c1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'afe343c16fbb3c15ff8d6cf376b750737c675307':
  Import translations. DO NOT MERGE
2013-03-22 18:49:52 -07: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
5709e859a5 Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle 2013-03-23 01:46:36 +00:00
Alan Viverette
e47ee18192 am a7b4398c: Don\'t announce changes for A11y within the same keyboard mode.
* commit 'a7b4398c35eaf87fd00086f660af7710c071c369':
  Don't announce changes for A11y within the same keyboard mode.
2013-03-22 17:49:59 -07: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
1af30bab94 Import translations. DO NOT MERGE
Change-Id: I31bcd942f18166658143b4dbd5695f66f4717a22
Auto-generated-cl: translation import
2013-03-22 13:32:54 -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
97ddbf22d5 am 19a70087: Merge "Fix appname"
* commit '19a7008728867aa639a2fac66459ce3fe0526cd8':
  Fix appname
2013-03-22 00:25:19 -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
1e3c73de06 am 3a8a63c3: Remove unused import
* commit '3a8a63c3999c0ffccbaa08a860e807bb59c1643f':
  Remove unused import
2013-03-21 23:25:36 -07: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
3d0fee4e09 am c6452f25: Merge "Remove reference to string.english_ime_name"
* commit 'c6452f2569448aee841ad70baaa27c660a753aff':
  Remove reference to string.english_ime_name
2013-03-21 22:13:40 -07:00
Satoshi Kataoka
457283308a am f4352c2c: Merge "Use correct appname resource"
* commit 'f4352c2ce3849444c4a930fe7e5319ecdfd5d18a':
  Use correct appname resource
2013-03-21 22:13:39 -07: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
a01fb001b4 am a3e47f87: am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev
* commit 'a3e47f87805f31edfc93c0701bb25c788eb3c707':
  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
2013-03-21 22:05:14 -07: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
Baligh Uddin
ba0e497a0c Merge commit '525bbec9eccbf5bd4581c2b9908e46f61c4431ad' into jb-mr2-dev 2013-03-21 21:52:17 -07:00
Satoshi Kataoka
c1c3e03c12 am 140b6705: Merge "Fix appname"
* commit '140b6705ece0559f2ea9647044b3baf6a314f3d3':
  Fix appname
2013-03-21 20:45:30 -07:00