aboutsummaryrefslogtreecommitdiffstats
path: root/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Fix appname"Satoshi Kataoka2013-03-2257-1343/+49
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix appname•••Bug: 6789579 Change-Id: Ic4694e36e0846af95fa8dcdef919be251983b528 Satoshi Kataoka2013-03-2257-1343/+49
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | Remove unused import•••This is a follow up of I062c076f. Change-Id: Ic3a83d95aed1f86121ed552a6f20f0d24f9d6d83 Tadashi G. Takaoka2013-03-221-1/+0
|/ / / / / / /
* | | | | | | Merge "Remove reference to string.english_ime_name"Tadashi G. Takaoka2013-03-221-4/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove reference to string.english_ime_name•••Bug: 6789579 Change-Id: I062c076f0ca16cc39274e20955aa83d667b7380d Tadashi G. Takaoka2013-03-221-4/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Use correct appname resource"Satoshi Kataoka2013-03-221-7/+8
|\ \ \ \ \ \
| * | | | | | Use correct appname resource•••Bug: 6789579 Change-Id: Id11435a28d6c5b6c72867814e23f5e62429080f8 Satoshi Kataoka2013-03-221-7/+8
| | |_|_|_|/ | |/| | | |
* | | | | | am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c44...•••* 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 ... Baligh Uddin2013-03-221-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null...•••* commit '9da7fa0f50fcc1bbbce648940c0f6849d9e6624c': Prevent keyboard A11y proxy from referencing a null keyboard view. Alan Viverette2013-03-201-0/+25
| | |_|/ | |/| |
| * | | am a462cd80: Support feedback•••* commit 'a462cd80ae9d07cea596c61c54d7b1b2ba6c6645': Support feedback Satoshi Kataoka2013-03-195-0/+56
| |\ \ \
| * \ \ \ am 8e005f29: am 1061bfdb: Break dependencies to allow offdevice tests to build•••* commit '8e005f2989de98cd284f1f5210f4c9d8d658e5e7': Break dependencies to allow offdevice tests to build Jean Chalard2013-03-198-34/+61
| |\ \ \ \
| * \ \ \ \ am 6d90a10a: am 0cc0544a: Merge the dictionary pack in Latin IME.•••* commit '6d90a10a343723b8613fd22d323c586ecc33b284': Merge the dictionary pack in Latin IME. Jean Chalard2013-03-1993-34/+7481
| |\ \ \ \ \
| * \ \ \ \ \ am 841c295f: resolved conflicts for merge of 5b048292 to master•••* commit '841c295f3c99214f45924434d9c0bb5b4760578d': Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS Tadashi G. Takaoka2013-03-1820-93/+111
| |\ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGE•••Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873 Auto-generated-cl: translation import Baligh Uddin2013-03-187-9/+9
| * | | | | | | am f8325ec4: am 5cb0560b: Merge "Access the dictionary pack only if have INTE...•••* commit 'f8325ec4bb83f91d53949562556652bff315f088': Access the dictionary pack only if have INTERNET permission Jean Chalard2013-03-181-2/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 62ed594c: am e0e67373: Refactor parameters by naming convention•••* commit '62ed594c373e172ba7b32d099911b318dcbfc7b2': Refactor parameters by naming convention Satoshi Kataoka2013-03-171-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 3268a44e: am a5067333: Disable the header list of DebugSettingsActivity•••* commit '3268a44e1cde2f4e14d01ac62e2e1a6e9a70a601': Disable the header list of DebugSettingsActivity Tadashi G. Takaoka2013-03-152-7/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am f33f1cab: [FileEncap9] Extract ResearchLogDirectory class•••* commit 'f33f1cab2fd57fe39955593e68902554ed57a053': [FileEncap9] Extract ResearchLogDirectory class Kurt Partridge2013-03-145-82/+153
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 7faa2caa: Merge "[Lazy4] Remove useless debug code"•••* commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27': [Lazy4] Remove useless debug code Kurt Partridge2013-03-141-33/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-1449-3/+553
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6 Auto-generated-cl: translation import Baligh Uddin2013-03-1249-3/+553
| * | | | | | | | | | | | | am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" in...•••* commit 'fb606c6277fdf7385bf8ce876102bda016465e8f': Clean up StaticInnerHandlerWrapper a bit Tadashi G. Takaoka2013-03-131-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 1ab33383: am 0d5f214a: Fix NPE found in monkey test•••* commit '1ab33383f983082621084a65a168101e5fb526e0': Fix NPE found in monkey test Tadashi G. Takaoka2013-03-131-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onR...•••* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927': Move checking non-persistent checkbox to onResume Tadashi G. Takaoka2013-03-131-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev•••* commit '0b2512017edb0161d51643560cd41dac9b1a1559': Make isInternal mutable Satoshi Kataoka2013-03-135-16/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 64b95965: Merge "[Lazy2] Pass a runnable to abort"•••* commit '64b9596544acbeec1a416185e9472cfbd49cde60': [Lazy2] Pass a runnable to abort Kurt Partridge2013-03-131-4/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures"•••* commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9': [Lazy1] Switch to blocking log closures Kurt Partridge2013-03-122-42/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys•••* commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac': Language dependent single/doule quotation more keys Tadashi G. Takaoka2013-03-114-479/+547
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" int...•••* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c': Add dotted circle to combination letter Tadashi G. Takaoka2013-03-1117-110/+679
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_S...•••* commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22': Announce keyboard mode changes as a WINDOW_STATE_CHANGED event. Svetoslav Ganov2013-03-084-6/+124
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to Ke...•••* commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c': Move logic of selecting key preview attribute to Key class Tadashi G. Takaoka2013-03-082-17/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bba39b9b: [FileEncap8] Remove useless "success" variable•••* commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628': [FileEncap8] Remove useless "success" variable Kurt Partridge2013-03-071-13/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ee3261ff: [FileEncap7] Extract uploadContents method•••* commit 'ee3261ff558ee734e15af5424f98bb8d8776795f': [FileEncap7] Extract uploadContents method Kurt Partridge2013-03-071-8/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bca8348e: Merge "[FileEncap6] Extract Uploader class"•••* commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e': [FileEncap6] Extract Uploader class Kurt Partridge2013-03-072-162/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogleBaligh Uddin2013-03-071-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38 Auto-generated-cl: translation import Baligh Uddin2013-03-061-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"•••* commit '41c471d93d117a65a4f241e588154d84709cf5d0': [FileEncap5] Move conditional logic to caller Kurt Partridge2013-03-061-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1bc20700: Merge "[FileEncap4] Simplify logic"•••* commit '1bc20700d594af28bb87575df4279b0bed624c52': [FileEncap4] Simplify logic Kurt Partridge2013-03-061-4/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"•••* commit '719bb3aa39c6456b7d672258432d18ad917ba263': [FileEncap3] Extract isUploadingUnconditionally method Kurt Partridge2013-03-061-5/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable"•••* commit '5e5b6b78709b055ac5ed71153c0a696c63201a38': [FileEncap2] Remove mCanUpload instance variable Kurt Partridge2013-03-061-6/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method"•••* commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3': [FileEncap1] Extract hasUploadingPermisssions method Kurt Partridge2013-03-061-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 68b3e4e7: Merge changes I2ded3d0a,I27ad9dfb•••* commit '68b3e4e7d3ad6d242915d7c087664be5889cfe9b': Little cleanups Clean up initialization ordering Kurt Partridge2013-03-061-36/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am dc89d76f: Merge "Make some methods visible for testing"•••* commit 'dc89d76f6b94991be42e42336afa1e9c26ab9e94': Make some methods visible for testing Kurt Partridge2013-03-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 60f51684: Merge "Clean up logic in onUserLoggingConsent"•••* commit '60f51684f17da17974602008441e9c927ac116d8': Clean up logic in onUserLoggingConsent Kurt Partridge2013-03-052-17/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 249c8870: am 84fa8043: Merge "Add show setup wizard icon preference settin...•••* commit '249c887008272b9f9f01bad8ae83c204eceba6f3': Add show setup wizard icon preference settings Tadashi G. Takaoka2013-03-045-32/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 75e6fb68: Clean up PREF_USABILITY_STUDY_MODE•••* commit '75e6fb68e91b440707b399b22fbcfcd67760a949': Clean up PREF_USABILITY_STUDY_MODE Kurt Partridge2013-03-044-15/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 788dc556: Merge "Remove MainLogBuffer#setSuggest()"•••* commit '788dc55662585dd41a3b29d114768f80a92d8fa8': Remove MainLogBuffer#setSuggest() Kurt Partridge2013-03-043-11/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 31a53867: am a8d3d509: Small cleanup in CompatUtils•••* commit '31a5386794a9d1a13c6390501e8713552f53fe79': Small cleanup in CompatUtils Ken Wakasa2013-03-031-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a8e668c8: Merge "Move UUID preference reading to ResearchSettings.java"•••* commit 'a8e668c81e1302c726624effd303afbed7f74002': Move UUID preference reading to ResearchSettings.java Kurt Partridge2013-03-012-19/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGE•••Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a Auto-generated-cl: translation import Baligh Uddin2013-03-0149-586/+14