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