Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Amit Mahajan
ec7dee12cb Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab am: 4e36794b49 
am: 08daeb57c7

* commit '08daeb57c75ba55532abd07826c1799461a3e5da':

Change-Id: I687322bbcea70e3aeb5a045a034c99f7f8a550b1
 2016-05-17 18:14:26 +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
Sid Soundararajan
4fee4490e7 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a am: 4b19273c81 
am: f00ef850ae

* commit 'f00ef850ae24656b040a7f62c7ef81e82d479765':

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

* commit '6d0de2067d28b6d4520bf718aa62a593c9d8bb7a':

Change-Id: I8511e917de08be67eeea26ba0995d9b3f96af10f
 2016-05-17 18:14:14 +00:00
Robert Sesek
94e824bc1b Split the zygote logic out of android.os.Process into a new ZygoteProcess class. 
There is no functional change. This is to support adding new types of zygotes
that all operate using the same protocol.

Bug: 21643067
Change-Id: Ie673ee816cae34ac20ffb8c774ec3e6461c3fd0a
 2016-05-17 14:11:01 -04: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
Garfield, Tan
c9af00d40b Use thumbnail of other sizes if it's missing in current size. 
Bug: 26881628

Change-Id: Id7aa6f5c8c1a415f7dd97143a088ba89fae43eea
(cherry picked from commit 614eef86e8ce6dd462e2f91ef5c705dc62bb7c7f)
 2016-05-17 18:01:12 +00:00
Amit Mahajan
e89477964f Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab am: db4c3aff33 
am: 1a4329a9b2

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

Change-Id: I779503bbaf90c2c43a56c846875c6ea93a3a9b00
 2016-05-17 18:00:22 +00:00
Sid Soundararajan
5df6c745c4 Merge "Move onStart update of recents tasks to onResume" into nyc-dev am: 1aae32b44a am: 81505b48e5 
am: 815fe51501

* commit '815fe5150187a069990601b77d7164b4dca898f1':
  Move onStart update of recents tasks to onResume

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

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

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

* commit 'be4434d73f8a8383e3f638cb5109fa0eab6b7c70':

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

* commit '45d4f351ba79e658cb9abc6633b4d7de62e78ffc':
  Make some of the UID-based VPN code reusable

Change-Id: I75d9871f8039d14f8d83be4696c3c4d4e864f9c0
 2016-05-17 17:59:59 +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
Phil Weaver
46d0227c0c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: bcaaac3ea1 
am: 462790bbc3

* commit '462790bbc3af07f974dabad9985584f815d0721b':

Change-Id: I019228831f508c32db6dd2b5508e99a9213a7348
 2016-05-17 17:55:41 +00: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
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702 
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
 2016-05-17 17:41:19 +00:00
Chong Zhang
a5b84cfc7b Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b am: a409fada63 
am: aead9dbcbf

* commit 'aead9dbcbf94ace7847f0f58ee396e1704317fc4':

Change-Id: I4fbcbc99a6daa7b46f314bbe6d7db4b71ba0893f
 2016-05-17 17:41:15 +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
Sergio Giro
81b1b5463a Merge "ZygoteInit: remove extra copy of method" into nyc-mr1-dev-plus-aosp 
am: 7bc107228c

* commit '7bc107228c0a41882f4202e568f48580d24bb7ba':
  ZygoteInit: remove extra copy of method

Change-Id: I93614394b6c5b97ba804bb7949f3c1b6a41ef510
 2016-05-17 17:41:09 +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
Sid Soundararajan
a41fcf5449 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: I683f2f9307271e6179b91097204314815aac4a8e
 2016-05-17 17:39:17 +00:00
Robin Lee
0867543a06 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I0e5b9aa4552ee11ae5ec2d2206cc58487fb9cd4c
 2016-05-17 17:39:14 +00:00
Wale Ogunwale
e76407c7f3 Make Recents activity invisible when it is behind a translucent activity 
We don't want the recents activity to be visible behind a translucent
fullscreen activity. Instead we want to show the home activity behind
the translucent activity.

Bug: 28246419
Change-Id: I0364a592d7d84c88b39b359431492d0395b0f051
 2016-05-17 10:38:02 -07:00
Sid Soundararajan
1aae32b44a Merge "Move onStart update of recents tasks to onResume" into nyc-dev 2016-05-17 17:36:50 +00:00
Robin Lee
607fa836b2 Merge "Make some of the UID-based VPN code reusable" into nyc-dev 
am: 4920698e17

* commit '4920698e17dc8aacd1b0743d313383a8ee1a3400':
  Make some of the UID-based VPN code reusable

Change-Id: I3f1b1a08059aa58cb76db6cdd070b103024b9bf3
 2016-05-17 17:36:43 +00:00
Sid Soundararajan
ea98d35d62 Merge "Add an extra to HOME intent to indicate it comes form recents." into nyc-dev 2016-05-17 17:36:42 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev 
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
 2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
 2016-05-17 17:35:24 +00:00
Chong Zhang
aead9dbcbf Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b 
am: a409fada63

* commit 'a409fada63a49a959d54d642aaeafaef2ffdcc13':

Change-Id: Iad84d62eeac30b180a3987023011001a70b76943
 2016-05-17 17:35:17 +00:00
Chong Zhang
3a78d6773f Merge "Apply final crop during surface preservation" into nyc-dev am: 2d4d408a5b am: 85a3a71e5f 
am: 8a49755b4c

* commit '8a49755b4c84f084ff566365e7efc3abc6de7aec':
  Apply final crop during surface preservation

Change-Id: I02f76536c625d76b2a500e73663e6186bd601521
 2016-05-17 17:34:36 +00:00