Commit Graph

1781 Commits

Author SHA1 Message Date
Bennie Ouyang
afb749fcd7 Merge "Added Notification Stress Tests" into nyc-dev am: fc90ffe
am: b45b0b7

* commit 'b45b0b71058053dd7fd00f47ad92a430b48b29fb':
  Added Notification Stress Tests

Change-Id: I16ac8abe9f5b4c3c6431e24d807f9b8fb23ab6d3
2016-04-08 17:13:36 +00:00
Bennie Ouyang
b45b0b7105 Merge "Added Notification Stress Tests" into nyc-dev
am: fc90ffe

* commit 'fc90ffe392c3f00d85998e778e5b0bcd5240ce93':
  Added Notification Stress Tests

Change-Id: I66b8ae96b0f6aa02ee228f2d85b52fe3cb1ac148
2016-04-08 17:08:08 +00:00
Bennie Ouyang
fc90ffe392 Merge "Added Notification Stress Tests" into nyc-dev 2016-04-08 16:58:21 +00:00
Bennie Ouyang
a6b8e9c313 Added Notification Stress Tests
Change-Id: I956ec68bf752becfedb3eca2483ae5c212166dd2
2016-04-07 16:15:50 -07:00
Adam Lesinski
3acf361908 Merge "Remove tests that have been moved to CTS" into nyc-dev am: 41c1bb8
am: 968e6e9

* commit '968e6e940a86633192fd81802aa6846dc2d13301':
  Remove tests that have been moved to CTS

Change-Id: I2053b6ea6865e7dc347344a21da13601135e41f9
2016-04-07 17:12:44 +00:00
Adam Lesinski
968e6e940a Merge "Remove tests that have been moved to CTS" into nyc-dev
am: 41c1bb8

* commit '41c1bb8f4a5a1f2f0a23d6cece525eaea50f57b3':
  Remove tests that have been moved to CTS

Change-Id: I39012b182d637d37fccafbc13677089885dcbcdb
2016-04-07 17:08:33 +00:00
Adam Lesinski
41c1bb8f4a Merge "Remove tests that have been moved to CTS" into nyc-dev 2016-04-07 17:04:13 +00:00
Keisuke Kuroyanagi
3c4a67def0 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev am: d119ab9
am: 240c23b

* commit '240c23b5340a5a37cb162d3fbef5c880cabca2d8':
  Rewrite SuggestionsPopupWindowTest using espresso.

Change-Id: I70b0a86b391fed471cd2f7d1e14b55c818bab90b
2016-04-07 04:40:35 +00:00
Keisuke Kuroyanagi
240c23b534 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev
am: d119ab9

* commit 'd119ab94c0d55c3077b1a7c8ca6a54baf6d7087b':
  Rewrite SuggestionsPopupWindowTest using espresso.

Change-Id: I5dca34e91ee05a1cc3cea3f5fa016df675266cb5
2016-04-07 04:37:50 +00:00
Keisuke Kuroyanagi
d119ab94c0 Merge "Rewrite SuggestionsPopupWindowTest using espresso." into nyc-dev 2016-04-07 04:33:11 +00:00
Adam Lesinski
04518f8e9f Remove tests that have been moved to CTS
ag/906284

Change-Id: I9e5da9239a62dbc85a1b22f8fe8876da65675d9a
2016-04-06 17:47:10 -07:00
Keisuke Kuroyanagi
31eb74fb2b Rewrite SuggestionsPopupWindowTest using espresso.
- Rewrite existing test about text appearance.
- Add new tests for suggestions popup.

Bug: 25904136
Bug: 27765262
Change-Id: I12e522436a83fa264cd22176d054877eec411708
2016-04-06 19:37:46 +09:00
Makoto Onuki
a912446c44 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev am: ca94f29
am: ec0a5e0

* commit 'ec0a5e0bead4ae51b60a02fad3a9fcedbfb2f461':
  Make FastXmlSerializer more suitable to persist arbitrary strings

Change-Id: Ibb0a004e26c510faefc3b0adf821440829863af6
2016-04-06 00:47:08 +00:00
Makoto Onuki
ec0a5e0bea Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev
am: ca94f29

* commit 'ca94f29366b9b6e3211351c2d098060114ef5fa8':
  Make FastXmlSerializer more suitable to persist arbitrary strings

Change-Id: Ib9a061aaad82054c0060cbc2b84118a71d1c098b
2016-04-06 00:43:46 +00:00
Makoto Onuki
ca94f29366 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev 2016-04-06 00:36:52 +00:00
Jeremy Joslin
be6fe330aa Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev am: b770ed1
am: 7acd105

* commit '7acd10541142fef3e6bff673e6770de27076df7b':
  Have the NetworkScoreService bind to the scorer.

Change-Id: I2fc501b9380aa9c4411df52bbeb4e846c14ce802
2016-04-05 23:38:23 +00:00
Philip P. Moltmann
a9706bf5f9 Merge "We only have one mock service." into nyc-dev am: c05a7a0
am: c48311f

* commit 'c48311f0ebf3d893e367ffdf602d33d65304e456':
  We only have one mock service.

Change-Id: I4a90604040296eb562ec8c605e9ace6976302024
2016-04-05 23:38:19 +00:00
Jeremy Joslin
7acd105411 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev
am: b770ed1

* commit 'b770ed132813356c2b1548b0a98c1edb565c7340':
  Have the NetworkScoreService bind to the scorer.

Change-Id: I319344d3362068624b4f3bda7f1cf1d563507115
2016-04-05 23:25:18 +00:00
Philip P. Moltmann
c48311f0eb Merge "We only have one mock service." into nyc-dev
am: c05a7a0

* commit 'c05a7a04c22c836c49ea0e605247c0f35799a3dc':
  We only have one mock service.

Change-Id: I6c3748cb83103be7a50cff528d97607e73de7ef0
2016-04-05 23:25:14 +00:00
Makoto Onuki
3ae3557ea3 Make FastXmlSerializer more suitable to persist arbitrary strings
- Encode '\u000' - '\u001F', so KXmlParser can read them properly.
Otherwise KXmlParser will ignore CRs/LFs in attributes, and CRs
in text.

- Originally FastXmlSerializer would throw if a string contains
dangling surrogate pairs.  Now we REPLACE them with.

Bug 27792649

Change-Id: I10c547dad2475b68f60e9e8208d9a3eae8e20063
2016-04-05 16:12:07 -07:00
Jeremy Joslin
b770ed1328 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 2016-04-05 22:27:11 +00:00
Philip P. Moltmann
f4eadc5c53 We only have one mock service.
Fixes: 28024464
Change-Id: I1392704c4fdb9e7c3a4b1540131af8a14359c8f4
2016-04-05 15:16:54 -07:00
Jeremy Joslin
dd251ef495 Have the NetworkScoreService bind to the scorer.
If the current active scorer provides a service that can handle the
android.net.scoring.SCORE_NETWORKS action then the NetworkScoreService
will bind to that service to keep the scorer alive. If no service is
discovered then no attempt to bind will be made.

BUG: 27612145
Change-Id: I3f6ed0cbd83e658f1533c3e37b0cac2692c01761
2016-04-04 18:13:29 -07:00
Keisuke Kuroyanagi
6b60f06695 Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev am: 75aee0a
am: 3620738

* commit '3620738bf9e1c0d159f6fd3a54c3e8cbaf149d3e':
  Make TextViewActivityTest stable by sleeping between clicks.

Change-Id: I85c2554bbd3d1f6aca4e11fb51cc0cd11df03b08
2016-04-04 03:49:32 +00:00
Keisuke Kuroyanagi
3620738bf9 Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev
am: 75aee0a

* commit '75aee0a681a763b8de67cb078ca3e520f65c8efe':
  Make TextViewActivityTest stable by sleeping between clicks.

Change-Id: I089fe9b89c84b1021bca57a25be6d73ba6437f98
2016-04-04 03:46:35 +00:00
Keisuke Kuroyanagi
75aee0a681 Merge "Make TextViewActivityTest stable by sleeping between clicks." into nyc-dev 2016-04-04 03:39:20 +00:00
Keisuke Kuroyanagi
15485b8cae Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev am: fc1d11e
am: 51ec6d9

* commit '51ec6d97898d52db6ab692416b665354a45445bb':
  Make hasTransientState be true only if user created selection is active.

Change-Id: Id5ea92b1f4aa36036b92a752ad226b5fba064748
2016-04-04 03:23:49 +00:00
Keisuke Kuroyanagi
51ec6d9789 Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev
am: fc1d11e

* commit 'fc1d11ed9dc4d25a939e5187f32fe9eb107e942c':
  Make hasTransientState be true only if user created selection is active.

Change-Id: Ic28caa1dea935da7b6408282fb0266c889c29050
2016-04-04 03:20:47 +00:00
Keisuke Kuroyanagi
fc1d11ed9d Merge "Make hasTransientState be true only if user created selection is active." into nyc-dev 2016-04-04 03:12:32 +00:00
Clara Bayarri
1e9681c51b Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev am: 032a76f
am: ceeab49

* commit 'ceeab499ac86c16b2b8b53adc713b9796b79961c':
  Remove unused import for KeyboardShortcutGroup

Change-Id: I4119335e332e8c702878a2c734a2d73a9bb19645
2016-04-01 16:31:21 +00:00
Clara Bayarri
ceeab499ac Merge "Remove unused import for KeyboardShortcutGroup" into nyc-dev
am: 032a76f

* commit '032a76f94b457d255ebc0895bc1d8f3c0b6d8e31':
  Remove unused import for KeyboardShortcutGroup

Change-Id: Id69c4c923a3456857d73a2c21a27be962378bd12
2016-04-01 16:27:01 +00:00
Clara Bayarri
89203de878 Remove unused import for KeyboardShortcutGroup
Left it in accidentally when removing default method.

Change-Id: I6af0712624ffaefff4cb4ad2a9e5a86d7104d2e7
2016-04-01 14:40:34 +01:00
Keisuke Kuroyanagi
5f318b6285 Make TextViewActivityTest stable by sleeping between clicks.
Bug: 27893257
Change-Id: I2eaaa38b4af9333a46a8702098b4ec0806def538
2016-04-01 19:16:31 +09:00
Keisuke Kuroyanagi
183fd5071e Make hasTransientState be true only if user created selection is active.
Previously, hasTransientState returned true even when TextView has a
selection that hasn't been created by the user. This unnecessarily
prevents the TextView from being recycled.
This issue was introduced by Ib454b0fbbc2c2f8d198, which fixes that
setHasTransientState(true) is not always coupled with
setHasTransientState(false).

With this CL:
hasTransientState will get true when selection action mode is started.
hasTransientState will get false when selection is removed.
Note that hasTransientState intentionally continues to be true when
selection action mode is terminated with preserving selection.

Bug: 27913323
Change-Id: I960ddfd7221caeb676c23926af06a8a415dec288
2016-04-01 15:00:53 +09:00
Ying Wang
292dbde7a5 Merge "Merge commit \'1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f\' into manual_merge_1a510a3" into nyc-dev-plus-aosp
am: e7965d4

* commit 'e7965d4a22492a947462c62b99e8db9f41d497ff':
  Remove support of disabling Jack.

Change-Id: I067b7f2d3290948e3fcf656a596645f804a3803b
2016-03-31 18:08:07 +00:00
Ying Wang
e7965d4a22 Merge "Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3" into nyc-dev-plus-aosp 2016-03-31 18:00:52 +00:00
Ying Wang
c2f612e048 Merge commit '1a510a3c5ce1a7d8ef9817ad7da4b06b9844383f' into manual_merge_1a510a3
Change-Id: I84953dc077a5dfea1290b952e2de73f9a6d34118
2016-03-31 10:55:46 -07:00
Siyamed Sinir
6ca127ab0f Merge "Benchmarks for Linkify" into nyc-dev am: e14bab8
am: 07fd581

* commit '07fd58158140b378cc4ab3261f401e1d05959e97':
  Benchmarks for Linkify

Change-Id: I2232d7568d3577839882810cf538aa0ef50ce235
2016-03-31 17:55:15 +00:00
Siyamed Sinir
07fd581581 Merge "Benchmarks for Linkify" into nyc-dev
am: e14bab8

* commit 'e14bab859ef3a1e47eb063781d04dd32d92cf3e8':
  Benchmarks for Linkify

Change-Id: Ie4812aa87376f95a0824fc4e0d87a1eba335e534
2016-03-31 17:49:19 +00:00
Siyamed Sinir
e14bab859e Merge "Benchmarks for Linkify" into nyc-dev 2016-03-31 17:17:18 +00:00
Jeff Sharkey
2ed876ce42 Merge "Fix DownloadManager tests." into nyc-dev am: 4938d6e
am: 294163e

* commit '294163e8334163dd5d577d6cfd23a0b5be52ea1e':
  Fix DownloadManager tests.

Change-Id: I7060e603da86f9c8c84021f8fc7050aa7f3c26ef
2016-03-31 02:48:17 +00:00
Jeff Sharkey
294163e833 Merge "Fix DownloadManager tests." into nyc-dev
am: 4938d6e

* commit '4938d6e161733b69a291d2ddf16d25efb41030cb':
  Fix DownloadManager tests.

Change-Id: I306883251d72e655a361a30217bf825e0fe8beea
2016-03-31 02:45:45 +00:00
Jeff Sharkey
4938d6e161 Merge "Fix DownloadManager tests." into nyc-dev 2016-03-31 02:43:21 +00:00
Philip P. Moltmann
ddea724b36 Merge "Add the print service recommendation service" into nyc-dev am: 740a5f0
am: fa04bc7

* commit 'fa04bc7a5d49415bc7cd397bb9678316d3824f85':
  Add the print service recommendation service

Change-Id: I3da289dfe99e1caa3ed2ab3368902d597f16f738
2016-03-31 02:23:16 +00:00
Philip P. Moltmann
fa04bc7a5d Merge "Add the print service recommendation service" into nyc-dev
am: 740a5f0

* commit '740a5f023eea7b2fdb3e31efe8b8d5ac18aa8302':
  Add the print service recommendation service

Change-Id: Ie58ade9356f591781496581259b6d8a876780ac9
2016-03-31 02:17:26 +00:00
sergeyv
aa34eef630 Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev am: 394d3df
am: 761f59c

* commit '761f59c19f1a0e527bb533df16abee7fac166dbd':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Ia6abc695ad05362245d25aa6d8b36fc72c508c3a
2016-03-31 00:36:27 +00:00
sergeyv
761f59c19f Merge "Hide children in ViewGroup.createSnaphost via internal flag and add test for it." into nyc-dev
am: 394d3df

* commit '394d3dfb2d9ccd2ca2fd7aad06ef2e9a8458a0c7':
  Hide children in ViewGroup.createSnaphost via internal flag and add test for it.

Change-Id: Iab1265b6a4c4ff5291259f7e5d9b96c217ee3141
2016-03-31 00:32:41 +00:00
Jeff Sharkey
f584f12b6b Fix DownloadManager tests.
ERROR_CANNOT_RESUME is the correct code for one, and relative paths
are supported by the RFC, so change the test to check for success.

Bug: 27580939
Change-Id: Ife99c22a44dd71232466e35d38a2441c16a558f7
2016-03-30 18:22:22 -06:00
Philip P. Moltmann
9dcb86a48d Add the print service recommendation service
This service connects through the print manager to the print spooler:

PrintSpooler.AddPrintersActivity <-> PrintManager <-> PrintManagerService <-> UserState <-> RemotePrintServiceRecommendationService <-> PrintRecommendationService <-> PrintRecommendationServiceImpl

Hence there is a lot of mindless plumming.

The actual changes are only in the AddPrintersActivity which is extended
to show another list of services: The recommended services.

The PrintServiceRecommendationService is based on the experimenal print
service stubs provider. This provider was contributed the Android by
Mopria. As this services uses Android own network discovery service most
code from the experimental provider goes away. In fact the only logic
left over is the selections of mdns-txt fields to look at and the
printer vendor configuration.

This relies on the Android MDNS to get fixed (Bug: 27696905). This also
does not deal with how to update the recommendation service.

Bug: 24533249
Change-Id: I6edc6e25fc08a50d478b61c71bb8ea158b08624c
2016-03-30 17:21:07 -07:00
Siyamed Sinir
545c3cf95f Benchmarks for Linkify
Add benchmarks for Linkify and URL regular expressions.

Bug: 27921706
Change-Id: I61dcd090bdf877f2df77e898c8a0f441de1dc45a
2016-03-30 17:02:02 -07:00