Commit Graph

256895 Commits

Author SHA1 Message Date
Chong Zhang
e5f15f1b34 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev
am: ff8ceadfc8

* commit 'ff8ceadfc8c5f03da57420ad93a698cb0a57fcd9':
  Request a traversal when a saved surface gets redrawn

Change-Id: I7feb2216d6e90fcb15dd0c72da24c5d58e16b64f
2016-05-18 21:01:41 +00:00
Christopher Tate
a9b4f3f628 API feedback: rename JobInfo methods for clarity
Bug 28773330

Change-Id: I081fa225380a1966010d41020200fb3b9549a195
2016-05-18 13:59:16 -07:00
Chong Zhang
ff8ceadfc8 Merge "Request a traversal when a saved surface gets redrawn" into nyc-dev 2016-05-18 20:57:30 +00:00
Amith Yamasani
dbf0dbd8c2 Merge "Retail mode flag and some clients for it" into nyc-mr1-dev 2016-05-18 20:57:12 +00:00
Android Build Merger (Role)
e01e336efc Merge "Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c am: dd0e3efd4d" into nyc-mr1-dev-plus-aosp 2016-05-18 20:47:46 +00:00
Chenjie Luo
42690b746d Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c
am: dd0e3efd4d

* commit 'dd0e3efd4d70f36e0649abe6087a06a1fb0366b0':
  Add null pointer check in removeConnection

Change-Id: Icb2fb87eeeab4de28a1e117a8f74867f7c0002ac
2016-05-18 20:47:22 +00:00
Chenjie Luo
9aea3f1b94 Add null pointer check in removeConnection am: e370b538eb am: 58642e6545 am: 7e745ec49c
am: 8462d63c23

* commit '8462d63c238117bd6f9dea3c073b5996564621b1':
  Add null pointer check in removeConnection

Change-Id: I820fe9de2186784261b7c8dd838fa1ebcf1bab6a
2016-05-18 20:46:16 +00:00
Chenjie Luo
dd0e3efd4d Add null pointer check in removeConnection am: e370b538eb am: 58642e6545
am: 7e745ec49c

* commit '7e745ec49c0458f92af65bf370770417dcc7075d':
  Add null pointer check in removeConnection

Change-Id: I7f0fef6f29dc1667993425510014308f030a457f
2016-05-18 20:41:27 +00:00
Chenjie Luo
8462d63c23 Add null pointer check in removeConnection am: e370b538eb am: 58642e6545
am: 7e745ec49c

* commit '7e745ec49c0458f92af65bf370770417dcc7075d':
  Add null pointer check in removeConnection

Change-Id: Iba29d78be4b3cae05144e6c0b68cce5357114ddd
2016-05-18 20:41:10 +00:00
Chenjie Luo
7e745ec49c Add null pointer check in removeConnection am: e370b538eb
am: 58642e6545

* commit '58642e65455ee9456993a2f6386402fbcec68ab8':
  Add null pointer check in removeConnection

Change-Id: Ia4d14a664c9869d1065313db6795ac4e72dee59d
2016-05-18 20:35:51 +00:00
Amith Yamasani
34306764b4 Merge "Merge "Fix a deadlock in system server" into nyc-dev am: ab0744344d" into nyc-mr1-dev
am: c4a41245a9

* commit 'c4a41245a9ef1cef8f26a58e9f119b44486490a1':

Change-Id: Id95748b79303d5aa551d92542d47d369e130a713
2016-05-18 20:32:39 +00:00
Tyler Gunn
7a63216d83 Merge "Continued multi-endpoint work." into nyc-mr1-dev
am: beb8c4954d

* commit 'beb8c4954db199412a8e59b45198b0c2ac449bfd':
  Continued multi-endpoint work.

Change-Id: I1090df296dd4f0824202f5173e88ba8d6570db5f
2016-05-18 20:32:33 +00:00
Chenjie Luo
58642e6545 Add null pointer check in removeConnection
am: e370b538eb

* commit 'e370b538ebb6ca1072f270aee3003faaa0d1deb2':
  Add null pointer check in removeConnection

Change-Id: I7b615a8f7c7a89617c4f748ad74007ec73db6784
2016-05-18 20:29:17 +00:00
Amith Yamasani
0d400e8d60 Merge "Fix a deadlock in system server" into nyc-dev am: ab0744344d
am: b223c0c6a6

* commit 'b223c0c6a6aa586941fc0704387a8b1739a44dd2':
  Fix a deadlock in system server

Change-Id: I199e172618b9f9885b03051eb1a8c55ec0af6fd3
2016-05-18 20:25:06 +00:00
Robert Carr
c7294607fc Fixes for ending PiP animation.
During the PiP animation, we have two basic requirements:
   1. We need to scale windows to the pinned stack bounds.
   2. We need to halt resize and movement notifications to the client.
As we end the animation, we need to disable these states at differing
times. First we need to deliver a final resize and movement notification
to the client for it's new position. However, Surfaces may not
immediately resize (in particular in the case of child windows,
it may be some time!), furthermore Surfaces may resize at different
times so we need to persist scaling on a Surface by Surface
basis after reenabling resize notifications.

Bug: 28559097
Change-Id: I6d52a3e213e08a34f4c0eea892b2a84cd4c20e18
2016-05-18 13:24:41 -07:00
Robert Carr
bc13376449 Correct PiP inset adjustment.
We want to calculate the scaling factor we need to have
the content area of the surface (not including insets) to reach
our desired size, otherwise we will seem to scale the insets
up or down over time.

Bug: 28559097
Change-Id: I86dbd5fc902b5d380d33dba626c6694b3c57ff25
2016-05-18 13:24:10 -07:00
Android Build Merger (Role)
c4a41245a9 Merge "Merge "Fix a deadlock in system server" into nyc-dev am: ab0744344d" into nyc-mr1-dev 2016-05-18 20:22:38 +00:00
Android Build Merger (Role)
91dc1b8f03 Merge "Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70 am: 75a364eabf" into nyc-mr1-dev-plus-aosp 2016-05-18 20:22:15 +00:00
Tyler Gunn
beb8c4954d Merge "Continued multi-endpoint work." into nyc-mr1-dev 2016-05-18 20:22:07 +00:00
Amith Yamasani
ebbf0b6b21 Merge "Fix a deadlock in system server" into nyc-dev
am: ab0744344d

* commit 'ab0744344db3e626f1a249f285289b66653cf6bb':
  Fix a deadlock in system server

Change-Id: Ib223cf25d4ac53225e9e8791bdae497956dc8471
2016-05-18 20:22:07 +00:00
Svetoslav Ganov
ffffd0f773 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70
am: 75a364eabf

* commit '75a364eabf80c4a3248b715942604aa4857f792e':
  Hide ephemeral API

Change-Id: I45b9ffcce0e5c4c063a1204deb7c859f24336269
2016-05-18 20:21:41 +00:00
Amith Yamasani
b223c0c6a6 Merge "Fix a deadlock in system server" into nyc-dev
am: ab0744344d

* commit 'ab0744344db3e626f1a249f285289b66653cf6bb':
  Fix a deadlock in system server

Change-Id: I8897e59a5aa26b051d021c1c6858da15cd2d0207
2016-05-18 20:21:10 +00:00
Svetoslav Ganov
891fcc2779 Merge "Hide ephemeral API" into nyc-dev am: 68c2919f70
am: 1129a0f473

* commit '1129a0f4733514043b3f9240dbe77124260d9d53':
  Hide ephemeral API

Change-Id: I79a26bd67329872b8282d9c0d207ab949d815307
2016-05-18 20:21:07 +00:00
Svet Ganov
1129a0f473 Merge "Hide ephemeral API" into nyc-dev
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
2016-05-18 20:16:38 +00:00
Svet Ganov
75a364eabf Merge "Hide ephemeral API" into nyc-dev
am: 68c2919f70

* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
  Hide ephemeral API

Change-Id: I033dcf9e551cf3a110aea0b3493e3cdad9a38d80
2016-05-18 20:16:33 +00:00
TreeHugger Robot
ab0744344d Merge "Fix a deadlock in system server" into nyc-dev 2016-05-18 20:12:27 +00:00
Svetoslav Ganov
68c2919f70 Merge "Hide ephemeral API" into nyc-dev 2016-05-18 20:10:28 +00:00
Android Build Merger (Role)
b290eabc08 Merge "Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a am: 890101ccb3 am: 625f97ba3b am: f0bd433ff5" into nyc-mr1-dev-plus-aosp 2016-05-18 20:03:00 +00:00
Android Build Merger (Role)
585f2d30b1 Merge "docs: Fix to nav, added _book.yaml am: 584c09929e am: 6856d6f0b7 am: adcb712154 am: 84640a7704" into nyc-mr1-dev-plus-aosp 2016-05-18 20:02:49 +00:00
Joe Fernandez
b5d6bfff01 Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a am: 890101ccb3 am: 625f97ba3b
am: f0bd433ff5

* commit 'f0bd433ff505eb8aa1524cf81d370117251028ea':
  Updated link to material design page.

Change-Id: I470e41963ce016d7a45fa43ef6254bf7bb240b47
2016-05-18 20:02:16 +00:00
Joe Fernandez
bacdc0f034 Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a am: 890101ccb3 am: 625f97ba3b
am: 153014f199

* commit '153014f199b24fbf5d81cee60bca55fc37c7ff50':
  Updated link to material design page.

Change-Id: I48cb426375ad0413060391ab35b74638eea586c1
2016-05-18 20:02:11 +00:00
Eric Schmidt
a29c5230ac docs: Fix to nav, added _book.yaml am: 584c09929e am: 6856d6f0b7 am: adcb712154
am: 84640a7704

* commit '84640a7704bae02d7c48207018f1c77c59f3a560':
  docs: Fix to nav, added _book.yaml

Change-Id: Id3c74b1208892c258c192b17c8fb32eb5688e577
2016-05-18 20:02:11 +00:00
Eric Schmidt
dd721598eb docs: Fix to nav, added _book.yaml am: 584c09929e am: 6856d6f0b7 am: adcb712154
am: d34afc2611

* commit 'd34afc26115b9fb71d9b5b36f95797a309cdc6bf':
  docs: Fix to nav, added _book.yaml

Change-Id: Id679b2d41ec8abafe05d6928dc3a4ca766d1f567
2016-05-18 20:02:07 +00:00
sreevanis
153014f199 Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a am: 890101ccb3
am: 625f97ba3b

* commit '625f97ba3b4b0da653bf9da3a8336431f7b4f50e':
  Updated link to material design page.

Change-Id: I92e3789ba4e756ff7ef1751f426f558e5e5b0b67
2016-05-18 19:58:22 +00:00
Bert McMeen
9f7bb48b58 docs: Update to md5 and sha-1 values for Javadoc download
Bug: 28839338
Change-Id: Iabcefc4595aff3ace354ace4cc98a07c9d855695
2016-05-18 12:58:21 -07:00
Eric Schmidt
d34afc2611 docs: Fix to nav, added _book.yaml am: 584c09929e am: 6856d6f0b7
am: adcb712154

* commit 'adcb712154de2c886e26795939ccb84730880035':
  docs: Fix to nav, added _book.yaml

Change-Id: I91790694b3b4b93dd373ef43ee12b763130c7be1
2016-05-18 19:58:17 +00:00
sreevanis
f0bd433ff5 Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a am: 890101ccb3
am: 625f97ba3b

* commit '625f97ba3b4b0da653bf9da3a8336431f7b4f50e':
  Updated link to material design page.

Change-Id: I4f295c8b35d7a7093ef48c58428ce43b27dd2502
2016-05-18 19:58:08 +00:00
Eric Schmidt
84640a7704 docs: Fix to nav, added _book.yaml am: 584c09929e am: 6856d6f0b7
am: adcb712154

* commit 'adcb712154de2c886e26795939ccb84730880035':
  docs: Fix to nav, added _book.yaml

Change-Id: Icae143da127c4ead977478b6d0a1b99ebfb7dd7b
2016-05-18 19:58:02 +00:00
Android Build Merger (Role)
4d84480972 Merge "Merge "Declare no print services if 0 print services are enabled." into nyc-dev am: b852d0138a am: d8e82000d6" into nyc-mr1-dev-plus-aosp 2016-05-18 19:54:17 +00:00
Philip P. Moltmann
94857724ea Merge "Declare no print services if 0 print services are enabled." into nyc-dev am: b852d0138a
am: d8e82000d6

* commit 'd8e82000d626eb6c79d01fe342ae4a90c7c8ff17':
  Declare no print services if 0 print services are enabled.

Change-Id: Iee652ef70298418e4a4d773cff7a70700053ba9f
2016-05-18 19:53:45 +00:00
Philip P. Moltmann
7c53832a8a Merge "Declare no print services if 0 print services are enabled." into nyc-dev am: b852d0138a
am: 5365e7a194

* commit '5365e7a194cdcf8ec6ca82a649b24900b9dcb052':
  Declare no print services if 0 print services are enabled.

Change-Id: I9af64891aa666d3eacd50dbe12263ce900f7200c
2016-05-18 19:53:43 +00:00
Joe Fernandez
625f97ba3b Merge "Updated link to material design page." into mnc-io-docs am: 26aea1383a
am: 890101ccb3

* commit '890101ccb338fe0633b07f0197fe5c9957a4870d':
  Updated link to material design page.

Change-Id: I6d88350c3f4681fa998c514e88532fe117c304dd
2016-05-18 19:50:39 +00:00
Eric Schmidt
adcb712154 docs: Fix to nav, added _book.yaml am: 584c09929e
am: 6856d6f0b7

* commit '6856d6f0b76527c75c5147c392f1bb10d5f121fb':
  docs: Fix to nav, added _book.yaml

Change-Id: Ib3843b9ab63076cac75aea6517027de634a361a8
2016-05-18 19:50:34 +00:00
Philip P. Moltmann
d8e82000d6 Merge "Declare no print services if 0 print services are enabled." into nyc-dev
am: b852d0138a

* commit 'b852d0138ab84817b042791e0e204459d87038ce':
  Declare no print services if 0 print services are enabled.

Change-Id: Id6a97654dcc889d0fe73e10210e649cb62c0861b
2016-05-18 19:50:30 +00:00
Philip P. Moltmann
5365e7a194 Merge "Declare no print services if 0 print services are enabled." into nyc-dev
am: b852d0138a

* commit 'b852d0138ab84817b042791e0e204459d87038ce':
  Declare no print services if 0 print services are enabled.

Change-Id: I2b995a757a5f745c442cc813873edf3726cb0abb
2016-05-18 19:50:29 +00:00
Philip P. Moltmann
b852d0138a Merge "Declare no print services if 0 print services are enabled." into nyc-dev 2016-05-18 19:45:05 +00:00
Android Build Merger (Role)
ba79d8a396 Merge "Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e am: e19f2f2fc9" into nyc-mr1-dev-plus-aosp 2016-05-18 19:43:47 +00:00
Android Build Merger (Role)
96987bc524 Merge "Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs am: 5ca058d38e am: ef033cd807 am: ea65985513 am: 57c8d78b69" into nyc-mr1-dev-plus-aosp 2016-05-18 19:43:32 +00:00
sreevanis
890101ccb3 Merge "Updated link to material design page." into mnc-io-docs
am: 26aea1383a

* commit '26aea1383afcaef13cedd5792088d3a3d6859f44':
  Updated link to material design page.

Change-Id: Ia3e66198caff48e12fa03f471ecf80cb9bb4901e
2016-05-18 19:43:01 +00:00
Jorim Jaggi
a35b230d97 Merge "Fix a few issues with ime adjust/minimized dock stack" into nyc-dev am: 96b2fe6a4e
am: e19f2f2fc9

* commit 'e19f2f2fc982313a102d9102c2f658fb8ba16cae':
  Fix a few issues with ime adjust/minimized dock stack

Change-Id: I964a390dcd8204107f8062c7b0b361e5f82d91fc
2016-05-18 19:43:01 +00:00