47477 Commits

Author SHA1 Message Date
Chris Craik
4292e36f02 Merge "Add shadow casting / global perspective APIs, hidden for now." 2014-02-10 18:58:54 +00:00
Griff Hazen
9b4ee2f334 am edb555ed: am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
* commit 'edb555edceaf51f7ef40e35257a4b00c06a68e72':
  Fix ActivityView layout bug.
2014-02-10 18:01:27 +00:00
Griff Hazen
edb555edce am 92ade49e: Merge "Fix ActivityView layout bug." into klp-modular-dev
* commit '92ade49ecaa23cd77510ee0bc1dbc6355eb581ed':
  Fix ActivityView layout bug.
2014-02-10 17:54:57 +00:00
Griff Hazen
af745f6df7 Fix ActivityView layout bug.
Child TextureView should be positioned at origin of ActivityView,
with matching width and height. Previously, a container's padding
would be applied twice for example.

Change-Id: Ie0be10614a45aede4207abf986721385d04d8c76
2014-02-10 08:58:32 -08:00
Narayan Kamath
91447d88f2 Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
2014-02-10 15:50:16 +00:00
Craig Mautner
e666350e12 am e03ed510: am 4e5b67e6: Queue startActivity params if not yet ready.
* commit 'e03ed51068bcb4253e2fd2a4a3f39a7e580a721a':
  Queue startActivity params if not yet ready.
2014-02-10 12:51:24 +00:00
Igor Murashkin
a0ab96d1a7 Merge "camera2: Simplify min frame durations and add available stream configs" 2014-02-08 02:54:03 +00:00
Igor Murashkin
a23ffb5f50 camera2: Simplify min frame durations and add available stream configs
Change-Id: I41951c9a50a333e8e47d0ba616c316c065b604e8
2014-02-07 18:52:50 -08:00
Ruben Brunk
ad0aa8383c Merge "camera2: Update hotpixel tags." 2014-02-08 02:39:22 +00:00
Ruben Brunk
eba1b3a843 camera2: Update hotpixel tags.
Change-Id: I6e2931d54a92f3852e8abe8c480f1762c92655ad
2014-02-07 18:38:46 -08:00
Igor Murashkin
d531f88fdd Merge "camera2: Add tags for querying capabilities of a camera device" 2014-02-08 02:35:49 +00:00
Igor Murashkin
e46c0dad37 camera2: Add tags for querying capabilities of a camera device
Change-Id: I955b514f9fe66205d241cd4072aa6ddf71efb53c
2014-02-07 18:35:11 -08:00
Igor Murashkin
672ad888d2 Merge "camera2: Add android.scaler.availableInputOutputFormatsMap" 2014-02-08 02:22:55 +00:00
Igor Murashkin
418f6df836 camera2: Add android.scaler.availableInputOutputFormatsMap
Change-Id: I2f0000614063f4004aa90ad1846936bf85db0389
2014-02-07 18:20:48 -08:00
Ruben Brunk
d5fdd1c112 camera3: Update raw color calibration transform tags.
Change-Id: Ic7a8c68e83b3eb257bd15380baad6370c5eb0dbc
2014-02-07 17:39:53 -08:00
Ruben Brunk
a9bfdbbb35 camera3: Add camera profile properties.
Change-Id: I39f6067bb1c05b8b00b0205bb367312112407299
2014-02-07 16:58:09 -08:00
Zhijun He
8954f6f0b2 Merge "Camera2: Add OFF_KEEP_STATE mode" 2014-02-08 00:36:17 +00:00
Zhijun He
2d5e89778e Camera2: Add OFF_KEEP_STATE mode
Change-Id: I8802339a6b6d8a009f3ba790ffad23c0fcbbfa94
2014-02-07 16:13:46 -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
Chris Craik
b67a7bf27b Add shadow casting / global perspective APIs, hidden for now.
Global perspective isn't yet hooked up in rendering.

Change-Id: I64ad272ea5dc523505260ce114f0a6bebdcfe9dc
2014-02-07 16:02:51 -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
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
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
Craig Mautner
e03ed51068 am 4e5b67e6: Queue startActivity params if not yet ready.
* commit '4e5b67e69560ca443d5fb4b78abf56ae948f578c':
  Queue startActivity params if not yet ready.
2014-02-07 23:37:56 +00:00
Craig Mautner
4e5b67e695 Queue startActivity params if not yet ready.
If the ActivityView is not ready when the startActivity method is
called we now save the Intent until the ActivityView is ready.

Fixes bug 12821638.

Change-Id: I30ebb2699963f174cc2d5a3fb77a99ed33a4252b
2014-02-07 15:30:03 -08:00
ztenghui
82946aae3c Merge "Add the clipToOutline by just using the clipPathOp" 2014-02-07 22:09:39 +00: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
27bfb24518 Merge "Rework and clean up DisplayList projection" 2014-02-07 18:47:57 +00:00
Narayan Kamath
8f52fee060 Merge "Fix several bad function definitions." 2014-02-07 11:34:19 +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
6250c59e0d Merge "Refactoring of fitSystemWindows to applyWindowInsets for views" 2014-02-06 22:41:14 +00: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
Narayan Kamath
017546e652 Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271
Change-Id: I6a167a4f3aac1e22ddea33d067caaef6a11b418c
2014-02-06 11:50:31 +00: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
d5154ec2bc Add prototype for borderless touch feedback drawable
Change-Id: I6366855b1fb838aa077bc6bdb62adc2134c51dca
2014-02-05 17:53:33 -08:00
John Spurlock
0e29ad02f9 Merge "Global system setting to override certain window policy." 2014-02-06 00:53:42 +00: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
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
Christopher Tate
f0af57578e Merge "Improve idle-service bind permission description" 2014-02-05 22:03:33 +00:00
Zhijun He
b77690cea0 Merge "Camera2: update aeLock and transform matrix tag specs" 2014-02-05 21:49:56 +00:00