315693 Commits

Author SHA1 Message Date
Jorim Jaggi
4b84606c21 Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests

Bug: 37252694
Change-Id: I9a5bc19b8f63312e682e536500411e4ff4639f88
2017-04-13 16:39:44 -07:00
Mike Tsao
9c1a13271e Merge "Add tests for ag/2086796" 2017-04-13 21:16:31 +00:00
TreeHugger Robot
5690917679 Merge "Add SkiaCanvas::captureCanvasState()" 2017-04-13 19:54:11 +00:00
Matt Sarett
d0814db633 Add SkiaCanvas::captureCanvasState()
Test: Verified bug is fixed.  Wrote unit test.

Bug: 37268771

Change-Id: I9deb7db353cd2129ad245e7f65419670463bb717
2017-04-13 14:23:38 -04:00
Mike Tsao
cfe4ffecce Add tests for ag/2086796
Fixes: 37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
2017-04-13 11:01:31 -07:00
Jeremy Joslin
101c773b81 Merge "Always call unbind." into oc-dev am: f726b4aa9a
am: 3a74fcedad

Change-Id: I7c60a76c4ce352e76042c89841f917f3f97e078a
2017-04-13 17:59:03 +00:00
Seigo Nonaka
b87a2f041d Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev am: d09be1c0e9
am: 284944c7f8

Change-Id: Idae84335677a859641b6660589848e04b4a38474
2017-04-13 17:57:46 +00:00
Sudheer Shanka
c695da0532 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev am: c59a2a7649
am: 9865369cf5

Change-Id: I567cb83db3cbeb94f7edcc5d2e413b36f9d7c6a4
2017-04-13 17:56:48 +00:00
Sundeep Ghuman
6f00ddf0ad Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev am: 56fcd408e6
am: 2dfbfc3134

Change-Id: I32c1b3f0e3c5ba921a71e233b6dbbab1d9e0d6cd
2017-04-13 17:55:26 +00:00
TreeHugger Robot
4085d2cd80 Merge "lockPixels is no longer virtual" 2017-04-13 17:52:12 +00:00
Dave Friedman
293ac8cef2 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1 am: 27aeab9763
am: 85b7a34094

Change-Id: I680e6828c66babf4d6e7bae3fd76f1015d2f209a
2017-04-13 17:43:02 +00:00
Jeremy Joslin
3a74fcedad Merge "Always call unbind." into oc-dev
am: f726b4aa9a

Change-Id: If6fafdd633bb3c9120f00818de5f97ae2cfd7735
2017-04-13 17:41:06 +00:00
Julia Reynolds
ed5a121516 Merge "Allow notification channels to be silent." into oc-dev am: d178ec489f
am: 41de81ea75

Change-Id: Ie1d34910cdbd1d534296dd848baa3af8b181357a
2017-04-13 17:40:55 +00:00
Seigo Nonaka
284944c7f8 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev
am: d09be1c0e9

Change-Id: I51f68dc5b1453ca4ac700ca68976efd412812eae
2017-04-13 17:40:02 +00:00
Sudheer Shanka
9865369cf5 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev
am: c59a2a7649

Change-Id: I5676e0f3927f2de123e9d5d219bd10a881754583
2017-04-13 17:38:59 +00:00
Sundeep Ghuman
2dfbfc3134 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev
am: 56fcd408e6

Change-Id: If4d14ff4f69b86af16e65736b32e3e01d06eeaf5
2017-04-13 17:37:57 +00:00
Dave Friedman
85b7a34094 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d am: f125662db1
am: 27aeab9763

Change-Id: I0879ba9238602a3af19cdc91c5ae8762d8776c4d
2017-04-13 17:33:56 +00:00
Hyunyoung Song
47da8197b1 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev am: 76c13a5fce
am: e99cf60039

Change-Id: Ib821f43548e938a7652f62ef444e0a116aa8a58b
2017-04-13 17:31:16 +00:00
TreeHugger Robot
f726b4aa9a Merge "Always call unbind." into oc-dev 2017-04-13 17:28:52 +00:00
Dave Friedman
27aeab9763 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb am: 2d642f9e2d
am: f125662db1

Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
2017-04-13 17:28:34 +00:00
Julia Reynolds
41de81ea75 Merge "Allow notification channels to be silent." into oc-dev
am: d178ec489f

Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806
2017-04-13 17:23:39 +00:00
Hyunyoung Song
e99cf60039 Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev
am: 76c13a5fce

Change-Id: I060797416983056208f21c099ba21fdc8409103a
2017-04-13 17:20:50 +00:00
Martijn Coenen
59d7c621c3 Merge "Add persistentFeature application attribute." into oc-dev am: e4960cf495
am: e90bf46a78

Change-Id: Ie98918aa2410d629f8283c747d8113f42a640719
2017-04-13 17:20:14 +00:00
Dave Friedman
f125662db1 Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb am: 4eff74f8cb
am: 2d642f9e2d

Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
2017-04-13 17:19:36 +00:00
Lucas Dupin
0f328d480a Merge "Add transfer mode support to ShapeDrawable" into oc-dev am: 498a44f33a
am: 914519abfb

Change-Id: Ib61666ec7103dab2e40d6e68e8a49fcf4c46a9b2
2017-04-13 17:14:58 +00:00
TreeHugger Robot
d09be1c0e9 Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev 2017-04-13 17:13:37 +00:00
Julia Reynolds
94d7dba7f2 Merge "Companion device mgr doesn't always exist" into oc-dev am: 3d6225b4e2
am: a98a3444fb

Change-Id: I4d540fadf69842a45fc86f08f8fc3f10cab5a0c7
2017-04-13 17:12:16 +00:00
Martijn Coenen
e90bf46a78 Merge "Add persistentFeature application attribute." into oc-dev
am: e4960cf495

Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6
2017-04-13 17:12:12 +00:00
Sudheer Shanka
c59a2a7649 Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev 2017-04-13 17:10:00 +00:00
TreeHugger Robot
56fcd408e6 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev 2017-04-13 17:08:04 +00:00
Julia Reynolds
d178ec489f Merge "Allow notification channels to be silent." into oc-dev 2017-04-13 17:07:46 +00:00
Dave Friedman
2d642f9e2d Docs: Fixes broken link in Javadoc. am: df0fd34d50 am: 506a8b39fb
am: 4eff74f8cb

Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee
2017-04-13 17:06:11 +00:00
Lucas Dupin
914519abfb Merge "Add transfer mode support to ShapeDrawable" into oc-dev
am: 498a44f33a

Change-Id: I09e0f8bbbd8b8ba0123eea3ae5958d453321007c
2017-04-13 17:05:09 +00:00
Julia Reynolds
a98a3444fb Merge "Companion device mgr doesn't always exist" into oc-dev
am: 3d6225b4e2

Change-Id: I10420e5cf8fdb6359c8191d0626cd71ecab395aa
2017-04-13 17:01:26 +00:00
Dave Friedman
4eff74f8cb Docs: Fixes broken link in Javadoc. am: df0fd34d50
am: 506a8b39fb

Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
2017-04-13 17:00:44 +00:00
Hyunyoung Song
76c13a5fce Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev 2017-04-13 16:53:43 +00:00
Martijn Coenen
e4960cf495 Merge "Add persistentFeature application attribute." into oc-dev 2017-04-13 16:53:22 +00:00
Lucas Dupin
498a44f33a Merge "Add transfer mode support to ShapeDrawable" into oc-dev 2017-04-13 16:52:01 +00:00
TreeHugger Robot
3d6225b4e2 Merge "Companion device mgr doesn't always exist" into oc-dev 2017-04-13 16:50:50 +00:00
Dave Friedman
506a8b39fb Docs: Fixes broken link in Javadoc.
am: df0fd34d50

Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
2017-04-13 16:48:41 +00:00
Android Build Merger (Role)
8d90496b13 Merge "Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev am: 68cf1b8848 am: 8561894fa9" 2017-04-13 16:26:11 +00:00
Philipp Weiß
8801fb8232 Merge "Redesign of QSSecurityFooter" 2017-04-13 16:25:32 +00:00
Winson Chung
51ddd5d677 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev am: 68cf1b8848
am: 8561894fa9

Change-Id: Ib006ed2cb24e7b206a5cce0891f1dbd0476d7cde
2017-04-13 16:25:30 +00:00
Bill Yi
f50191ef0f Merge "Import translations. DO NOT MERGE" into oc-dev am: 05c71b3bbe -s ours
am: 2d8e49dace  -s ours

Change-Id: Iec97570d815d27c79482d29b5612fa71edcb44fe
2017-04-13 16:24:32 +00:00
Winson Chung
8561894fa9 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev
am: 68cf1b8848

Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d
2017-04-13 16:13:30 +00:00
Bill Yi
2d8e49dace Merge "Import translations. DO NOT MERGE" into oc-dev
am: 05c71b3bbe  -s ours

Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93
2017-04-13 16:12:29 +00:00
Bill Yi
fe23c2afbb Merge "Import translations. DO NOT MERGE" into oc-dev am: 2f522fc904 -s ours
am: ca2721f9bd  -s ours

Change-Id: I827bb1a6d767d29c53af7cbe069f4f6206fd24bd
2017-04-13 16:06:46 +00:00
Winson Chung
68cf1b8848 Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev 2017-04-13 16:01:51 +00:00
Bill Yi
ca2721f9bd Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2f522fc904  -s ours

Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4
2017-04-13 15:55:30 +00:00
TreeHugger Robot
f5ce5e822e Merge "Import translations. DO NOT MERGE" 2017-04-13 15:55:29 +00:00