Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,385 Commits 3 Branches 0 Tags
47e1e14589cb62de65332ee467e845efc3e43d55
Commit Graph

254385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
a7b4fb4883 Fix janky multi-window entry animation am: c5887ea7a0 
am: 791b7979e9

* commit '791b7979e9a4bfca7e6e8e6c1cfedda47738ac1c':
  Fix janky multi-window entry animation

Change-Id: I2a6ec9fc49bbba9b4a09d5cbfab16a8fb58d6e19
 2016-05-17 18:39:35 +00:00
Kevin Hufnagle
482bf05a8f Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs am: 296d84fbd9 
am: 59ce20df8c

* commit '59ce20df8c6573a149461943963e98cee3b11d72':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: Iad0a2bc7ed5554b65e833f8ecb2936ffe4fb4b80
 2016-05-17 18:39:02 +00:00
Felipe Leme
3b91df7ccf Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 
am: 2c6a450fa2

* commit '2c6a450fa23b97e6082e2daa1aa9c7f07a4def8f':
  Added a onRestrictBackgroundBlacklistChanged() callback.

Change-Id: Id9cb27070e1e72b12c5ade60b637e63319021f90
 2016-05-17 18:39:02 +00:00
Martijn Coenen
225d221945 Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ib327612766f91c583ea0a23e71bac34615edd12d
 2016-05-17 18:38:40 +00:00
Dianne Hackborn
f2ddee2636 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 
am: 8f359afdc3

* commit '8f359afdc3ce3f243d508e81831ed5f274b65534':
  Fix issue #28641630: Service client dumps are timing out for no reason

Change-Id: I67af48d0e861e77e3bca389970aed1601567f2c7
 2016-05-17 18:38:35 +00:00
Dianne Hackborn
4d7e92b56b Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: Iaf3102ba03cf2242b02030aa24df8282ed3fbdc8
 2016-05-17 18:38:28 +00:00
Jorim Jaggi
c3701426c0 Fix janky multi-window entry animation 
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: I50b123fe6b571009fddbe8bcd39cb876ced87f42
 2016-05-17 18:38:18 +00:00
Chong Zhang
f0b76b071c Fix wallpaper cropped too soon when unminimizing dock 
Set adjusted bounds on the stack that's side-by-side to the docked
stack, so that TaskStack.getDimBounds returns the adjusted bounds
during unminimizing dock animation. This way wallpaper is not cropped
too soon to the final stack bounds.

The adjusted bounds won't be used for alignment for minimizing.

bug: 28763785
Change-Id: Ifea4366dd4b1bd35f2ed720dd1819a10bdfd86fa
 2016-05-17 11:37:43 -07:00
Android Build Merger (Role)
f2bdf486f7 Merge "Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 am: c46cc608bc" into nyc-mr1-dev-plus-aosp 2016-05-17 18:33:45 +00:00
Wale Ogunwale
5ba4ca0f44 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 
am: c46cc608bc

* commit 'c46cc608bccc91838d30332bb1134b0223536650':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: If408586d56f7d36d267f1805df4bab15af1842d6
 2016-05-17 18:33:17 +00:00
Bert McMeen
58af97860b docs: Wear preview - update to leftnav am: ca23070a46 
am: 26599cc0e2

* commit '26599cc0e2076bc29e54e319c308f932fa9e3d48':
  docs: Wear preview - update to leftnav

Change-Id: I413265a1fd500bba0f2e84afa28b41cacee192c7
 2016-05-17 18:33:15 +00:00
Martijn Coenen
68b426a30d Merge "Adddress NFC API review comments." into nyc-dev 
am: 1fef88d8dc

* commit '1fef88d8dc8e25c71dc6b217202593e0f17b2105':
  Adddress NFC API review comments.

Change-Id: Ic36b9392b9475590ba8f75b352d05fba52b1ee02
 2016-05-17 18:33:09 +00:00
Dianne Hackborn
16f6215ef5 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 
am: 8f359afdc3

* commit '8f359afdc3ce3f243d508e81831ed5f274b65534':
  Fix issue #28641630: Service client dumps are timing out for no reason

Change-Id: I21f2ad5996f13ddd681f805f9941935a846265f1
 2016-05-17 18:32:58 +00:00
Dianne Hackborn
a24af982ff Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 
am: 607844efa5

* commit '607844efa59f79bd9fab55eb75f217d21cd15f5f':
  Fix issue #27532364: Security Vulnerability in IIntentSender.send

Change-Id: I749b455402caef335239b540ec8883a8d7b2a974
 2016-05-17 18:32:46 +00:00
Wale Ogunwale
804b32e925 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev am: 4570df8fd5 
am: 257c1d882a

* commit '257c1d882a6d567e1be2b766f1dde8e32d662e90':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: Ib9f096c3502936d5e5b5a7fac4b72e480320c806
 2016-05-17 18:30:52 +00:00
Daniel Nishi
a3de878c15 Merge "Add new action for the storage manager settings." into nyc-mr1-dev 
am: b4d5b71cfb

* commit 'b4d5b71cfb55e1d7d6255f3beddcef2a2bc98801':
  Add new action for the storage manager settings.

Change-Id: I0efa5983a3db72cb90542ad852d681bae5b6952d
 2016-05-17 18:30:40 +00:00
Kevin Hufnagle
59ce20df8c Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs 
am: 296d84fbd9

* commit '296d84fbd9f04653edef37aede5e3c0663f8945c':
  cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel).

Change-Id: If3e7a0663a97f94d46059ed6fdd5b0cc75a0af3c
 2016-05-17 18:30:21 +00:00
TreeHugger Robot
2c6a450fa2 Merge "Added a onRestrictBackgroundBlacklistChanged() callback." into nyc-dev 2016-05-17 18:28:22 +00:00
Kevin Hufnagle
296d84fbd9 Merge "cherrypick from mnc-io-docs docs: Updated Billing API documentation (for Project Nickel)." into mnc-io-docs 2016-05-17 18:21:31 +00:00
Martijn Coenen
1fef88d8dc Merge "Adddress NFC API review comments." into nyc-dev 2016-05-17 18:21:16 +00:00
Jorim Jaggi
791b7979e9 Fix janky multi-window entry animation 
am: c5887ea7a0

* commit 'c5887ea7a0b82cc5909743ce14cbda1dcf1dfc82':
  Fix janky multi-window entry animation

Change-Id: Ia9a2f19a4c03978c9d05e1628cb0607e1e267401
 2016-05-17 18:20:55 +00:00
Dianne Hackborn
8f359afdc3 Merge "Fix issue #28641630: Service client dumps are timing out for no reason" into nyc-dev 2016-05-17 18:20:06 +00:00
Dianne Hackborn
607844efa5 Merge "Fix issue #27532364: Security Vulnerability in IIntentSender.send" into nyc-dev 2016-05-17 18:19:36 +00:00
Dianne Hackborn
777a06d3c9 Fix issue #28641630: Service client dumps are timing out for no reason 
Actually, no reason.  The reason is that to do the dump we are doing
synchronous calls out to each service, but that is with the activity
manager lock held, so they can get blocked if their main thread does
any call back in to the activity manager.

To fix this, re-organize the dumping code so that the "with client"
path is separate, and doesn't require holding a lock the entire
time.

Change-Id: Ia96861c10da81048b3d2ac93a25760b68623cf34
 2016-05-17 11:19:03 -07:00
Wale Ogunwale
c46cc608bc Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 
am: 4570df8fd5

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I0cbcab2b84c32b0c8add13ddbb9cc7984d18a61f
 2016-05-17 18:17:15 +00:00
Bert McMeen
26599cc0e2 docs: Wear preview - update to leftnav 
am: ca23070a46

* commit 'ca23070a460ff8cc8942b28d72de341d10102d4c':
  docs: Wear preview - update to leftnav

Change-Id: If391f05219140dbc8f9adcb337b599c48383a82c
 2016-05-17 18:17:11 +00:00
Michael Kwan
4fab094b07 Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 
am: 59bce44aaa

* commit '59bce44aaaad61c5bd57ddcc1225e69ad5d0500b':
  Modified AlertController to allow themes to specify custom implementation.

Change-Id: Ice8251602843a6a98552bcb85272d8cc9eefae2b
 2016-05-17 18:14:47 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
 2016-05-17 18:14:39 +00:00
Wale Ogunwale
257c1d882a Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 
am: 4570df8fd5

* commit '4570df8fd52b4ca8fab00794297a4f3d3923bbfb':
  Correct activity lifecycle when forcedResize activity is finished

Change-Id: I985e8154e396a7a7da91939840f224a1885a792e
 2016-05-17 18:14:25 +00:00
Daniel Nishi
b4d5b71cfb Merge "Add new action for the storage manager settings." into nyc-mr1-dev 2016-05-17 18:10:52 +00:00
Jorim Jaggi
c5887ea7a0 Fix janky multi-window entry animation 
- Add tracing when drawing ImageWallpaper.
- Don't force a redraw in onSurfaceRedrawNeeded. This only adds
another unnecessary draw and doesn't do anything useful.
onSurfaceRedrawNeeded is only here so the client can block.
- Delay entrance animation by one frame so wallpaper can be drawn
before the transition is starting.
- Add some delay for animating the tasks up in recents to match that
delay (it wasn't matched before at all).
- Fix an issue where launchedFromHome was wrong while docking.

Bug: 28769940
Change-Id: I2b763ed40078541328a1e04ffecf5b0a520fe019
 2016-05-17 18:10:31 +00:00
Michael Kwan
59bce44aaa Merge "Modified AlertController to allow themes to specify custom implementation." into nyc-mr1-dev 2016-05-17 18:03:38 +00:00
TreeHugger Robot
4570df8fd5 Merge "Correct activity lifecycle when forcedResize activity is finished" into nyc-dev 2016-05-17 18:02:19 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Amit Mahajan
08daeb57c7 Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab 
am: 4e36794b49

* commit '4e36794b49943d01eefa39443d7225f7b8c7a448':

Change-Id: I58e2e339071beb15d7edf0b497e6056aee9950ef
 2016-05-17 17:59:56 +00:00
Sid Soundararajan
f00ef850ae Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a 
am: 4b19273c81

* commit '4b19273c8123b1c4c8ab9c239609e52c1399b17d':

Change-Id: I55a2e2f6add74678e0f3656eec153a69e49ca836
 2016-05-17 17:59:50 +00:00
Sid Soundararajan
6d0de2067d Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62 
am: 1f07c85fa8

* commit '1f07c85fa8db7bf24cfabccab76f1d6b798ec7e9':

Change-Id: Ia49c50aba245d2eef88a5fe95a68d34765fac46c
 2016-05-17 17:59:43 +00:00
Bert McMeen
ca23070a46 docs: Wear preview - update to leftnav 
Bug: 28317997
Change-Id: Ia7b2f39dbd27106fd621acbf9e59f558ee7bdeba
 2016-05-17 10:58:06 -07:00
Amit Mahajan
1a4329a9b2 Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab 
am: db4c3aff33

* commit 'db4c3aff334c0cebea1e337fadb4b535e8ccaffa':
  OMADM intent sent by both system and apps.

Change-Id: I7bbe6a5deee8bd2eeb0e7b59763ddfb6d615bc1f
 2016-05-17 17:55:15 +00:00
Sid Soundararajan
815fe51501 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a 
am: 81505b48e5

* commit '81505b48e5c00e067d684b39de73b93aeaffefb2':
  Move onStart update of recents tasks to onResume

Change-Id: I39af26412ea8184803c226b285b11857619ab74b
 2016-05-17 17:55:11 +00:00
Sid Soundararajan
115bcb270c Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev am: ea98d35d62 
am: a41fcf5449

* commit 'a41fcf54499272e185733f5ee23ef3f51cb4fda5':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I46cef20f7d8aa8b4b2af875c1eb609a347efac04
 2016-05-17 17:55:06 +00:00
Robin Lee
be4434d73f Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 0867543a06

* commit '0867543a064a48a1aca6243a3d1cdf7a12ad94c8':

Change-Id: I3a72f7329b896aa0c107ddf823aafd4480042f29
 2016-05-17 17:55:00 +00:00
Robin Lee
45d4f351ba Merge "Make some of the UID-based VPN code reusable" into nyc-dev am: 4920698e17 
am: 607fa836b2

* commit '607fa836b2b60f411ae239bff5391dcaafbbc799':
  Make some of the UID-based VPN code reusable

Change-Id: Ie7c88ba3eebe4af85a69f330cae3df3293113d4e
 2016-05-17 17:52:45 +00:00
Amit Mahajan
4e36794b49 Merge "OMADM intent sent by both system and apps." into nyc-dev 
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Icd3a9e9b35a2f4c44269fef2bbbe8d6835d93990
 2016-05-17 17:49:56 +00:00
Sid Soundararajan
4b19273c81 Merge "Move onStart update of recents tasks to onResume" into nyc-dev 
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: I69d1a4d72796f7940a0993560f78fa0e6c667f78
 2016-05-17 17:49:53 +00:00
Sid Soundararajan
1f07c85fa8 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 
am: ea98d35d62

* commit 'ea98d35d62ec9e8273e5e632feec167c24a90a15':
  Add an extra to HOME intent to indicate it comes form recents.

Change-Id: I441ff96ed9c5e84aee38e68b5a153c3a39f3d63b
 2016-05-17 17:49:50 +00:00
Phil Weaver
462790bbc3 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: bcaaac3ea1

* commit 'bcaaac3ea106a2f1c2ffcba5c3419bf10cefd5e1':

Change-Id: I518d777ee641a8a24044f07b6afdd97ee70db5c3
 2016-05-17 17:49:21 +00:00
Amit Mahajan
db4c3aff33 Merge "OMADM intent sent by both system and apps." into nyc-dev 
am: 65ca16ebab

* commit '65ca16ebab701c82895a0f1bf5ba0344aff44e50':
  OMADM intent sent by both system and apps.

Change-Id: Ifda48558713ea89d0d1b2de54b1abb738ca187e8
 2016-05-17 17:48:44 +00:00
Amit Mahajan
65ca16ebab Merge "OMADM intent sent by both system and apps." into nyc-dev 2016-05-17 17:41:11 +00:00
Sid Soundararajan
81505b48e5 Merge "Move onStart update of recents tasks to onResume" into nyc-dev 
am: 1aae32b44a

* commit '1aae32b44abd189c905c4ac799422829ce24b186':
  Move onStart update of recents tasks to onResume

Change-Id: Ifb377d9da719f2994aa34bb9bf990db9464adf4f
 2016-05-17 17:39:19 +00:00