Commit graph

4395 commits

Author SHA1 Message Date
Kurt Partridge
5e5b6b7870 Merge "[FileEncap2] Remove mCanUpload instance variable" 2013-03-06 18:39:07 +00:00
Kurt Partridge
b000e94eea Merge "[FileEncap1] Extract hasUploadingPermisssions method" 2013-03-06 18:02:26 +00:00
Kurt Partridge
466e665b3c [FileEncap2] Remove mCanUpload instance variable
Change-Id: I62a100c4d73bb64a14a7994f7dd9af7b6946d064
2013-03-06 07:19:41 -08:00
Kurt Partridge
347b2ebebf [FileEncap1] Extract hasUploadingPermisssions method
Change-Id: Ica1dabcf066cde6580035f12fa35a404cb32fb3f
2013-03-06 07:19:41 -08:00
Kurt Partridge
68b3e4e7d3 Merge changes I2ded3d0a,I27ad9dfb
* changes:
  Little cleanups
  Clean up initialization ordering
2013-03-06 15:08:08 +00:00
Kurt Partridge
dc89d76f6b Merge "Make some methods visible for testing" 2013-03-06 03:43:55 +00:00
Kurt Partridge
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
Kurt Partridge
84bc16af3e Little cleanups
Change-Id: I2ded3d0a29610941fac27c9b26168dd6c06ceccc
2013-03-05 18:37:44 -08:00
Kurt Partridge
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
Kurt Partridge
60f51684f1 Merge "Clean up logic in onUserLoggingConsent" 2013-03-05 16:43:08 +00:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
2e1b55f796 Add show setup wizard icon preference settings
Bug: 8239067
Change-Id: If6106a3632d3abad3e22ce29f1351525a5152ec7
2013-03-05 14:56:41 +09:00
Kurt Partridge
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
Kurt Partridge
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
Kurt Partridge
788dc55662 Merge "Remove MainLogBuffer#setSuggest()" 2013-03-04 15:10:31 +00:00
Ken Wakasa
31a5386794 am a8d3d509: Small cleanup in CompatUtils
* commit 'a8d3d50970cecf961940efc0e908fbb2f9b35472':
  Small cleanup in CompatUtils
2013-03-04 03:56:05 +00:00
Ken Wakasa
a8d3d50970 Small cleanup in CompatUtils
Change-Id: I9b4a8d7eae744ba6252a6475b75240248c70a3c0
2013-03-02 17:18:18 +09:00
Kurt Partridge
a8e668c81e Merge "Move UUID preference reading to ResearchSettings.java" 2013-03-02 01:50:03 +00:00
Kurt Partridge
b094372bd6 Remove MainLogBuffer#setSuggest()
multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624

Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
2013-03-01 13:32:11 -08:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
99b0dc6f0d Merge "Add setup wizard launcher icon" into jb-mr2-dev 2013-03-01 16:08:09 +00:00
Kurt Partridge
bc2588708a Merge "[TestPrep22] Make variable package-private for testing" 2013-03-01 14:48:43 +00:00
Tadashi G. Takaoka
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
Jean Chalard
31747ba787 am abaf5827: Separate suggestions from SuggestionView
* commit 'abaf5827e7a7f5f6c5d8d98e03e6b9528b0c9351':
  Separate suggestions from SuggestionView
2013-03-01 05:17:52 +00:00
Jean Chalard
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
Kurt Partridge
00ed4704f9 Move UUID preference reading to ResearchSettings.java
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
Kurt Partridge
9ba7ad8d4f Merge "[TestPrep20] Clean up import statement" 2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka
040b442f3c am 18e21d58: Remove closing method from KeyboardView
* commit '18e21d58f7c0b5c5c001835c093221c573a841c4':
  Remove closing method from KeyboardView
2013-02-28 22:38:11 +00:00
Kurt Partridge
59912837b3 [TestPrep22] Make variable package-private for testing
Change-Id: I902a6a40df1c672c611672f34d2f3237b0d1821b
2013-02-28 06:45:35 -08:00
Kurt Partridge
5cd50faaca [TestPrep20] Clean up import statement
Change-Id: Ifcfec09b669d8b2012b1c960bd4b1471c7946870
2013-02-28 06:45:34 -08:00
Kurt Partridge
abaa88fd4e Merge "[TestPrep18] Make class public for testing" 2013-02-28 01:00:46 +00:00
Kurt Partridge
a04fbce412 Merge "[TestPrep17] Allow fake dictionary for testing" 2013-02-27 23:59:01 +00:00
Tadashi G. Takaoka
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
18e21d58f7 Remove closing method from KeyboardView
This is a follow up of Ie00ba827. After the change, the
KeyboardView.closing() method does nothing important.

Change-Id: I9659ea56ce82a95f8798a4136bf93f164b67fae7
2013-02-27 17:35:20 +09:00
Tadashi G. Takaoka
016046eb4e Keep Keyboard object while closing KeyboardView
Bug: 8217626
Change-Id: Ie00ba827bc391aa152427965c57488b66308a75c
2013-02-27 17:30:16 +09:00
Kurt Partridge
424a976e58 Merge "Ensure Preference listener is unregistered" 2013-02-27 03:49:40 +00:00
Kurt Partridge
96d019f183 [TestPrep18] Make class public for testing
Change-Id: I4b457f44dd6a5a595c61a62061ea02c251fa9ab1
2013-02-26 19:22:56 -08:00
Kurt Partridge
5ee261a990 [TestPrep17] Allow fake dictionary for testing
Currently ResearchLog requires a full dictionary to perform privacy-related checks.
This makes testing difficult.  This change allows a fake dictionary to be used instead.

Change-Id: Ifca5bd8647475a6b84e4324117e0faa0a35479ee
2013-02-26 19:22:55 -08:00
Kurt Partridge
7e2c1e69bf Ensure Preference listener is unregistered
Change-Id: I1a4d1e7bc45fc30cb1b63ea6020f0eee6e804333
2013-02-26 18:40:34 -08:00
Kurt Partridge
64c34122f2 Merge "[TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call" 2013-02-27 00:41:12 +00:00
Kurt Partridge
62abc40d7d Merge "[TestPrep10] Add some comments" 2013-02-26 23:09:48 +00:00
Kurt Partridge
f170f145af [TestPrep11] Only use mHasWrittenData to control JsonWriter#endArray() call
Change-Id: If2107e38575b009a4c372194ecd827e27bdbb2b4
2013-02-26 15:02:52 -08:00
Kurt Partridge
a5e564bea0 [TestPrep10] Add some comments
Change-Id: Ia8e0bd72b0dc09bfc256ec5d1996637554376b5f
2013-02-26 15:02:52 -08:00
Tadashi G. Takaoka
183fe80031 Small cleanup of RunInLocale
Change-Id: Ib588e67da2c88345fc4eb51587b07ebfa434e0bb
2013-02-26 19:11:49 +09:00
Jean Chalard
0f3c05cd6b Merge "Send the dictionaries descriptions to the dict pack" 2013-02-23 10:18:03 +00:00
Jean Chalard
c6799ffeab Send the dictionaries descriptions to the dict pack
Bug: 8255795
Change-Id: I12a5922f50c2d2e3aa639457abcc1483e6a48721
2013-02-23 01:46:39 -08:00
Jean Chalard
76ead0ead0 Fix a possible crash
If the dictionary ID, as indicated in the metadata, is
less than three chars long, it crashes LatinIME.
Of course we don't have such dictionary IDs in the current
metadata, but it's still better to be able to handle
the case gracefully ^^;

Change-Id: I60cdf6f8ecce9f4d44b42ddd5d157aebff9a4163
2013-02-23 01:41:44 -08:00
Jean Chalard
aefaec3c5f Remove a cluttering log
Bug: 8175067
Change-Id: I9a104a32ba2b3b52a5dfa250f8c642abd6169cc0
2013-02-23 00:48:10 -08:00
Jean Chalard
8b4023c4d6 Merge "Tiny cleanup" 2013-02-23 08:07:27 +00:00
Jean Chalard
2521edec09 Fix a bug with the passed dictionary id
We used to make the dictionary that we passed to the
dictionary pack as an initial value based on the locale.
This is wrong - it should be read from the dictionary.
This change fixes that.

Bug: 7005813
Change-Id: Ib08ed31dd9c216f6f7b9c6c3174ca514bf96e06f
2013-02-22 20:49:48 -08:00