Commit Graph

59937 Commits

Author SHA1 Message Date
Doris Liu
09087eaac9 Merge \"Handle hidden RT VectorDrawable animators\" into nyc-mr1-dev
am: 3f6a95283a

Change-Id: I909f3c33690fcb932f1b751def1837d82adb28f4
2016-06-09 21:44:01 +00:00
Adam Lesinski
f96dd32152 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
am: 836227b20b

Change-Id: Ifc3a94734f2786452d5f182ae9d587a93f2a02a0
2016-06-09 21:32:43 +00:00
Doris Liu
3f6a95283a Merge "Handle hidden RT VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Doris Liu
836227b20b Merge "Improve the property modification effiency of VectorDrawable animators" into nyc-mr1-dev 2016-06-09 21:30:03 +00:00
Adam Lesinski
7cdd96ec10 Merge \\"ResourcesManager: Apply ContextThemeWrapper config\\" into nyc-dev am: 9e9c78f8ce
am: 4b9a4a18f9

Change-Id: Ibac064cbafdfffb0078e32027e789be98e9e1358
2016-06-09 21:28:00 +00:00
Adam Lesinski
4b9a4a18f9 Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am: 9e9c78f8ce

Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
2016-06-09 21:22:34 +00:00
TreeHugger Robot
9e9c78f8ce Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev 2016-06-09 21:16:03 +00:00
Adam Powell
948b94ff2f Merge \\"Make Activity.getReferrer tolerate custom Parcelables in intents\\" into nyc-dev am: 7a37f8945f
am: 64e3a6d760

Change-Id: I7167b5f8112fff8c1e47c2cc954742f1f368d01c
2016-06-09 21:08:50 +00:00
Adam Powell
64e3a6d760 Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am: 7a37f8945f

Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
2016-06-09 21:05:05 +00:00
TreeHugger Robot
7a37f8945f Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev 2016-06-09 20:57:53 +00:00
Adam Lesinski
c1b0ebf579 ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.

Bug:27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
2016-06-09 12:57:45 -07:00
Robert Carr
446567d6c9 Merge \\"PiP animation: Move window with resize when ending animation.\\" into nyc-dev am: 4624d687f7
am: c28647084e

Change-Id: I8256a9db87dbd7ebc897422393f6743c4d4a5419
2016-06-09 19:36:56 +00:00
Adam Powell
d3c63a66f2 Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.

Bug 28972438

Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
2016-06-09 12:36:16 -07:00
Robert Carr
c28647084e Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am: 4624d687f7

Change-Id: Ib9ce0ef71a71e998e1ffe783c178b8f514ab1469
2016-06-09 19:33:19 +00:00
TreeHugger Robot
4624d687f7 Merge "PiP animation: Move window with resize when ending animation." into nyc-dev 2016-06-09 19:28:11 +00:00
Robert Carr
a9408d4a48 PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.

Bug: 28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
2016-06-09 10:31:17 -07:00
Doris Liu
718cd3eb70 Handle hidden RT VectorDrawable animators
This CL changes the target of VD specific animators to VectorDrawable,
instead of RenderNode. The benefit of doing so is that animators can
now detect whether the animation is meaningful by checking whether
their VD target is in the display list. If not, that means the VD is
not drawing for the current frame, in which case we can be smarter
and more power efficient by removing the animator from the list and
posting a delayed onFinished listener callback.

By setting VD as the animation target, when an ImageView decides to
update its drawable from one AVD to something else, we'll be able
to detect that the previous AVD is no longer in the display list,
and stop providing animation pulse to the stale AVD, which is
something we couldn't do previously.  This change also
handles the case where one AVD instance could be drawn in two
different views.

Bug: 27441375
Change-Id: Iaad1ed09cfd526276b95db0dd695275c28e074e8
2016-06-09 10:27:59 -07:00
Todd Kennedy
ca251e5325 Merge \"make round icon usage configurable\" into nyc-mr1-dev
am: 7b52b2eccd

Change-Id: I99706274705ca5589a70370af8dd17f5a4bc0297
2016-06-09 17:13:28 +00:00
Todd Kennedy
a83bfca63f make round icon usage configurable
We want to only use round icons for Nexus devices, so, add a configuration
boolean to control it. By default we will use the legacy, rectangle icons.

Bug: 28981414
Change-Id: Ib6448bc09287de852a48a943461a6882bd890a30
2016-06-09 07:25:03 -07:00
Chad Brubaker
06fa572a53 Merge \\"Don\\'t depend directly on AppplicationInfo\\" into nyc-dev am: 55cf361d83
am: 303bb79bef

Change-Id: I1ef92a21e310a92310af1127de32945b8ba3e82d
2016-06-09 06:31:01 +00:00
Chad Brubaker
303bb79bef Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: If30e7300c84a79871dc8a0288f8402ed49e4a662
2016-06-09 06:27:57 +00:00
Chad Brubaker
71cab503e3 Merge \"Don\'t depend directly on AppplicationInfo\" into nyc-dev
am: 55cf361d83

Change-Id: Idb332dd0b729b5394ff06ae611349b674b2e7f2c
2016-06-09 06:27:53 +00:00
TreeHugger Robot
55cf361d83 Merge "Don't depend directly on AppplicationInfo" into nyc-dev 2016-06-09 06:22:20 +00:00
Hugo Benichi
71ffd2278d Merge \"ConnectivityMetricsLogger subclass for IpConnectivity\" into nyc-mr1-dev
am: ce2c5fa466

Change-Id: I1da94f82a656ee35afb6847dfabedf370e2322b2
2016-06-09 05:20:03 +00:00
Hugo Benichi
ce2c5fa466 Merge "ConnectivityMetricsLogger subclass for IpConnectivity" into nyc-mr1-dev 2016-06-09 05:08:41 +00:00
Chad Brubaker
c3a6c78fed Don't depend directly on AppplicationInfo
ApplicationInfo is mutable and unfortunately some apps do actually
modify the flags. Due to the lazy loading nature of the network security
config this may lead to issues. Instead cache the needed flags and
resources at application startup.

Bug: 29063413

(cherry picked from commit 276ee969be)

Change-Id: If638a716fd903b4e9dbabcbecb38bd4e26fef08c
2016-06-08 21:48:45 -07:00
Adam Lesinski
07c88bd4f1 Merge \\"Throw proper exception in ResourcesManager\\" into nyc-dev am: 0d25fdd4a8
am: 30b5e95cbb

Change-Id: I0c8477d2eda299cb9a773860e3ce24a88e1011f1
2016-06-09 03:56:14 +00:00
Adam Lesinski
a24ef02c6b Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: I156c373b858e99b892c66f941005409097937714
2016-06-09 03:53:56 +00:00
Adam Lesinski
30b5e95cbb Merge \"Throw proper exception in ResourcesManager\" into nyc-dev
am: 0d25fdd4a8

Change-Id: Iac56b8b134244013730317adf2b417cef402fd09
2016-06-09 03:53:13 +00:00
TreeHugger Robot
0d25fdd4a8 Merge "Throw proper exception in ResourcesManager" into nyc-dev 2016-06-09 03:45:20 +00:00
Chen Xu
e9819bae1a Merge \\"resolve merge conflicts of afed6f8 to nyc-dev\\" into nyc-dev am: 0c4f1c7e5c
am: bee500e374

Change-Id: I7c1ad4e3fa9b1bab21ab931be6ccaae33e89f20b
2016-06-09 02:47:10 +00:00
fionaxu
e285ab3aae Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
am: 0c4f1c7e5c

Change-Id: I46be8494c88f03768e20bb702383f78cf38c1115
2016-06-09 02:39:54 +00:00
fionaxu
bee500e374 Merge \"resolve merge conflicts of afed6f8 to nyc-dev\" into nyc-dev
am: 0c4f1c7e5c

Change-Id: I2d17de5bc787f4f9c8b7a9115a635bfee820a219
2016-06-09 02:39:52 +00:00
Adam Lesinski
c82f28a913 Throw proper exception in ResourcesManager
In M we would bubble up a NameNotFoundException when failing
to load an assetmanager from another application. We switched
to throwing an IllegalArgumentException, which isn't something
anyone should handle.

This change has ResourcesManager throw Resources.NotFoundException,
which callers like ApplicationPackageManager can catch and rethrow
with the appropriate checked exception. This adds more detail to
errors than we had in M.

Bug:28876344
Change-Id: I250aeef8a4ccfd90c6abef2243edc1c5337ebde9
2016-06-08 17:25:35 -07:00
fionaxu
7978147771 resolve merge conflicts of afed6f8 to nyc-dev
Bug: 28557603
Change-Id: Icb19f3d031cce2d846d5f6e9ad4d28d002db6bac
2016-06-08 17:23:09 -07:00
George Mount
1d33feb8bb Merge \"Fix NPE in startup wizard caused by former change.\" into nyc-mr1-dev
am: 3c35716655

Change-Id: I8c1b64aee8c6e2b793fdc41def968113f71ed15c
2016-06-08 22:56:56 +00:00
George Mount
963837821a Fix NPE in startup wizard caused by former change.
Bug 29211438

Change-Id: I0c979c945e79a6982d97013f961b00db3c9a9f00
2016-06-08 15:13:52 -07:00
Doris Liu
792926a58c Improve the property modification effiency of VectorDrawable animators
Previously, the VectorDrawable animators modify the VD properties by
doing reflection based on the property name. This CL avoids the overhead
of calling reflection by wrapping the setters of VD objects in
Float/IntProperty.

Bug: 28124049
Change-Id: I562c8d749fdfe508564c82a700a92e835cdd9ff4
(cherry picked from commit 9f3b31b953)
2016-06-08 20:43:34 +00:00
George Mount
dff1fa4bb9 Merge \"Re-add Internal API for cross-task Activity used by assistant.\" into nyc-mr1-dev
am: 174e41b1fd

Change-Id: I5f3a1b398af15963b317fbce6726d77ef85c60b2
2016-06-08 20:33:58 +00:00
TreeHugger Robot
174e41b1fd Merge "Re-add Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-08 20:23:03 +00:00
Alan Viverette
7fa09ec4dc Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1

Change-Id: If520e4590d5d5b2832e3e53b25e95f6ca5e3b497
2016-06-08 20:20:44 +00:00
Felipe Leme
556ac231e9 Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I5f649b54038b586be375394d35fd34453213df0a
2016-06-08 20:20:41 +00:00
Ian Pedowitz
af2f098c8c Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1
am: 1bb283131f

Change-Id: I2f21175998134e3ac03279307e7d6bb163614ce9
2016-06-08 18:59:14 +00:00
Felipe Leme
ddafe182df Merge \\"Wrap closeQuietly() on finally block.\\" into nyc-dev am: fb5995cfbb
am: a18a63b23a

Change-Id: I3e6769579e08887888b1358be0cb695f32e13749
2016-06-08 18:59:10 +00:00
Alan Viverette
1bb283131f Merge \"Return correct default theme on API >= 24\" into nyc-dev
am: afaa1e9db1

Change-Id: I620b5682bc4fa9752b1f1bf68d8ed1498db66a5d
2016-06-08 18:35:22 +00:00
Ian Pedowitz
afaa1e9db1 Merge "Return correct default theme on API >= 24" into nyc-dev 2016-06-08 18:28:00 +00:00
fionaxu
afed6f8631 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
am: c10e4fae05

Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee
2016-06-08 18:24:16 +00:00
Felipe Leme
a18a63b23a Merge \"Wrap closeQuietly() on finally block.\" into nyc-dev
am: fb5995cfbb

Change-Id: I34fbe82455b113d2608f64f9220f5a1757e39627
2016-06-08 18:16:43 +00:00
Tianjie Xu
d889a0a753 Merge \\"Change unit of I/O statistics to MiB\\" into nyc-dev am: 00681d0e78
am: ebfa28ccf8

Change-Id: I0dcd9c8429146f14725f618573b425d103958838
2016-06-08 18:13:56 +00:00
fionaxu
c10e4fae05 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
am: c95d552de0

Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
2016-06-08 18:11:09 +00:00