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

11870 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
The Android Open Source Project
54f0ae278b am a6fae701: (-s ours) am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'a6fae701e344fcfda01b835c762855140d2de7e9':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
 2013-03-20 09:48:39 -07:00
The Android Open Source Project
a6fae701e3 am 0849a4b9: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit '0849a4b9b7dc4e37993ca59cab1db8b43f0d456c':
  Prevent keyboard A11y proxy from referencing a null keyboard view.
 2013-03-20 16:46:50 +00:00
The Android Open Source Project
0849a4b9b7 Reconcile with jb-mr2-release - do not merge 
Change-Id: I6854ee735b15189c2987281e5f0525687dcb3b21
 2013-03-20 09:32:58 -07: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
897af93ff6 Prevent keyboard A11y proxy from referencing a null keyboard view. 
Bug: 8402674
Change-Id: I507cdabccdabb3fd7aebc071c93eb6d4dcb9635d
 2013-03-19 17:08:52 -07: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
The Android Automerger
44346c3549 merge in jb-ub-latinimegoogle-azuki history after reset to jb-ub-latinimegoogle 2013-03-19 15:55:42 +00: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
68c09b56bf am bbadc6ed: (-s ours) am 20591e43: (-s ours) Import translations. DO NOT MERGE 
* commit 'bbadc6ed2f8a74214bcc328c7b4d7f9bb55d6ef0':
  Import translations. DO NOT MERGE
 2013-03-18 16:43:18 -07:00
Baligh Uddin
bbadc6ed2f am 20591e43: (-s ours) Import translations. DO NOT MERGE 
* commit '20591e43c42d953de1fa474670a70a10a819f60f':
  Import translations. DO NOT MERGE
 2013-03-18 23:40:56 +00:00
Baligh Uddin
20c6a91447 am c542a588: (-s ours) Import translations. DO NOT MERGE 
* commit 'c542a5882efde7b15a7278041c15a93c4d577ca9':
  Import translations. DO NOT MERGE
 2013-03-18 16:37:44 -07: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
0f1527df0d Import translations. DO NOT MERGE 
Change-Id: I26d82ea1465ff4a7617b0cd5a94bb6a8c1b8df76
Auto-generated-cl: translation import
 2013-03-18 13:23:28 -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