34115 Commits

Author SHA1 Message Date
Ruben Brunk
9408be9dbb am aa1567f9: Merge "camera3: Make blackLevelPattern optional."
* commit 'aa1567f9ba3611647968ab7786fd3a51abeffb32':
  camera3: Make blackLevelPattern optional.
2014-02-07 16:15:18 -08:00
Ruben Brunk
aa1567f9ba Merge "camera3: Make blackLevelPattern optional." 2014-02-08 00:12:46 +00:00
Ruben Brunk
1ef676f23c camera3: Make blackLevelPattern optional.
Change-Id: Ic7b115e9f6361e158e7af13442bb781bbf351cbf
2014-02-07 16:08:38 -08:00
Zhijun He
621f0e74c9 am 12b805bb: Merge "Camera2: Update focus distance related tags"
* commit '12b805bb5a0bb186e1756b28cece9eb64ff6d598':
  Camera2: Update focus distance related tags
2014-02-07 16:02:58 -08:00
Zhijun He
12b805bb5a Merge "Camera2: Update focus distance related tags" 2014-02-07 23:59:42 +00:00
Zhijun He
ff41393d06 Camera2: Update focus distance related tags
Change-Id: Ib94311c3168802aea2193a282185e0cd70a547cb
2014-02-07 15:57:10 -08:00
Ruben Brunk
957274354b am 3759ec9b: Merge "camera3: Add camera neutral tag."
* commit '3759ec9b2e8aea4301dd0398e5da203bdbc6f833':
  camera3: Add camera neutral tag.
2014-02-07 15:54:50 -08:00
Ruben Brunk
3759ec9b2e Merge "camera3: Add camera neutral tag." 2014-02-07 23:52:45 +00:00
Ruben Brunk
20c76f6758 camera3: Add camera neutral tag.
Change-Id: Ia7e8c444256ce2a587ce708c2e6e951dec9bbdc8
2014-02-07 15:47:10 -08:00
Ruben Brunk
9c17a4c862 am 97f0ed03: Merge "camera3: Update blackLevelPattern tag."
* commit '97f0ed03ec0d9a7d06064c0018feb8d7a45e0c52':
  camera3: Update blackLevelPattern tag.
2014-02-07 15:42:23 -08:00
Ruben Brunk
97f0ed03ec Merge "camera3: Update blackLevelPattern tag." 2014-02-07 23:39:44 +00:00
Ruben Brunk
67b4702428 camera3: Update blackLevelPattern tag.
Change-Id: Iee29d475c92bec1688de96e7cae54dfaf1eec69d
2014-02-07 15:38:28 -08:00
ztenghui
3e793b5ef5 am 82946aae: Merge "Add the clipToOutline by just using the clipPathOp"
* commit '82946aae3cae9bdfe01f96cfc5e8d1efcefeba7c':
  Add the clipToOutline by just using the clipPathOp
2014-02-07 14:10:52 -08:00
ztenghui
82946aae3c Merge "Add the clipToOutline by just using the clipPathOp" 2014-02-07 22:09:39 +00:00
Dianne Hackborn
ec2299d01a am 68ac5cef: Merge "Battery stats: more events, fixes."
* commit '68ac5cef63a9fef595a0cd6b7d8f9170994672ad':
  Battery stats: more events, fixes.
2014-02-07 13:58:39 -08:00
Dianne Hackborn
68ac5cef63 Merge "Battery stats: more events, fixes." 2014-02-07 21:56:45 +00:00
Dianne Hackborn
eaf2ac464b Battery stats: more events, fixes.
Add new history events for top application package and
foreground application packages.

Doing this involved a fair amount of improvement to history
events.  The event code is now separated out to have "start"
and "finish" identifies, and we use that to now keep track
of which events are active.  With that, when resetting the
stats, we can spit out all of the currently active events at
the front of the new history.

Also fixed some problems when I re-arranged the history delta
int bits that were conflicting with the packing of the battery
status bits.  These packing structures are changed to work
together correctly.

Change-Id: Ic8b815060dd8a50ff4a0a209efc2e1044215cd88
2014-02-07 13:45:01 -08:00
ztenghui
fad4593a3c Add the clipToOutline by just using the clipPathOp
Change-Id: I6ba23b589e579599d018600d0744be0efe2028c1
2014-02-07 13:36:57 -08:00
Chris Craik
841af3a5f7 am 27bfb245: Merge "Rework and clean up DisplayList projection"
* commit '27bfb24518934f0344c79a1d655ea8d1208d2446':
  Rework and clean up DisplayList projection
2014-02-07 10:51:10 -08:00
Chris Craik
27bfb24518 Merge "Rework and clean up DisplayList projection" 2014-02-07 18:47:57 +00:00
Chris Craik
1df26446b7 Rework and clean up DisplayList projection
Move the projection surface to be a property of a DisplayList,
set to true for every background drawable.

Additionally, handle a projecting view background such that it doesn't
try to project onto itself (which is undesirable).

Change-Id: Ic70b17474bd87340e80767f8518f73b233419c7a
2014-02-06 16:07:37 -08:00
Adam Powell
47e352cf04 am 6250c59e: Merge "Refactoring of fitSystemWindows to applyWindowInsets for views"
* commit '6250c59e0d917fb3641ac499ca69b011aa50a4bd':
  Refactoring of fitSystemWindows to applyWindowInsets for views
2014-02-06 14:43:27 -08:00
Adam Powell
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00:00
John Reck
ef129d8442 am 393fdbec: Merge "Remove overdraw counter"
* commit '393fdbec9f3f11d277e1631c2e36362e408cbbdc':
  Remove overdraw counter
2014-02-06 14:17:25 -08:00
Jeff Sharkey
be781e26aa am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor."
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
  Update DrmOutputStream to use raw FileDescriptor.
2014-02-06 14:17:18 -08:00
John Reck
593b19a49e Remove overdraw counter
Change-Id: Iee05362b9080b28714a4cca5a571f19ce81eadfd
2014-02-06 11:26:23 -08:00
Jeff Sharkey
ebf8ad5d91 Update DrmOutputStream to use raw FileDescriptor.
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.

Also return flag indicating if deleteOlderFiles() actually deleted
anything.  Update tests to verify.

Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
2014-02-06 09:47:38 -08:00
Jessica Hummel
3c3e16e041 am e33e2ca3: Merge "Extend DeviceOwner concept to accommodate ProfileOwners"
* commit 'e33e2ca3460c0e5a898e5b0406d86b16b96f735a':
  Extend DeviceOwner concept to accommodate ProfileOwners
2014-02-06 02:25:23 -08:00
Jessica Hummel
e33e2ca346 Merge "Extend DeviceOwner concept to accommodate ProfileOwners" 2014-02-06 10:23:00 +00:00
Adam Connors
776c555d95 Extend DeviceOwner concept to accommodate ProfileOwners
ProfileOwners, like DeviceOwners, are Device Admins that have
additional priviledges. ProfileOwners however are scoped per
user.

Change-Id: I1e22c85878e0672121e6ebbe97fca38591f992b2
2014-02-06 10:07:19 +00:00
Alan Viverette
1f9a3a862a am d5154ec2: Add prototype for borderless touch feedback drawable
* commit 'd5154ec2bc7e7c0bdfd14fc784912d390afe43cc':
  Add prototype for borderless touch feedback drawable
2014-02-05 18:55:43 -08:00
Alan Viverette
d5154ec2bc Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
John Spurlock
8662cab1ee am 0e29ad02: Merge "Global system setting to override certain window policy."
* commit '0e29ad02f9ed46f2f2a9de59249969f9d1bdd7f6':
  Global system setting to override certain window policy.
2014-02-05 16:56:17 -08:00
John Spurlock
0e29ad02f9 Merge "Global system setting to override certain window policy." 2014-02-06 00:53:42 +00:00
Dianne Hackborn
6946115e62 am 6eb0fdb9: Merge "Improve logging of first wake lock, history size."
* commit '6eb0fdb99bc09210bea4df054a9c8a05daea3d1b':
  Improve logging of first wake lock, history size.
2014-02-05 16:44:07 -08:00
Dianne Hackborn
6eb0fdb99b Merge "Improve logging of first wake lock, history size." 2014-02-06 00:41:49 +00:00
Dianne Hackborn
3d658bf20e Improve logging of first wake lock, history size.
We now try to have a better label for the first wake lock
that is acquired in the log.  This is done in two ways:

- The alarm manager now sorts the alarms it is going to
  execute so that wakeup alarms are first, which are more
  important w.r.t. which one should be logged.
- There is a new power manager facility to make a wake lock
  as "unimportant for logging," which just means in battery
  stats that a wake lock acquired after that can be considered
  the actual one to log.  This is only used by the alarm manager
  to mark its TIME_TICK alarms as unimportant for logging.

Also reworked the battery history code to be cleaner and a bit
smaller.  There is no longer a separate EVENT command, instead
the event code and tag are just another thing that can be included
in an UPDATE command.

The bits used in the first history int are also re-arrange, so
that only the ones that really change a fair amount in the state
bits are up at the top and there is no longer space used for
the command code (since now it is always just UPDATE).  This
allows us to have more room for the time delta at the bottom,
to better avoid situations where we need to write an int delta.

Change-Id: I1bb860ae5b558a248800b090b03a84fbf7acd68a
2014-02-05 16:40:51 -08:00
Alan Viverette
8ba71d1091 am dc912588: Merge "Temporary fix for background invalidation"
* commit 'dc9125880c372b3d3a2af09d48225c9c50b962f7':
  Temporary fix for background invalidation
2014-02-05 14:19:27 -08:00
Alan Viverette
dc9125880c Merge "Temporary fix for background invalidation" 2014-02-05 22:16:10 +00:00
Alan Viverette
e6875f1575 Temporary fix for background invalidation
Not a complete solution, since we could be more efficient, but enough
to have both background display lists and proper invalidation.

Change-Id: I0216a104948c0930760275bb2b98318b0a4487e7
2014-02-05 14:05:17 -08:00
Zhijun He
cb49cb32ae am b77690ce: Merge "Camera2: update aeLock and transform matrix tag specs"
* commit 'b77690cea0f146c6823c922a4f8d8ca7336dde21':
  Camera2: update aeLock and transform matrix tag specs
2014-02-05 13:52:25 -08:00
Zhijun He
b77690cea0 Merge "Camera2: update aeLock and transform matrix tag specs" 2014-02-05 21:49:56 +00:00
Zhijun He
49a3ca9330 Camera2: update aeLock and transform matrix tag specs
Change-Id: I436f41ff2bf811a654de15b51739c07def354648
2014-02-05 13:48:09 -08:00
John Spurlock
c6d1c60fb1 Global system setting to override certain window policy.
Specifically, the ability to force immersive-mode-like behavior
on the status bar, the navigation bar (or both) on a
package-by-package basis - and to disable immersive mode
confirmations for specific packages.

Change-Id: I2df7092a91eceeb815367ef917dd7289f4f2b27e
2014-02-05 16:45:23 -05:00
Hui Shu
a09c820552 am e6415f50: Merge "Fix postUrl to call loadUrl when url is not a network url."
* commit 'e6415f50b10fe455df2cbe568a90bc762cce3cf7':
  Fix postUrl to call loadUrl when url is not a network url.
2014-02-05 13:38:01 -08:00
Hui Shu
e6415f50b1 Merge "Fix postUrl to call loadUrl when url is not a network url." 2014-02-05 21:35:12 +00:00
Hui Shu
c60ad9c3fb Fix postUrl to call loadUrl when url is not a network url.
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
2014-02-05 13:32:37 -08:00
Zhijun He
6f4e1e51b4 am c44b51bd: Merge "Camera2: Update stream num tag specs"
* commit 'c44b51bdebd901def3015591814a57964f0adeef':
  Camera2: Update stream num tag specs
2014-02-05 11:30:59 -08:00
Narayan Kamath
25b66062ad am 33e77b61: Merge "Revert "Camera2: Update stream num tag specs""
* commit '33e77b61b8c170166206fbdacb157e56955bebc8':
  Revert "Camera2: Update stream num tag specs"
2014-02-05 10:43:56 -08:00
Jake Hamby
c130ffacdb am dbe576eb: Merge "Add new RIL commands to read/write NV items and reset NV config."
* commit 'dbe576ebd1c6bc05d17657aedb3f2feec162f2b1':
  Add new RIL commands to read/write NV items and reset NV config.
2014-02-05 10:43:53 -08:00