Kurt Partridge
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
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
4036ec0783
am 788dc556
: Merge "Remove MainLogBuffer#setSuggest()"
...
* commit '788dc55662585dd41a3b29d114768f80a92d8fa8':
Remove MainLogBuffer#setSuggest()
2013-03-04 07:12:08 -08:00
Kurt Partridge
788dc55662
Merge "Remove MainLogBuffer#setSuggest()"
2013-03-04 15:10:31 +00:00
Satoshi Kataoka
8c060a76bf
am e691f93c
: am d8708911
: Add CorrectionType
...
* commit 'e691f93c9dd7558b2ab92b1830683a17d74659a5':
Add CorrectionType
2013-03-04 01:00:54 -08:00
Satoshi Kataoka
e691f93c9d
am d8708911
: Add CorrectionType
...
* commit 'd8708911709527bb88de4f5a776ec7a20391fe37':
Add CorrectionType
2013-03-04 08:59:42 +00:00
Satoshi Kataoka
d870891170
Add CorrectionType
...
Change-Id: Ibbad8476be40e322cadfbf9636a13e575338ec1d
2013-03-04 17:47:47 +09:00
Satoshi Kataoka
3cb8e95de0
am 81d43233
: am 19304724
: Merge "Cleanup getProximityType" into jb-mr2-dev
...
* commit '81d43233f58281fe5b13d8561b9d39ea1b1dc80d':
Cleanup getProximityType
2013-03-03 23:26:01 -08:00
Satoshi Kataoka
81d43233f5
am 19304724
: Merge "Cleanup getProximityType" into jb-mr2-dev
...
* commit '1930472404104139f93c5a88d29bfc8b837fb198':
Cleanup getProximityType
2013-03-04 07:25:00 +00:00
Satoshi Kataoka
1930472404
Merge "Cleanup getProximityType" into jb-mr2-dev
2013-03-04 07:20:31 +00:00
Ken Wakasa
471a69e308
am 31a53867
: am a8d3d509
: Small cleanup in CompatUtils
...
* commit '31a5386794a9d1a13c6390501e8713552f53fe79':
Small cleanup in CompatUtils
2013-03-03 19:58:26 -08: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
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
Kurt Partridge
a8e668c81e
Merge "Move UUID preference reading to ResearchSettings.java"
2013-03-02 01:50:03 +00:00
Baligh Uddin
386c8a1f45
am 96de3622
: (-s ours) am 7d2e465a
: (-s ours) Import translations. DO NOT MERGE
...
* commit '96de3622de0733e8a79d9192158356ee7b15652e':
Import translations. DO NOT MERGE
2013-03-01 14:45:10 -08:00
Baligh Uddin
6a8cfc621b
am 4f69ffad
: (-s ours) Import translations. DO NOT MERGE
...
* commit '4f69ffad274646348cb6602ad2edc3f2eb8cf041':
Import translations. DO NOT MERGE
2013-03-01 14:45:09 -08:00
Baligh Uddin
96de3622de
am 7d2e465a
: (-s ours) Import translations. DO NOT MERGE
...
* commit '7d2e465ac02157aede689ca3146c9aee79de898c':
Import translations. DO NOT MERGE
2013-03-01 22:43:51 +00:00
Kurt Partridge
b094372bd6
Remove MainLogBuffer#setSuggest()
...
multi-project commit with Ia98b1406fc2ee11a96893c77ea58d800fece7624
Change-Id: I8bc3d07b83dbe7d8fc56a618de07dade7f510b13
2013-03-01 13:32:11 -08:00
Baligh Uddin
4f69ffad27
Import translations. DO NOT MERGE
...
Change-Id: Ic31bc6d188785972dd3f11d96ff22592040ceb9f
Auto-generated-cl: translation import
2013-03-01 12:19:21 -08:00
Baligh Uddin
465ed2436d
Import translations. DO NOT MERGE
...
Change-Id: I545d16f26fc007432057bc1520e0d85226f026d3
Auto-generated-cl: translation import
2013-03-01 12:13:22 -08:00
Baligh Uddin
fa0f05487e
Import translations. DO NOT MERGE
...
Change-Id: If6d46dc75d94094554f018a3bc20d20363cab21a
Auto-generated-cl: translation import
2013-03-01 12:12:24 -08:00
Baligh Uddin
7d2e465ac0
Import translations. DO NOT MERGE
...
Change-Id: I1852e989314ddd2e3f806486a0774ffe446473e8
Auto-generated-cl: translation import
2013-03-01 12:11:04 -08:00
Tadashi G. Takaoka
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
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
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
Kurt Partridge
bc2588708a
Merge "[TestPrep22] Make variable package-private for testing"
2013-03-01 14:48:43 +00:00
Tadashi G. Takaoka
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
Tadashi G. Takaoka
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
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
Tadashi G. Takaoka
5c681c17ce
Merge "Add translatable="false" to setup wizard's string resources" into jb-mr2-dev
2013-03-01 13:26:26 +00:00
Satoshi Kataoka
697a9d3541
Cleanup getProximityType
...
Change-Id: I89c5871bbcf0fe3d5f50052e8f64932d8efbce94
2013-03-01 20:22:29 +09:00
Satoshi Kataoka
c2acf42ed2
am 61d2e10b
: am f06ab499
: Merge "rename define" into jb-mr2-dev
...
* commit '61d2e10bd30050a9e851e5625857c7f17e34e544':
rename define
2013-03-01 02:40:08 -08:00
Satoshi Kataoka
61d2e10bd3
am f06ab499
: Merge "rename define" into jb-mr2-dev
...
* commit 'f06ab499999ead130660e5bc17324225503994ad':
rename define
2013-03-01 10:39:02 +00:00
Satoshi Kataoka
f06ab49999
Merge "rename define" into jb-mr2-dev
2013-03-01 10:32:40 +00:00
Satoshi Kataoka
fd0e93295f
rename define
...
Change-Id: I4767eff187c76541648cc066a88293e46a90f033
2013-03-01 19:05:04 +09:00
Jean Chalard
2768f38ea1
am 31747ba7
: am abaf5827
: Separate suggestions from SuggestionView
...
* commit '31747ba7874f57fe6b259e8744e42dbfe02a8d40':
Separate suggestions from SuggestionView
2013-02-28 21:20:22 -08: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
Tadashi G. Takaoka
419e3e5261
Add translatable="false" to setup wizard's string resources
...
Bug: 8265778
Change-Id: I351dc2b88e4fa33c2008107a1d6d19940c4db6ab
2013-03-01 13:31:57 +09:00
Kurt Partridge
00ed4704f9
Move UUID preference reading to ResearchSettings.java
...
Change-Id: I8157249259cf8c3218c5c82a5729f4cbc1fb4eeb
2013-02-28 19:54:21 -08:00
Satoshi Kataoka
b0970fa6b4
am 50705703
: am bc218dda
: Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
...
* commit '50705703eda5b61c0fa9d18b8239825636a139f2':
add a default vaule for getMatchedProximityType
2013-02-28 19:49:01 -08:00
Satoshi Kataoka
50705703ed
am bc218dda
: Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
...
* commit 'bc218dda8bd9395be0eec3836ed06fb27ce0968f':
add a default vaule for getMatchedProximityType
2013-03-01 03:46:11 +00:00
Satoshi Kataoka
bc218dda8b
Merge "add a default vaule for getMatchedProximityType" into jb-mr2-dev
2013-03-01 03:42:08 +00:00
Satoshi Kataoka
a406f803bc
add a default vaule for getMatchedProximityType
...
Change-Id: Id940f1226ca493d0a1b82e2810b1882184ef8987
2013-03-01 12:36:35 +09:00
Kurt Partridge
bdd52d4480
am 9ba7ad8d
: Merge "[TestPrep20] Clean up import statement"
...
* commit '9ba7ad8d4f399d31251c74f5f5116c8d580500cf':
[TestPrep20] Clean up import statement
2013-02-28 17:34:14 -08:00
Kurt Partridge
9ba7ad8d4f
Merge "[TestPrep20] Clean up import statement"
2013-03-01 01:32:35 +00:00
Tadashi G. Takaoka
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