841c295f3c
resolved conflicts for merge of 5b048292 to master
...
Change-Id: I67ebab46954cd7b8e3e79e7fed523bafb15f8835
2013-03-19 10:48:10 +09:00
5b04829254
Merge "Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS" into jb-mr2-dev
2013-03-19 00:33:13 +00:00
c542a5882e
Import translations. DO NOT MERGE
...
Change-Id: Ie70585ed9a13c8f17b8744664bee6ab7eb511c36
Auto-generated-cl: translation import
2013-03-18 13:28:15 -07:00
2ffdb07845
Import translations. DO NOT MERGE
...
Change-Id: Ibb8964f1f799c3279460df23124ae8ec866ea873
Auto-generated-cl: translation import
2013-03-18 13:22:51 -07:00
20591e43c4
Import translations. DO NOT MERGE
...
Change-Id: I0400e547eb41b707eeb8284bd96463068baab957
Auto-generated-cl: translation import
2013-03-18 13:22:00 -07:00
9c3860ce46
Rename ProductionFlag.IS_EXPERIMENTAL to USES_DEVELOPMENT_ONLY_DIAGNOSTICS
...
bug: 8393568
Change-Id: Ie5edf44a3627aca9416145aff56bf05bbf2a05f3
2013-03-18 23:15:47 +09:00
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
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
5cb0560b00
Merge "Access the dictionary pack only if have INTERNET permission" into jb-mr2-dev
2013-03-18 11:04:53 +00:00
ce487bcf33
Access the dictionary pack only if have INTERNET permission
...
Bug: 8161354
Change-Id: I68ee3acb2955a017d25666cc2dad791798f9064a
2013-03-18 18:40:33 +09:00
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
62ed594c37
am e0e67373: Refactor parameters by naming convention
...
* commit 'e0e67373735918c78eaeaf24f127e1d28816aa29':
Refactor parameters by naming convention
2013-03-18 06:47:10 +00:00
e0e6737373
Refactor parameters by naming convention
...
Change-Id: I8bda8075b33f656ecbec08320afcd864b620fe77
2013-03-18 15:42:15 +09:00
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
3268a44e1c
am a5067333: Disable the header list of DebugSettingsActivity
...
* commit 'a50673330e012f6cca02b83eca1c047b8da319e0':
Disable the header list of DebugSettingsActivity
2013-03-15 07:10:00 +00:00
a50673330e
Disable the header list of DebugSettingsActivity
...
This change addresses the issue that the debug settings on 10-inch
tablet doesn't show up.
Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1
2013-03-15 15:33:27 +09:00
ec981aa963
am f33f1cab: [FileEncap9] Extract ResearchLogDirectory class
...
* commit 'f33f1cab2fd57fe39955593e68902554ed57a053':
[FileEncap9] Extract ResearchLogDirectory class
2013-03-14 09:01:42 -07:00
f33f1cab2f
[FileEncap9] Extract ResearchLogDirectory class
...
Previously used a monotonically increasing int. Now uses uuid and nanoseconds.
squashed in:
[FileEncap11] Read preference from ResearchSettings
Change-Id: Ic779e0a69db6b16e92c6f4b63dbe7b7add566ab6
[FileEncap12] Simplify directory cleanup invocation
Change-Id: I688047409c0343d32b11447fb625dfb726c731ec
[FileEncap14] Change log filename syntax
Change-Id: I9243b20b2eb392f81ab8c5c3d19315211240e0bc
Change-Id: I5c9d70e0cb7b0965158e17dd71dfab796bd9a440
2013-03-14 06:37:56 -07:00
60f565caab
am 7faa2caa: Merge "[Lazy4] Remove useless debug code"
...
* commit '7faa2caa80ea3b07ab317a5aa92bd048b574af27':
[Lazy4] Remove useless debug code
2013-03-14 06:16:16 -07:00
7faa2caa80
Merge "[Lazy4] Remove useless debug code"
2013-03-14 13:13:57 +00:00
95e09ea7b8
Merge "Import translations. DO NOT MERGE"
2013-03-14 05:19:07 +00:00
01f188a781
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-14 05:15:42 +00:00
620be98feb
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-14 05:15:13 +00:00
5e04234784
am fb606c62: am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
...
* commit 'fb606c6277fdf7385bf8ce876102bda016465e8f':
Clean up StaticInnerHandlerWrapper a bit
2013-03-13 20:45:44 -07:00
fb606c6277
am f0864b1d: Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
...
* commit 'f0864b1d95411ce9886a5ade13f42cb17f578828':
Clean up StaticInnerHandlerWrapper a bit
2013-03-14 03:44:00 +00:00
3153863f04
am 1ab33383: am 0d5f214a: Fix NPE found in monkey test
...
* commit '1ab33383f983082621084a65a168101e5fb526e0':
Fix NPE found in monkey test
2013-03-13 20:41:31 -07:00
f0864b1d95
Merge "Clean up StaticInnerHandlerWrapper a bit" into jb-mr2-dev
2013-03-14 03:41:01 +00:00
1ab33383f9
am 0d5f214a: Fix NPE found in monkey test
...
* commit '0d5f214aa774ab0ab7c17521984caae11c9f4c2b':
Fix NPE found in monkey test
2013-03-14 03:39:38 +00:00
41e60bf6dd
Clean up StaticInnerHandlerWrapper a bit
...
Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b
2013-03-14 12:35:47 +09:00
0d5f214aa7
Fix NPE found in monkey test
...
Bug: 8383127
Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833
2013-03-14 12:19:10 +09:00
fc00d2bfbe
am f5caf5be: am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
...
* commit 'f5caf5be994f8b7885f4e434e25019fd847ca927':
Move checking non-persistent checkbox to onResume
2013-03-13 19:38:47 -07:00
f5caf5be99
am 601a8582: Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
...
* commit '601a8582d0f761a85b6eb16e7a6b78402f6f2599':
Move checking non-persistent checkbox to onResume
2013-03-14 02:33:28 +00:00
cb8ed32be5
am 0b251201: am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
...
* commit '0b2512017edb0161d51643560cd41dac9b1a1559':
Make isInternal mutable
2013-03-13 10:27:12 -07:00
0b2512017e
am 0ab44b21: Merge "Make isInternal mutable" into jb-mr2-dev
...
* commit '0ab44b21bd6ef5e9fde329b25dfd84f6ca5c0825':
Make isInternal mutable
2013-03-13 17:24:49 +00:00
f6d68ee385
am 64b95965: Merge "[Lazy2] Pass a runnable to abort"
...
* commit '64b9596544acbeec1a416185e9472cfbd49cde60':
[Lazy2] Pass a runnable to abort
2013-03-13 06:22:31 -07:00
64b9596544
Merge "[Lazy2] Pass a runnable to abort"
2013-03-13 13:20:55 +00:00
8067b769f1
Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev
2013-03-13 10:55:04 +00:00
601a8582d0
Merge "Move checking non-persistent checkbox to onResume" into jb-mr2-dev
2013-03-13 07:52:35 +00:00
0ab44b21bd
Merge "Make isInternal mutable" into jb-mr2-dev
2013-03-13 07:41:11 +00:00
756791e6bf
Make isInternal mutable
...
Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc
2013-03-13 16:28:50 +09:00
24cea7f1fb
Move checking non-persistent checkbox to onResume
...
Bug: 8336068
Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b
2013-03-13 15:54:33 +09:00
13a82d9530
[Lazy2] Pass a runnable to abort
...
Change-Id: I721afbf426099753aa876a55323eb806b08c24d6
2013-03-12 18:56:57 -07:00
ee698210af
am 5e75e15a: Merge "[Lazy1] Switch to blocking log closures"
...
* commit '5e75e15a95185a56c0bdd19d3efbe9de9e5775f9':
[Lazy1] Switch to blocking log closures
2013-03-12 17:20:36 -07:00
5e75e15a95
Merge "[Lazy1] Switch to blocking log closures"
2013-03-13 00:18:02 +00:00
7423005b96
[Lazy1] Switch to blocking log closures
...
Change-Id: I4daec20b7b47b0d71c5aab6e17cd660015e19e71
2013-03-12 17:09:08 -07:00
df601fd0d1
Import translations. DO NOT MERGE
...
Change-Id: I16ec93523721a344e1a09b5242400fe719d07516
Auto-generated-cl: translation import
2013-03-12 13:14:01 -07:00
7f0aaaef7c
Import translations. DO NOT MERGE
...
Change-Id: Idf34e25ce4d5c162955b70c53c105f87486a7ff6
Auto-generated-cl: translation import
2013-03-12 13:08:49 -07:00
e1720957b5
Import translations. DO NOT MERGE
...
Change-Id: I478c5e0ec19d0d1f1835826606f7736059e7795c
Auto-generated-cl: translation import
2013-03-12 13:07:57 -07:00
1b985607cc
am dbfd2825: am 2bbd3065: Language dependent single/doule quotation more keys
...
* commit 'dbfd2825c8bc46d64ac2752aa04c23ab385fbbac':
Language dependent single/doule quotation more keys
2013-03-11 22:59:55 -07:00
dbfd2825c8
am 2bbd3065: Language dependent single/doule quotation more keys
...
* commit '2bbd3065d3bd9785ad1638c65f8c73f11bf21922':
Language dependent single/doule quotation more keys
2013-03-12 05:57:30 +00:00
2bbd3065d3
Language dependent single/doule quotation more keys
...
The natural way of marking quoted text vary from language to
language. This change introduces the following variations.
* LEFT and RIGHT quotations (English etc.)
* LOW-9 and LEFT quotations (German etc.)
* LOW-9 and RIGHT quotations (Dutch etc.)
* RIGHT and RIGHT quotations (Swedish etc.)
* LEFT ANGLE and RIGHT ANGLE quotations (French etc.)
* RIGHT ANGLE and LEFT ANGLE quotations
Bug: 8356419
Change-Id: I75726ab7ed783d02f189b46236c9d5079737bcff
2013-03-12 14:43:34 +09:00
92eaa6fc7c
[DO NOT MERGE] Deactivate H/W keyboard handling
...
For MR2, LatinIME should not be handling hardware keyboard
events. The feature is still work in progress.
Change-Id: I56ff18bff84ba6b5a6bc3f8829b42eaf33b72554
2013-03-12 14:22:06 +09:00
4660cf5c5b
am d7b4af9b: am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
...
* commit 'd7b4af9b560fb11ca0acb78ca937a0eeb06e147c':
Add dotted circle to combination letter
2013-03-11 02:07:10 -07:00
d7b4af9b56
am 67e264de: Merge "Add dotted circle to combination letter" into jb-mr2-dev
...
* commit '67e264de6b2367bc7522b51b1b3f52445e5dde6a':
Add dotted circle to combination letter
2013-03-11 09:05:17 +00:00
67e264de6b
Merge "Add dotted circle to combination letter" into jb-mr2-dev
2013-03-11 09:01:19 +00:00
0b928509c7
Add dotted circle to combination letter
...
This dotted circle (U+25CC) hack is needed to the device that runs API
version 14 and 15. The device that runs API version 16 and 17 has an
issue to draw incomplete successive combining code points of Hindi.
The device that runs API version greater than 17 has no issue to draw
incomplete Hindi combining letters.
Bug: 6233945
Bug: 8344448
Change-Id: I22361da908ccca3ebad0beb32e7f69219e9160d6
2013-03-11 17:23:56 +09:00
220b271dfa
[Lazy4] Remove useless debug code
...
This code is cluttering readability and getting in the way
of future updates.
Future updates will make it much easier to debug and to
test this code, so this needs to disappear.
Change-Id: I32e28ec608587b6b7c07250a2692b13e8fc98465
2013-03-08 17:46:00 -08:00
9f555dcd5c
am 2d9b7f60: am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
...
* commit '2d9b7f60dd8c8dfdf89fd3a9eb41296a58df3a22':
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 11:26:15 -08:00
2d9b7f60dd
am af37cbb4: Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
...
* commit 'af37cbb44ef40fcd15fa02456c9abda8021847ce':
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
2013-03-08 19:24:25 +00:00
af37cbb44e
Merge "Announce keyboard mode changes as a WINDOW_STATE_CHANGED event." into jb-mr2-dev
2013-03-08 19:20:00 +00:00
e6db1b9bfd
am 60906d4d: am 914d054e: Move logic of selecting key preview attribute to Key class
...
* commit '60906d4d08fdf4295c97ddfeacd61a06e7bc0f0c':
Move logic of selecting key preview attribute to Key class
2013-03-08 03:25:24 -08:00
60906d4d08
am 914d054e: Move logic of selecting key preview attribute to Key class
...
* commit '914d054ea26d18a1ba6a60f8c5e749136477bbf2':
Move logic of selecting key preview attribute to Key class
2013-03-08 11:24:13 +00:00
914d054ea2
Move logic of selecting key preview attribute to Key class
...
This change also fixes the size of a key preview letter to follow a
keyLabelFlags specification.
Change-Id: Ie13790788a16c5a053c1a2cbcac3d38314b14b7f
2013-03-08 19:44:22 +09:00
a515f3ef39
am bba39b9b: [FileEncap8] Remove useless "success" variable
...
* commit 'bba39b9b678f4fb00511ba88c12eef9082ecc628':
[FileEncap8] Remove useless "success" variable
2013-03-07 19:57:34 -08:00
d9fe8049d4
am ee3261ff: [FileEncap7] Extract uploadContents method
...
* commit 'ee3261ff558ee734e15af5424f98bb8d8776795f':
[FileEncap7] Extract uploadContents method
2013-03-07 19:13:56 -08:00
bba39b9b67
[FileEncap8] Remove useless "success" variable
...
Change-Id: Icf76bc0b795b6a9221d9a6d61c38df31af54ab7b
2013-03-07 17:43:35 -08:00
ee3261ff55
[FileEncap7] Extract uploadContents method
...
Change-Id: I018b2726533042dbcb25713ea039aec41c148db2
2013-03-07 17:43:28 -08:00
0079d3abf4
am bca8348e: Merge "[FileEncap6] Extract Uploader class"
...
* commit 'bca8348e988170506c6c6ffc862f3377cf60dc8e':
[FileEncap6] Extract Uploader class
2013-03-07 16:38:48 -08:00
bca8348e98
Merge "[FileEncap6] Extract Uploader class"
2013-03-08 00:37:14 +00:00
4436446e9b
[FileEncap6] Extract Uploader class
...
Gerrit was stuck on original change I9ef4eb7450
Change-Id: I6d4ee686944074779aca5b09b018782c7033874d
2013-03-07 16:19:44 -08:00
c2ee72a214
Announce keyboard mode changes as a WINDOW_STATE_CHANGED event.
...
Bug: 8165295
Change-Id: Ie416f6cdb68377f3e06f30e9b6363c38ba2a602d
2013-03-07 10:39:55 -08:00
adfa9b9a94
Import translations. DO NOT MERGE
...
Change-Id: I363753d020e086f5a60abd84377afff7a4b280ea
Auto-generated-cl: translation import
2013-03-07 15:05:01 +00:00
8a60ae01d3
Merge "Import translations. DO NOT MERGE" into jb-ub-latinimegoogle
2013-03-07 05:27:29 +00:00
26df5201cc
am 41c471d9: Merge "[FileEncap5] Move conditional logic to caller"
...
* commit '41c471d93d117a65a4f241e588154d84709cf5d0':
[FileEncap5] Move conditional logic to caller
2013-03-06 13:00:05 -08:00
41c471d93d
Merge "[FileEncap5] Move conditional logic to caller"
2013-03-06 20:59:04 +00:00
bc53c95720
Import translations. DO NOT MERGE
...
Change-Id: I715549b3e9bad6dd856883af8b6e828798921e38
Auto-generated-cl: translation import
2013-03-06 12:44:50 -08:00
73dad2ad41
Import translations. DO NOT MERGE
...
Change-Id: I7cc086bac4494d1238ef6c5f9939a651100ee42d
Auto-generated-cl: translation import
2013-03-06 12:43:53 -08:00
be4e180fab
am 1bc20700: Merge "[FileEncap4] Simplify logic"
...
* commit '1bc20700d594af28bb87575df4279b0bed624c52':
[FileEncap4] Simplify logic
2013-03-06 12:06:44 -08:00
1bc20700d5
Merge "[FileEncap4] Simplify logic"
2013-03-06 20:05:47 +00:00
0d4c792316
am 719bb3aa: Merge "[FileEncap3] Extract isUploadingUnconditionally method"
...
* commit '719bb3aa39c6456b7d672258432d18ad917ba263':
[FileEncap3] Extract isUploadingUnconditionally method
2013-03-06 11:16:00 -08:00
719bb3aa39
Merge "[FileEncap3] Extract isUploadingUnconditionally method"
2013-03-06 19:14:52 +00:00
dd5055862f
am 5e5b6b78: Merge "[FileEncap2] Remove mCanUpload instance variable"
...
* commit '5e5b6b78709b055ac5ed71153c0a696c63201a38':
[FileEncap2] Remove mCanUpload instance variable
2013-03-06 10:41:16 -08:00
5e5b6b7870
Merge "[FileEncap2] Remove mCanUpload instance variable"
2013-03-06 18:39:07 +00:00
a537cbf132
am b000e94e: Merge "[FileEncap1] Extract hasUploadingPermisssions method"
...
* commit 'b000e94eea988e58fe5de7cb1a2f8fc03acfd4b3':
[FileEncap1] Extract hasUploadingPermisssions method
2013-03-06 10:05:01 -08:00
b000e94eea
Merge "[FileEncap1] Extract hasUploadingPermisssions method"
2013-03-06 18:02:26 +00:00
9283644c41
[FileEncap5] Move conditional logic to caller
...
Change-Id: I6599539059f86dc8902210d325439c08035b2e2a
2013-03-06 07:19:41 -08:00
88f466678c
[FileEncap4] Simplify logic
...
Change-Id: Ibb8660d12812b867856259d3e5c04a31e281027d
2013-03-06 07:19:41 -08:00
7f7850d23a
[FileEncap3] Extract isUploadingUnconditionally method
...
- remove isUploadingUnconditionally local variable
Change-Id: I69be8708c1f306568cbb9c5cbefc9e42a87df497
2013-03-06 07:19:41 -08:00
466e665b3c
[FileEncap2] Remove mCanUpload instance variable
...
Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
2013-03-06 07:19:41 -08:00
347b2ebebf
[FileEncap1] Extract hasUploadingPermisssions method
...
Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
2013-03-06 07:19:41 -08:00
837e1f7fe7
am 68b3e4e7: Merge changes I2ded3d0a,I27ad9dfb
...
* commit '68b3e4e7d3ad6d242915d7c087664be5889cfe9b':
Little cleanups
Clean up initialization ordering
2013-03-06 07:09:52 -08:00
68b3e4e7d3
Merge changes I2ded3d0a,I27ad9dfb
...
* changes:
Little cleanups
Clean up initialization ordering
2013-03-06 15:08:08 +00:00
6f68f3da31
am dc89d76f: Merge "Make some methods visible for testing"
...
* commit 'dc89d76f6b94991be42e42336afa1e9c26ab9e94':
Make some methods visible for testing
2013-03-05 19:46:02 -08:00
dc89d76f6b
Merge "Make some methods visible for testing"
2013-03-06 03:43:55 +00:00
25343124dd
Make some methods visible for testing
...
bug: 8302967
multi-project commit with Icf915abb57ef00840ee93b67a25db42ba51f1c38
Change-Id: I105bda5bdff871508140fb99487dddbf17992790
2013-03-05 19:28:31 -08:00
84bc16af3e
Little cleanups
...
Change-Id: I2ded3d0a29610941fac27c9b26168dd6c06ceccc
2013-03-05 18:37:44 -08:00
4eeb90cd72
Clean up initialization ordering
...
This change is based on an earlier one that got stuck in Gerrit: Iab77504b
Change-Id: I27ad9dfb1bbb2300bd1e61d881a6ea0e116db066
2013-03-05 18:37:00 -08:00
149b2edb90
am 60f51684: Merge "Clean up logic in onUserLoggingConsent"
...
* commit '60f51684f17da17974602008441e9c927ac116d8':
Clean up logic in onUserLoggingConsent
2013-03-05 08:44:25 -08:00
60f51684f1
Merge "Clean up logic in onUserLoggingConsent"
2013-03-05 16:43:08 +00:00
97151f1a39
am 249c8870: am 84fa8043: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
...
* commit '249c887008272b9f9f01bad8ae83c204eceba6f3':
Add show setup wizard icon preference settings
2013-03-04 22:32:43 -08:00
249c887008
am 84fa8043: Merge "Add show setup wizard icon preference settings" into jb-mr2-dev
...
* commit '84fa8043e6bef47378b3fc32c277e33034d5c174':
Add show setup wizard icon preference settings
2013-03-05 06:30:33 +00:00
2e1b55f796
Add show setup wizard icon preference settings
...
Bug: 8239067
Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
2013-03-05 14:56:41 +09:00
a5857b3167
am 75e6fb68: Clean up PREF_USABILITY_STUDY_MODE
...
* commit '75e6fb68e91b440707b399b22fbcfcd67760a949':
Clean up PREF_USABILITY_STUDY_MODE
2013-03-04 15:15:48 -08:00
157c00145b
Clean up logic in onUserLoggingConsent
...
- Make ResearchSetting for whether the user has seen the splash screen
- Inline #setLoggingAllowed, which is short and is now only called by
onUserLoggingConsent
Change-Id: Icdf4592777b80643807b6ccf1d3896459c503e02
2013-03-04 12:05:03 -08:00
75e6fb68e9
Clean up PREF_USABILITY_STUDY_MODE
...
- Refer to a common default value in DebugSettings
- Make PREF_USABILITY_STUDY_MODE independent of the ResearchLogger
- ResearchLogger uses its own preference through ResearchSettings
multi-project commit with Ie0df836c9d779eba484b522666ec357f4e234823
Change-Id: I88547a2f619db6e7364abbbec12f9f76855dd11a
2013-03-04 12:05:03 -08:00
4036ec0783
am 788dc556: Merge "Remove MainLogBuffer#setSuggest()"
...
* commit '788dc55662585dd41a3b29d114768f80a92d8fa8':
Remove MainLogBuffer#setSuggest()
2013-03-04 07:12:08 -08:00
788dc55662
Merge "Remove MainLogBuffer#setSuggest()"
2013-03-04 15:10:31 +00:00
471a69e308
am 31a53867: am a8d3d509: Small cleanup in CompatUtils
...
* commit '31a5386794a9d1a13c6390501e8713552f53fe79':
Small cleanup in CompatUtils
2013-03-03 19:58:26 -08:00
31a5386794
am a8d3d509: Small cleanup in CompatUtils
...
* commit 'a8d3d50970cecf961940efc0e908fbb2f9b35472':
Small cleanup in CompatUtils
2013-03-04 03:56:05 +00:00
a8d3d50970
Small cleanup in CompatUtils
...
Change-Id: I9b4a8d7eae744ba6252a6475b75240248c70a3c0
2013-03-02 17:18:18 +09:00
1922fc3c73
am a8e668c8: Merge "Move UUID preference reading to ResearchSettings.java"
...
* commit 'a8e668c81e1302c726624effd303afbed7f74002':
Move UUID preference reading to ResearchSettings.java
2013-03-01 17:52:06 -08:00
a8e668c81e
Merge "Move UUID preference reading to ResearchSettings.java"
2013-03-02 01:50:03 +00:00
b094372bd6
Remove MainLogBuffer#setSuggest()
...
multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624
Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
2013-03-01 13:32:11 -08:00
4f69ffad27
Import translations. DO NOT MERGE
...
Change-Id: Ic31bc6d188785972dd3f11d96ff22592040ceb9f
Auto-generated-cl: translation import
2013-03-01 12:19:21 -08:00
fa0f05487e
Import translations. DO NOT MERGE
...
Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a
Auto-generated-cl: translation import
2013-03-01 12:12:24 -08:00
7d2e465ac0
Import translations. DO NOT MERGE
...
Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8
Auto-generated-cl: translation import
2013-03-01 12:11:04 -08:00
fff70f11a8
am 578e71e2: am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
...
* commit '578e71e28b8c95974ef7492a08d732735255c61d':
Add setup wizard launcher icon
2013-03-01 08:15:43 -08:00
578e71e28b
am 99b0dc6f: Merge "Add setup wizard launcher icon" into jb-mr2-dev
...
* commit '99b0dc6f0d18f5fdd8634e8fa533bf1b3f81a538':
Add setup wizard launcher icon
2013-03-01 16:13:45 +00:00
99b0dc6f0d
Merge "Add setup wizard launcher icon" into jb-mr2-dev
2013-03-01 16:08:09 +00:00
2223aa904a
am bc258870: Merge "[TestPrep22] Make variable package-private for testing"
...
* commit 'bc2588708abd548c83fd04a3b7f565bffc7d052f':
[TestPrep22] Make variable package-private for testing
2013-03-01 07:46:48 -08:00
bc2588708a
Merge "[TestPrep22] Make variable package-private for testing"
2013-03-01 14:48:43 +00:00
d1258a0276
am 2d8d20f4: am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
...
* commit '2d8d20f4458db015f1a38d9128a4c933c7f2a7ed':
Add translatable="false" to setup wizard's string resources
2013-03-01 05:32:17 -08:00
2d8d20f445
am 5c681c17: Merge "Add translatable="false" to setup wizard\'s string resources" into jb-mr2-dev
...
* commit '5c681c17cec355d2cf839e0dfcc38c9bf37f5f0a':
Add translatable="false" to setup wizard's string resources
2013-03-01 13:29:29 +00:00
1ffdaafd83
Add setup wizard launcher icon
...
The setup wizard icon will be hidden if the Android Keyboard is in
system image.
Bug: 8239067
Change-Id: Ib0c0c9e3a0954512c3e03e42a661cdf86eff0dca
2013-03-01 22:28:00 +09:00
5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00:00
2768f38ea1
am 31747ba7: am abaf5827: Separate suggestions from SuggestionView
...
* commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40':
Separate suggestions from SuggestionView
2013-02-28 21:20:22 -08:00
31747ba787
am abaf5827: Separate suggestions from SuggestionView
...
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
abaf5827e7
Separate suggestions from SuggestionView
...
This is a cleanup change, but it's also necessary for
Bug: 8152758
Change-Id: Id6ba06243f573fdb856f87d1df03277c9f2e5e71
2013-02-28 21:03:18 -08:00
419e3e5261
Add translatable="false" to setup wizard's string resources
...
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
00ed4704f9
Move UUID preference reading to ResearchSettings.java
...
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
bdd52d4480
am 9ba7ad8d: Merge "[TestPrep20] Clean up import statement"
...
* commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf':
[TestPrep20] Clean up import statement
2013-02-28 17:34:14 -08:00
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
14a0018d9d
am 100b6ae5: am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
...
* commit '100b6ae5cadee35720a44c071211a436e7b8c80a':
Revert "Fix description of setup wizard 1st step"
2013-02-28 14:42:29 -08:00
5a2f14fd11
am 3ccb97a7: am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
...
* commit '3ccb97a7cdb2536962d9081da03b473d5df37d16':
Fix description of setup wizard 1st step
2013-02-28 14:42:28 -08:00
053ef607fb
am 040b442f: am 18e21d58: Remove closing method from KeyboardView
...
* commit '040b442f3cd4c0a212ef7e2ec0c55541b67ec7ce':
Remove closing method from KeyboardView
2013-02-28 14:42:27 -08:00
100b6ae5ca
am 8ef4774a: Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
...
* commit '8ef4774a8614e8b67f995f016d3200ff3fd16e30':
Revert "Fix description of setup wizard 1st step"
2013-02-28 22:38:26 +00:00
3ccb97a7cd
am 3516a1f6: Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
...
* commit '3516a1f6ddcb9cc608b2e783143f5f4eded31a1f':
Fix description of setup wizard 1st step
2013-02-28 22:38:25 +00:00
040b442f3c
am 18e21d58: Remove closing method from KeyboardView
...
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
59912837b3
[TestPrep22] Make variable package-private for testing
...
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
5cd50faaca
[TestPrep20] Clean up import statement
...
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08:00
8ef4774a86
Merge "Revert "Fix description of setup wizard 1st step"" into jb-mr2-dev
2013-02-28 10:28:50 +00:00
e359789593
Revert "Fix description of setup wizard 1st step"
...
This reverts commit b5f4cac532
2013-02-28 10:25:42 +00:00
3516a1f6dd
Merge "Fix description of setup wizard 1st step" into jb-mr2-dev
2013-02-28 07:55:53 +00:00
b5f4cac532
Fix description of setup wizard 1st step
...
Bug: 8265778
Change-Id: Ie25be9d43089b2e9cb7b690df374bad1f8966b16
2013-02-28 16:55:11 +09:00
a5070711d9
am abaa88fd: Merge "[TestPrep18] Make class public for testing"
...
* commit 'abaa88fd4e33de54f3efd980ac0fef4935e439db':
[TestPrep18] Make class public for testing
2013-02-27 17:02:59 -08:00
abaa88fd4e
Merge "[TestPrep18] Make class public for testing"
2013-02-28 01:00:46 +00:00
b06798c599
am a04fbce4: Merge "[TestPrep17] Allow fake dictionary for testing"
...
* commit 'a04fbce41273b0b7d464e4d823de5f0d54549673':
[TestPrep17] Allow fake dictionary for testing
2013-02-27 16:00:23 -08:00
a04fbce412
Merge "[TestPrep17] Allow fake dictionary for testing"
2013-02-27 23:59:01 +00:00
cbf3f2655a
am 2ed1ec41: am 016046eb: Keep Keyboard object while closing KeyboardView
...
* commit '2ed1ec411d8b539890359f8ced8e1fe8d90344cd':
Keep Keyboard object while closing KeyboardView
2013-02-27 15:27:35 -08:00
2ed1ec411d
am 016046eb: Keep Keyboard object while closing KeyboardView
...
* commit '016046eb4e3ea28745b9a29c41c126801f177f58':
Keep Keyboard object while closing KeyboardView
2013-02-27 23:22:32 +00:00
Tadashi G. Takaoka
Ken Wakasa
Baligh Uddin
Jean Chalard
Satoshi Kataoka
Kurt Partridge
Svetoslav Ganov
Alan Viverette