3409 Commits

Author SHA1 Message Date
Yorke Lee
0933cf3f15 Merge \\\"Limit global drags to apps targeting SDK 24 and above\\\" into nyc-dev am: f33af2285b am: 3d80871032
am: 11e3bf5d30

Change-Id: I6a99d04fd3f9fb229f532838350313169cec502a
2016-06-17 20:42:14 +00:00
Yorke Lee
11e3bf5d30 Merge \\"Limit global drags to apps targeting SDK 24 and above\\" into nyc-dev am: f33af2285b
am: 3d80871032

Change-Id: I2f7745317f6ae0932d7c16469b500847e465a912
2016-06-16 21:27:50 +00:00
Yorke Lee
3d80871032 Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev
am: f33af2285b

Change-Id: I539f39cfea50f34dade2141829b21d422809b09f
2016-06-16 21:22:22 +00:00
Dan Willemsen
45a7e7afad resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc am: fd1854cdfa
am: 04e9d830b0

Change-Id: I4add0a1b114c4e56343484acb9e855137e720be3
2016-06-16 17:12:02 +00:00
Dan Willemsen
04e9d830b0 resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc
am: fd1854cdfa

Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15
2016-06-16 17:07:15 +00:00
Dan Willemsen
5f551b3fdc resolve merge conflicts of 20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
2016-06-16 09:54:28 -07:00
Yorke Lee
0e85247195 Limit global drags to apps targeting SDK 24 and above
Bug: 29127791

Change-Id: Ib5f85a207bdb79eeac0418fda78e452d225761bc
2016-06-16 09:35:40 -07:00
Dan Willemsen
9b3bc98425 Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.

Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
2016-06-15 21:14:28 -07:00
Christopher Wiley
b360229ffa Merge \"Create frameworks-base-testutils lib\" into nyc-mr1-dev
am: d8cdb3ef4b

Change-Id: I398541c5b521b9b5bcf9bd3d8bda46e06e750dd7
2016-06-08 21:00:31 +00:00
Christopher Wiley
1c811fa468 Create frameworks-base-testutils lib
( cherry-pick 07630f6bd3dbc91e2622cedfd1a21822b5f1f4b5 )

This permits sharing of test components used in connectivity tests.
Rename the MockLooper to TestLooper, reflecting that it is not a
true mock, but a manually controlled Looper for use in tests.

Bug: 28848133
Test: Tests consuming this library pass.

Change-Id: I57e11f9544c7bffdb02739ab2a921512b1b11874
2016-06-07 10:00:08 -07:00
Jorim Jaggi
f5e5c3a72a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev am: c27660d45a
am: acfed07f72

* commit 'acfed07f725466e866445cfdf4fda94fa0e8f0a0':
  Add new attributes for wallpaper info

Change-Id: Ie439547cb6964c1f90b2ac313408a502027ccd25
2016-06-04 00:41:07 +00:00
Jorim Jaggi
acfed07f72 Merge "Add new attributes for wallpaper info" into nyc-mr1-dev
am: c27660d45a

* commit 'c27660d45a920af49c9e53b1cabaa32fd4b3046c':
  Add new attributes for wallpaper info

Change-Id: I3dc04d70f50809ff20ec0fb23e0c3265450ff621
2016-06-04 00:27:04 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
Doris Liu
68f749ce3c Correct valueType attribute for an AVD in test app
BUG: 29009391
Change-Id: Id2e43e538a5f8ab835957acc9164a40d319588c1
2016-06-01 13:38:03 -07:00
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00
John Reck
35f1b42421 Merge "Change overdraw test to use windowbackground" into nyc-dev am: 34979a3af6
am: fa33b23ee8

* commit 'fa33b23ee81d91a5c344be60039f27590ed0b194':
  Change overdraw test to use windowbackground

Change-Id: Ib45ac99f10c3f511b54d1c8c5e06db141a125965
2016-05-27 03:46:30 +00:00
John Reck
769c456bc1 Merge "Change overdraw test to use windowbackground" into nyc-dev
am: 34979a3af6

* commit '34979a3af6dbb6e3e33a83e5cb939ea3c8c000c7':
  Change overdraw test to use windowbackground

Change-Id: Ie116603fc53999dd4251d940b5d5ee783684ac8e
2016-05-26 23:17:16 +00:00
John Reck
2ccaf6a448 Change overdraw test to use windowbackground
Bug: 28786023

Fixes an issue where the first couple frames would
be extremely slow due to the simpleness of HWUI's
overdraw rejection optimization.

Change-Id: I1fe3d83f7e2e0eb3299124b00b9f877c2c3aebf9
2016-05-26 14:36:42 -07:00
Christopher Wiley
07630f6bd3 Create frameworks-base-testutils lib
This permits sharing of test components used in connectivity tests.
Rename the MockLooper to TestLooper, reflecting that it is not a
true mock, but a manually controlled Looper for use in tests.

Bug: 28848133
Test: Tests consuming this library pass.

Change-Id: I57e11f9544c7bffdb02739ab2a921512b1b11874
2016-05-19 13:12:09 -07:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Ian Rogers
9ac4734714 Merge "Remove @Nullable from primitive/void types." 2016-05-12 18:53:05 +00:00
Chad Brubaker
d4b6c696e1 Support TrustedCertificateStore.findAllIssuers
(cherry-picked from commit aa6c3c3e252252b80c3900bd4c1ff27d37265c6d)
Change-Id: I176ec42c9907e50ee218e4fb352b530ca797be46
2016-05-12 11:15:47 -07:00
Brian Carlstrom
035d45c774 Allow AmSlam to be used more widely
Bug: 28610549
Change-Id: Id79023e9a27586691e1658e43c39e10b7d824b72
2016-05-11 23:17:16 -07:00
The Android Automerger
10b889de7d stephenli Manually merge commit '68fffa5'
* commit '68fffa5': (23 commits)
  Fix smallest width configuration calculation
  docs: DoDS, wearable reference docs
  Switch the default text selection handles to Material style.
  docs: Noted minor API changes in release notes
  docs: added "billions" doc in Distribute>Essentials
  Remove wear design pages redirecting to design/wear
  correct the support library redirects to redirect whole path
  Stop saving ActionMenuItemView state.
  Fix iterator double-advance in ContentObserverController
  TIF: Remove the uniqueness check for track ID from notifyTracksChanged
  Update and add attributes to the JavaDoc for VectorDrawable
  Use Q=100 JPEG instead of PNG for wallpaper display
  Fix issue #28400000: Settings memory UI still showing z-ram...
  docs: Updated support library revision history for 23.4.0
  docs: Updates to notifications for DP3
  docs: Added emoji section to api overview.
  Fixed a bug where the QS was animating wrong when closing
  Fix KeyguardManager.isSecure() to observe work profile
  cherrypick from mnc-docs docs: Updated APK Signature Scheme v2 doc.
  Docs: Added new Whitelist feature to Data Saver for DP3
  ...
2016-05-12 02:10:33 +00:00
Aurimas Liutikas
12a2170136 Merge "Switch the default text selection handles to Material style." into nyc-dev
am: 78e421dbce

* commit '78e421dbced3181d0f43a174683b3c34cbb88a70':
  Switch the default text selection handles to Material style.

Change-Id: I07212a44d71c060eae1ed0a9afde451cb2d83713
2016-05-12 00:56:14 +00:00
Aurimas Liutikas
63999da503 Switch the default text selection handles to Material style.
-Switch to material style handles.
-Delete old handles.
-Remove the unrelated use of old handle in a test.

Bug: 28723844
Change-Id: I268c2672df541e5a1cdcdeb6712289fe06c06d5f
2016-05-11 16:43:37 -07:00
Chris Craik
97a07e5d1a Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b am: 99d5e0f84f
am: 1978f210eb

* commit '1978f210ebafeb7157f7678c56a341b4de4b7687':
  Add WebView scroll activity to UiBench

Change-Id: I8c297a7e53f0f95ef066f54808240f5511def695
2016-05-10 23:40:22 +00:00
Chris Craik
1978f210eb Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b
am: 99d5e0f84f

* commit '99d5e0f84ffcfcf349ec206fde3b29857fb81e89':
  Add WebView scroll activity to UiBench

Change-Id: Ifdacd3f35b20d4a01d14212275b43ea1a163019e
2016-05-10 23:37:36 +00:00
Chris Craik
80cb9b35ae Merge "Add WebView scroll activity to UiBench" into nyc-dev
am: 597acb4d0b

* commit '597acb4d0b9bf06d4021dc7a7154675d64cebb7d':
  Add WebView scroll activity to UiBench

Change-Id: I1b075ec6fead8d77d3776d7ddcd5263625660c07
2016-05-10 23:35:04 +00:00
Chris Craik
597acb4d0b Merge "Add WebView scroll activity to UiBench" into nyc-dev 2016-05-10 23:31:22 +00:00
Ian Rogers
81c18e6f99 Remove @Nullable from primitive/void types.
Erroneous use of @Nullable caught by error prone.
Bug: 27723540

Change-Id: Ida76b2fd221142980da5c018e57c96cc6920ebc0
2016-05-10 09:46:09 -07:00
John Reck
b89a63447e Add AM benchmark/stresser
Bug: 28606903

What this test does is sends a startService
to a service defined in a new process. That service
then sends a broadcast that it was started, which
is received in the originating process. After
that broadcast is sent it stopSelf()'s and exit(0)'s.

The time it takes from start -> started as well as
the service -> receiver are tracked and reported.

The test does this round trip ping/pong in multiple
configurations. First doing just 1 at a time, then
2 at a time, then 4, then etc... all the way up to
10 active startService/sendBroadcasts at a time
across 10 worker threads in the main process.

There's a ring buffer of 100 services in 100 different
sub processes to ensure that every startService
goes through the entire zygote-fork bringup with
no risk of overlapping with the dying/stopping of a
previous startService.

Change-Id: I4f19e89ae1b14c9d1660d8a546ccbb92ec5127cd
2016-05-06 16:40:36 +00:00
Guang Zhu
92d321f1db Merge "allow optionally skipping of initial launch" into nyc-dev
am: 2c7d670933

* commit '2c7d670933e0e0f7f6a83c4353519511faaf4a2f':
  allow optionally skipping of initial launch

Change-Id: I2597a935ddd856ab8dc6857cbb987d7ba5063455
2016-05-06 04:56:19 +00:00
Guang Zhu
8f4fd67e7c allow optionally skipping of initial launch
Current harness performs one round of app launch as a "warm up", and
does not include that into final app launch time calculation. This
change skips this process so that it can speed up local test run
investigation.

Change-Id: I0b1948b2247d9f7e442e799d537508fba6dfa508
2016-05-05 19:45:22 -07:00
John Reck
fa1088497b Merge "Support transform\'d GraphicBuffers" into nyc-dev am: 6d42b5c6e3
am: 88e7238235

* commit '88e7238235e9edf147f44edf89ebcfc6aa5d93ab':
  Support transform'd GraphicBuffers

Change-Id: I9f4240f4c6bfcbf79d0ab292157a580a8998557f
2016-04-29 15:00:24 +00:00
John Reck
f2a68497d4 Merge "Video source test & bugfix" into nyc-dev am: a1c06675dd
am: 9e9f51b333

* commit '9e9f51b333bcac40d584ad350ac80d6fe5a615b1':
  Video source test & bugfix

Change-Id: I0afd9d8acb690de1e5002fbc8d73bd92d1685295
2016-04-29 15:00:20 +00:00
John Reck
1fd9f81745 Merge "Support transform\'d GraphicBuffers" into nyc-dev
am: 6d42b5c6e3

* commit '6d42b5c6e399a10799d2bba3f7113dd198cbcae6':
  Support transform'd GraphicBuffers

Change-Id: I620f9ef9e1e2ce4df6471b37d1ec06b0fcdb2a88
2016-04-29 14:55:28 +00:00
John Reck
3f061f2d50 Merge "Video source test & bugfix" into nyc-dev
am: a1c06675dd

* commit 'a1c06675dd2a83ce445f27b46cddab80f8c743e6':
  Video source test & bugfix

Change-Id: I1fb6f399b64828dbff8ab6a01fef7d11b447d183
2016-04-29 14:55:25 +00:00
John Reck
6d42b5c6e3 Merge "Support transform'd GraphicBuffers" into nyc-dev 2016-04-29 14:49:21 +00:00
John Reck
a1c06675dd Merge "Video source test & bugfix" into nyc-dev 2016-04-29 14:49:13 +00:00
John Reck
2f69d6d4fd Support transform'd GraphicBuffers
Bug: 28428955
Change-Id: I23e2fc9b96a67c7cfda42d9d7319e478194a7fa7
2016-04-28 13:32:27 -07:00
John Reck
f3a51d652f Video source test & bugfix
Bug: 28428970

Test for video sources and fix a bug where
we should throw an IAE for surfaces that are invalid
at request time.

Change-Id: I891a2b1568f583300433c7aca6de36d2e2621c63
2016-04-28 10:11:36 -07:00
Hyunyoung Song
237790ec48 Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev
am: 137e30a

* commit '137e30ae7bcfd0a7e2e272affc25a7770c9b626b':
  Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"

Change-Id: I79daad6a6299f686f7f71492b75630556d4998ae
2016-04-28 17:08:14 +00:00
Hyunyoung Song
137e30ae7b Merge "Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"" into nyc-dev 2016-04-28 16:57:26 +00:00
Hyunyoung Song
8398e8261e Revert "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a"
This reverts commit fcef23e831df0153fab7a3462973f0906ce9b8d8.
Bug: 28028331
Change-Id: I0bbcf7024749d06b7d78574afbb9625e6de8b96d
2016-04-28 16:50:11 +00:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00
John Reck
e94cbc76d5 API tweaks to PixelCopy and make it public
Bug: 27708453
Change-Id: I81667ce42f9ca1c1a13e1e61299927900845fc84
2016-04-26 15:41:43 -07:00
Chris Craik
942bd9dcfa Merge "Improve SurfaceView postion snapping" into nyc-dev
am: 987609f

* commit '987609f5a7bd8e18559334aa0260e6614520af13':
  Improve SurfaceView postion snapping

Change-Id: I402bb1b85f8ae987723e6f2398b4245dfb76ba37
2016-04-26 20:28:10 +00:00
Chris Craik
0e974e7425 Improve SurfaceView postion snapping
bug:27098060

Snap SurfaceView positions to safely align to pixel boundaries.

Also expands MovingSurfaceViewActivity to support a scaling option, and
show problems more clearly.

Change-Id: Ic8e9c1e2f80c2c653bf4428e373f14528ddbce81
2016-04-22 15:48:17 -07:00