drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
271,469 Commits 1 Branch 0 Tags
Commit Graph

271469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
17b49651af Merge \\"Clip GradientDrawable\\'s saveLayer\\" into nyc-mr1-dev am: 694acb1e36 
am: b22e745278

Change-Id: I331574caa364e87c5178bee544e1b6d570fb4ea5
 2016-06-28 18:37:42 +00:00
Philip P. Moltmann
df4a7ad5d1 Merge \\"Always reload print services\\" into nyc-mr1-dev am: fd28d8ebd1 
am: 14a4ec6574

Change-Id: I4d6afaca275e5596d601c707eeea928d4f089932
 2016-06-28 18:37:39 +00:00
Chris Craik
b22e745278 Merge \"Clip GradientDrawable\'s saveLayer\" into nyc-mr1-dev 
am: 694acb1e36

Change-Id: I9c1ed4155674e7c7a218c2afe784dd703613d825
 2016-06-28 18:33:24 +00:00
Philip P. Moltmann
14a4ec6574 Merge \"Always reload print services\" into nyc-mr1-dev 
am: fd28d8ebd1

Change-Id: Idc3e793f637858355403cf5e21e9af43c6accb51
 2016-06-28 18:33:18 +00:00
TreeHugger Robot
694acb1e36 Merge "Clip GradientDrawable's saveLayer" into nyc-mr1-dev 2016-06-28 18:24:25 +00:00
Philip P. Moltmann
fd28d8ebd1 Merge "Always reload print services" into nyc-mr1-dev 2016-06-28 18:15:38 +00:00
Chris Craik
b657b9b7fe Merge \"Merge \\"Fix savelayer rounding\\" into nyc-mr1-dev am: 754ea612ec\" into nyc-mr1-dev-plus-aosp 
am: 46813558a3

Change-Id: I6afdba716240f52cfa0beba6fb70404bf00429f8
 2016-06-28 17:52:04 +00:00
Allen Hair
dbe0c43b19 Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f0073 am: fb9d75e7cd 
am: 568f654ac1

Change-Id: Ic58fc8aa667372d77836823cd77e0309e9b1e7c5
 2016-06-28 17:51:58 +00:00
Allen Hair
b81ae49092 Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f0073 am: fb20170c0f 
am: b216e80956

Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b
 2016-06-28 17:40:56 +00:00
Android Build Merger (Role)
46813558a3 Merge "Merge \"Fix savelayer rounding\" into nyc-mr1-dev am: 754ea612ec" into nyc-mr1-dev-plus-aosp 2016-06-28 17:39:52 +00:00
Chris Craik
b1d6dd216c Merge \"Fix savelayer rounding\" into nyc-mr1-dev 
am: 754ea612ec

Change-Id: Ib86ae01c824b57c4c93562aefb6c264b02538e28
 2016-06-28 17:39:26 +00:00
Allen Hair
568f654ac1 Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073 
am: fb9d75e7cd

Change-Id: I4a5d45d9c33b713e6bdf0596ea498c3e521c26d8
 2016-06-28 17:38:06 +00:00
Allen Hair
b216e80956 Merge \\"Add a flag to enable instrumentation of the framework classes.\\" into nyc-dev am: 15783f0073 
am: fb20170c0f

Change-Id: I23336cd7dac59a0e2510b718ede8ae3a389047ac
 2016-06-28 17:33:34 +00:00
Chris Craik
754ea612ec Merge "Fix savelayer rounding" into nyc-mr1-dev 2016-06-28 17:33:27 +00:00
Allen Hair
fb9d75e7cd Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev 
am: 15783f0073

Change-Id: Ie9e71eb96ad654fc1d34317177cce8013bc2dcb9
 2016-06-28 17:30:28 +00:00
Allen Hair
fb20170c0f Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev 
am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81
 2016-06-28 17:30:21 +00:00
Allen Hair
15783f0073 Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev 2016-06-28 17:23:55 +00:00
Chris Craik
e4f6d968f5 Fix savelayer rounding 
bug:29456451

Change-Id: I8022163d2c004510da5db74efdca27582484224d
 2016-06-28 09:53:04 -07:00
Tenghui Zhu
504d8b2db0 Merge "Use new Rule to report status when success" 2016-06-28 16:47:19 +00:00
Chris Craik
1e5d428b3f Clip GradientDrawable's saveLayer 
bug:29456451

Avoid using very expensive unclipped saveLayer codepath.

Change-Id: Ib96a46169faa89eda6889b16813a7941ab402779
 2016-06-28 09:45:35 -07:00
Daniel Yu
f5b7c67048 Merge \\\"resolve merge conflicts of ac5b340 to nyc-dev\\\" into nyc-dev am: 6ec78a6458 am: 82bd5246e7 
am: a7338f1467

Change-Id: I7d5f58b1bb4467d3f111baebb1cf5dcb5a7da6e8
 2016-06-28 16:42:11 +00:00
Daniel Yu
ff7e594dd1 Merge \\\"resolve merge conflicts of ac5b340 to nyc-dev\\\" into nyc-dev am: 6ec78a6458 am: a2ffb20c06 
am: 8555ed448e

Change-Id: I8d970b2b4c86c0b3d30bc645398111f46ca6e623
 2016-06-28 16:37:50 +00:00
Dan Yu
a7338f1467 Merge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458 
am: 82bd5246e7

Change-Id: I668dddb48b464c61d77b2ddd4b94919c58356660
 2016-06-28 16:36:55 +00:00
Dan Yu
8555ed448e Merge \\"resolve merge conflicts of ac5b340 to nyc-dev\\" into nyc-dev am: 6ec78a6458 
am: a2ffb20c06

Change-Id: I4f859ca20376c10f1638ce80b2ec33b515815809
 2016-06-28 16:32:01 +00:00
Daniel Yu
a2ffb20c06 Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev 
am: 6ec78a6458

Change-Id: I8c631533ad43598475938bc1e3f9f0f171511c0a
 2016-06-28 16:28:34 +00:00
Daniel Yu
82bd5246e7 Merge \"resolve merge conflicts of ac5b340 to nyc-dev\" into nyc-dev 
am: 6ec78a6458

Change-Id: Ie77c87f366c21acb05afcf5d03ddc6d75e9b950a
 2016-06-28 16:28:24 +00:00
Philip P. Moltmann
6bc93c16d2 Merge \\"Syncronize renderPage vs. onServiceDisconnected\\" into nyc-mr1-dev am: c7c647bbf0 
am: c76f44fab4

Change-Id: I780866bef6d476325a93777075bfce752ad84968
 2016-06-28 16:25:17 +00:00
Dan Yu
6ec78a6458 Merge "resolve merge conflicts of ac5b340 to nyc-dev" into nyc-dev 2016-06-28 16:21:57 +00:00
Philip P. Moltmann
c76f44fab4 Merge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev 
am: c7c647bbf0

Change-Id: Ibd18df2822dbb0993eb4fc22392c3c523197c540
 2016-06-28 16:18:09 +00:00
Philip P. Moltmann
c7c647bbf0 Merge "Syncronize renderPage vs. onServiceDisconnected" into nyc-mr1-dev 2016-06-28 16:14:32 +00:00
Lajos Molnar
ed1de77125 Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-mr1-dev am: 5b2fd818a0 
am: c8fea44e5e

Change-Id: I7b6ceeb3192b7b421916bf957a868b1fc8816a62
 2016-06-28 16:07:35 +00:00
Lajos Molnar
c8fea44e5e Merge \"media: document VP9 CSD for MediaCodec\" into nyc-mr1-dev 
am: 5b2fd818a0

Change-Id: Id7ed6f9342601ee8f67ff28f37c9b38b96e9c084
 2016-06-28 16:02:13 +00:00
Kirill Grouchnikov
55ec63ec33 Merge "Fix a typo in Javadocs" 2016-06-28 15:57:43 +00:00
TreeHugger Robot
5b2fd818a0 Merge "media: document VP9 CSD for MediaCodec" into nyc-mr1-dev 2016-06-28 15:56:42 +00:00
Chris Banes
612390dce6 Merge "Make Toolbar ignore its minHeight if larger than height" 2016-06-28 15:52:55 +00:00
Shreyas Basarge
1797abd411 Merge \"Merge \\\"SyncOperation float cast fix\\\" into nyc-dev am: 5f72b129c4 am: 5098fe97d6\" into nyc-mr1-dev-plus-aosp 
am: 51d9947340

Change-Id: Ie06187023bcdf07126f73e38d606b894d84d68d8
 2016-06-28 15:51:46 +00:00
Shreyas Basarge
5fd25578a5 Merge \\\"SyncOperation float cast fix\\\" into nyc-dev am: 5f72b129c4 am: 0d27e2d624 
am: 64b333c3c0

Change-Id: Ic046229411c7fb1e88e430fddf3b9c128c05b241
 2016-06-28 15:51:43 +00:00
Android Build Merger (Role)
51d9947340 Merge "Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4 am: 5098fe97d6" into nyc-mr1-dev-plus-aosp 2016-06-28 15:47:14 +00:00
Shreyas Basarge
41994c4d61 Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4 
am: 5098fe97d6

Change-Id: Ia34d8f6d577cf4ebbd45872c19629ba821c0427b
 2016-06-28 15:46:42 +00:00
Shreyas Basarge
64b333c3c0 Merge \\"SyncOperation float cast fix\\" into nyc-dev am: 5f72b129c4 
am: 0d27e2d624

Change-Id: I8d81d5db705e63fddfca9d652299eca9d4df207d
 2016-06-28 15:46:37 +00:00
Shreyas Basarge
5098fe97d6 Merge \"SyncOperation float cast fix\" into nyc-dev 
am: 5f72b129c4

Change-Id: I50ab6249e81ff7523a82f26bd39b52bb362f4ae4
 2016-06-28 15:43:00 +00:00
Shreyas Basarge
0d27e2d624 Merge \"SyncOperation float cast fix\" into nyc-dev 
am: 5f72b129c4

Change-Id: I907544c36783e192a17a2aa7f629a3093a516de2
 2016-06-28 15:42:59 +00:00
Shreyas Basarge
5f72b129c4 Merge "SyncOperation float cast fix" into nyc-dev 2016-06-28 15:38:07 +00:00
Kirill Grouchnikov
9091df0fe2 Fix a typo in Javadocs 
Change-Id: I450b2b239bd405c58b9f63663ebdf8f73ea38ae5
 2016-06-28 11:24:04 -04:00
Lajos Molnar
671da98e2d media: document VP9 CSD for MediaCodec 
Also document that concatenated CSD is only supported for AVC.

Bug: 10672559
Change-Id: I54867655068802ef35f92a6341f8b5bb068555ee
 2016-06-28 14:20:31 +00:00
Tony Mak
f574cf568b Merge "setProfileEnabled should be no-op when the profile is already enabled" 2016-06-28 11:11:28 +00:00
Chris Banes
8053117a3d Make Toolbar ignore its minHeight if larger than height 
Currently Toolbar lays out all children based on its
minHeight (if set). If that minHeight is larger than
the Toolbar height, then the children are laid out larger
than the Toolbar and clipped.

This CL fixes it back by capping the alignment height.

BUG: 29049143

Change-Id: Ia3389a906b132bb0a2ae41b27116c00744d0ddf4
 2016-06-28 09:38:29 +01:00
Dan Sandler
cee6570086 Merge \"Purr. am: 610f6ede25 am: 0e792f567a\" into nyc-mr1-dev-plus-aosp 
am: 3d32cf6477

Change-Id: I9e11509f40c1d62b5e9a0b8f5ea30024b8279e18
 2016-06-28 08:25:04 +00:00
Dan Sandler
0e44a46062 Merge \"One final tweak to the platlogo. am: 4b7e415803 am: d930306e13\" into nyc-mr1-dev-plus-aosp 
am: 670b95928d

Change-Id: I1b6b4c81a45c839d4d5b8cc79d196c6a4348e53b
 2016-06-28 08:25:01 +00:00
Dan Sandler
c637ea4ac6 Merge \"Purr. am: 610f6ede25 am: 45294a6859\" into nyc-mr1-dev-plus-aosp 
am: 477d47fa04

Change-Id: I8887cc582d788b9b9de7009b68bf3a15917722d1
 2016-06-28 08:20:40 +00:00