Sailesh Nepal
1bd7876d76
Add Wi-Fi calling state setting to telephony interfaces
...
Change-Id: I01029ade0eb1ff981cb92a536d042a02129a053f
2014-02-11 22:32:21 -08:00
Jeff Brown
ca9bc702df
Add support for injecting events into ActivityContainers.
...
Modified ActivityView to inject touch events it receives back into
its activity container. The container then injects the event into
the input system along with the display id of the underlying virtual
display.
Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
2014-02-11 14:47:48 -08:00
Griff Hazen
6adfd86ca9
am 4e795ebe: am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev
...
* commit '4e795ebe1783623a28a988f77b4f0f11d54e73be':
Add local-only option to Notification (using flag)
2014-02-11 21:40:48 +00:00
Griff Hazen
4e795ebe17
am 0ff811db: Merge "Add local-only option to Notification (using flag)" into klp-modular-dev
...
* commit '0ff811db58089e7b4e8fbca4f41be8f20c86ce10':
Add local-only option to Notification (using flag)
2014-02-11 21:34:53 +00:00
Griff Hazen
dfcb0803bf
Add local-only option to Notification (using flag)
...
Change-Id: Ic6d2f3b0cf06b58c0afa2af0fa6b245124424223
2014-02-11 12:00:00 -08:00
Kenny Guy
826e51c4da
Merge "Add concepts of related users and managed profiles to user manager."
2014-02-11 19:27:36 +00:00
John Reck
9b6fa77518
Merge "Implement missing safelyRun() on ThreadedRenderer"
2014-02-11 18:55:46 +00:00
John Reck
fc53ef2779
Implement missing safelyRun() on ThreadedRenderer
...
Change-Id: I14b75f37a13fabaa759a51369190dbdc84087c4b
2014-02-11 10:40:25 -08:00
Eino-Ville Talvala
3b1da03c8b
Merge "camera2: Clean up cross-references"
2014-02-11 17:57:08 +00:00
John Reck
f6eebb21d5
Merge "Refactor HardwareLayer"
2014-02-11 17:30:53 +00:00
Narayan Kamath
a1cffb429c
am d350af96: am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
...
* commit 'd350af9695018e81f85600fb7dd906003cbaf62e':
Use long for pointers in EmojiFactory and PdfDocument
2014-02-11 16:40:27 +00:00
Narayan Kamath
d350af9695
am b90fc64b: am f44a3f1e: Merge "Use long for pointers in EmojiFactory and PdfDocument"
...
* commit 'b90fc64b030ee50bda9a0dabb5247660b70d6659':
Use long for pointers in EmojiFactory and PdfDocument
2014-02-11 16:34:04 +00:00
Kenny Guy
a52dc3eb40
Add concepts of related users and managed profiles to user manager.
...
Related users are a group that will share things like notifications.
Managed profiles are a profile of another user.
Change-Id: I2d0532f1abf939810f0fa3fc7c77ad13fa567833
2014-02-11 15:33:14 +00:00
Narayan Kamath
f44a3f1e00
Merge "Use long for pointers in EmojiFactory and PdfDocument"
2014-02-11 14:07:17 +00:00
Jeff Brown
cab8617b8c
am 25df673b: am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev
...
* commit '25df673b849de374cf1de40250dfd8a48b7ac28b':
Make SystemService constructor take a Context.
2014-02-11 08:33:50 +00:00
Jeff Brown
25df673b84
am 1b51c9cb: Merge "Make SystemService constructor take a Context." into klp-modular-dev
...
* commit '1b51c9cb96fe2a0818289857a016521eed1ec183':
Make SystemService constructor take a Context.
2014-02-11 08:18:34 +00:00
John Reck
04fc583c3d
Refactor HardwareLayer
...
Defer all the things!
Groundwork to allow hardware layers to work in a renderthread world
Change-Id: Ib3aa47525f393083621254a743dbaa6352f933bd
2014-02-10 20:55:39 -08:00
Jeff Brown
b880d880c6
Make SystemService constructor take a Context.
...
This change simplifies the process of initializing a SystemService
by folding the onCreate() step back into the constructor. It removes
some ambuiguity about what work should happen in the constructor and
should make it possible for services to retain most of their final
fields after refactoring into the new pattern.
Change-Id: I25f41af0321bc01898658ab44b369f9c5d16800b
2014-02-10 20:01:43 -08:00
Eino-Ville Talvala
d8fd67931e
camera2: Clean up cross-references
...
Change-Id: I7410293a13f65768a2aeed1490662735f73987cb
2014-02-10 12:41:04 -08:00
Derek Sollenberger
eef1be1d83
Merge "Removing SkiaColorFilter and inspecting the native object directly."
2014-02-10 19:19:07 +00:00
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