George Mount
34d8519de4
Merge "Add animations along a Path."
2013-11-20 15:47:00 +00:00
George Mount
c96c7b2e54
Add animations along a Path.
...
Change-Id: If03bd10a3961ff874e33489e1253146b8dadca33
2013-11-20 07:39:26 -08:00
Christopher Tate
266f48cc04
am c8ea38fe: am e3705342: am b0183f0a: Harden against transiently unavailable backup transports
...
* commit 'c8ea38fe18efb447a0f87aed60f511d14d2389fa':
Harden against transiently unavailable backup transports
2013-11-19 11:53:02 -08:00
Christopher Tate
c8ea38fe18
am e3705342: am b0183f0a: Harden against transiently unavailable backup transports
...
* commit 'e3705342671d08b5cd94a0d69ef8099a2c3211f8':
Harden against transiently unavailable backup transports
2013-11-19 11:48:50 -08:00
Christopher Tate
e370534267
am b0183f0a: Harden against transiently unavailable backup transports
...
* commit 'b0183f0ae311966cff0e10e8139c56f97288d1f2':
Harden against transiently unavailable backup transports
2013-11-19 11:46:48 -08:00
Christopher Tate
b0183f0ae3
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Now with 100% less build break.
Bug 11716868
Change-Id: I2af4e93788068cfac97c0a48d3568c561eefa23d
2013-11-19 11:24:46 -08:00
Sascha Prueter
a9249322d5
am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev
...
* commit 'c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4':
Trying to unbreak build...
2013-11-18 23:31:11 -08:00
Sascha Prueter
c7f7d1bf18
am f7044fec: Merge "Trying to unbreak build..." into klp-dev
...
* commit 'f7044fecee3ad1e2b2bfdd67c25b0c1536c83e18':
Trying to unbreak build...
2013-11-18 23:27:07 -08:00
Sascha Prueter
d5965cb506
Trying to unbreak build...
...
Revert "Harden against transiently unavailable backup transports"
This reverts commit 8f98252afe .
Change-Id: I3aabb80f1a5932d530bce6b82d4b30c6cd1cdd5a
2013-11-19 06:51:21 +00:00
Christopher Tate
fa331b1dfb
am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
...
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
Harden against transiently unavailable backup transports
2013-11-18 18:48:29 -08:00
Christopher Tate
1e964ed808
am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
...
* commit 'd6bbc54423c0fb70e9e0415b3e8c12a435d715a1':
Harden against transiently unavailable backup transports
2013-11-18 18:44:47 -08:00
Christopher Tate
8f98252afe
Harden against transiently unavailable backup transports
...
The init & clear operations are particularly important to ensure
delivery when at all possible, so we retry those periodically
if the transport is unavailable when we first attempt them.
Bug 11716868
Change-Id: I4860fe3d4e99618b2cd194c83162bd7cbd5a83a9
2013-11-18 16:12:38 -08:00
John Spurlock
180979f76b
Fix logic problems in AnimationDrawable and View.
...
1. View now checks both queues when unscheduling runnables,
fixing the case where work was scheduled pre-attach, and unscheduled
post-attach.
2. AnimationDrawable avoids posting duplicate runnables when rescheduling
itself.
3. Decouple is-animation-running state from current frame pointer in
AnimationDrawable. Some calls init to the first frame, but do not
kick off the animation.
4. Remove workaround in SystemUI's AnimatedImageView (status bar icon)
now that the underlying framework issues are fixed.
Bug:11694594
Change-Id: I77ca6bd80262f7edcf980b2d7efc2592f8051f29
2013-11-18 15:59:37 -05:00
Alan Viverette
cac68c3f64
Merge "Deprecate Activity.setTitleColor()"
2013-11-15 23:47:53 +00:00
Alan Viverette
2525d9c843
Deprecate Activity.setTitleColor()
...
BUG: 11712103
Change-Id: Id34ffb59d3f848c591a98880c6cdd9058e5a38dc
2013-11-15 14:42:19 -08:00
Mike Lockwood
6ae75780e9
Merge "Remove obsolete "headless" support"
2013-11-15 22:22:58 +00:00
Mike Lockwood
ed8902d3b5
Remove obsolete "headless" support
...
Change-Id: I18e7a4c5166163372ec0a8abbef1063668a0f5b6
2013-11-15 11:01:47 -08:00
Martijn Coenen
7fbed8456f
Merge "Add "urn:nfc" shortener."
2013-11-15 17:34:29 +00:00
Jeff Brown
30cb5c3ffa
am 2ea480ca: am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '2ea480cac89460ee2524cd080e90f6240e8eebf5':
Disallow applications from initiating cast screen.
2013-11-15 00:42:46 -08:00
Jeff Brown
2ea480cac8
am 5d0b18cd: am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '5d0b18cddfcb933d7960c5a6a820045d77a0285c':
Disallow applications from initiating cast screen.
2013-11-15 00:39:57 -08:00
Jeff Brown
5d0b18cddf
am 3de885be: Merge "Disallow applications from initiating cast screen." into klp-dev
...
* commit '3de885bef2f0f85ea76fd96c8f18cdd743ce66a4':
Disallow applications from initiating cast screen.
2013-11-15 00:38:09 -08:00
Jeff Brown
3de885bef2
Merge "Disallow applications from initiating cast screen." into klp-dev
2013-11-15 08:35:50 +00:00
Jeff Brown
af574183c2
Disallow applications from initiating cast screen.
...
Only allow the system ui and settings to connect to a remote display.
To do this, we essentially hide the remote displays from applications
by using the ROUTE_TYPE_REMOTE_DISPLAY then add permission checks
around the operations that connect to them.
As a bonus, this may actually save power on devices since applications
that use MediaRouter will not longer be performing discover on
remote display routes at all.
Bug: 11257292
Change-Id: I9ea8c568df4df5a0f0cf3d0f11b39c87e2110795
2013-11-15 00:29:43 -08:00
Mindy Pereira
a51b01c8c1
am bb8e75e6: am cce2e194: am 5823352c: Cancel double tap mode on action_up
...
* commit 'bb8e75e6c451a71bc7d0301f376d61781cc08393':
Cancel double tap mode on action_up
2013-11-14 19:52:22 -08:00
Mindy Pereira
bb8e75e6c4
am cce2e194: am 5823352c: Cancel double tap mode on action_up
...
* commit 'cce2e1944c4ac9411fa25534eb9b51d6f044dfb4':
Cancel double tap mode on action_up
2013-11-14 19:48:42 -08:00
Mindy Pereira
cce2e1944c
am 5823352c: Cancel double tap mode on action_up
...
* commit '5823352c6c5bfa3824afacd023b01af537b5dfa0':
Cancel double tap mode on action_up
2013-11-14 19:44:52 -08:00
Mindy Pereira
5823352c6c
Cancel double tap mode on action_up
...
fixes b/11592408 Dragging immediately after double touch turns gesture into double touch drag
Change-Id: I3e7926a4f6f9ab4951f380bd004499c78b3bda69
2013-11-15 02:48:06 +00:00
Dianne Hackborn
b25b890126
am 6f5d8537: am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"
...
* commit '6f5d85377be86f6d2856470788471bdda5832366':
Use index in SparseArray access properly
2013-11-14 16:42:04 -08:00
Dianne Hackborn
6f5d85377b
am 47b260d0: am 572b759a: Merge "Use index in SparseArray access properly"
...
* commit '47b260d071859a8c20bb0af2bcc095e253f7046c':
Use index in SparseArray access properly
2013-11-14 16:37:55 -08:00
Dianne Hackborn
47b260d071
am 572b759a: Merge "Use index in SparseArray access properly"
...
* commit '572b759a41fd490fd21b5831dd8b8434b7fd5df8':
Use index in SparseArray access properly
2013-11-14 16:35:42 -08:00
Dianne Hackborn
572b759a41
Merge "Use index in SparseArray access properly"
2013-11-15 00:33:20 +00:00
Christopher Tate
63e1883d96
am a5acd62b: am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit 'a5acd62bdefe5b616c0ea080434e9dd221169527':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:49:15 -08:00
Christopher Tate
a5acd62bde
am 6e5cf573: am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit '6e5cf573f2f2e17825af2973daeba893c6aa5855':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:44:40 -08:00
Christopher Tate
6e5cf573f2
am 99437f25: Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
...
* commit '99437f252b728f4946940f232c4b73b9dda76cfb':
Ensure recipient can be launched before attempting broadcast delivery
2013-11-14 15:04:31 -08:00
Christopher Tate
99437f252b
Merge "Ensure recipient can be launched before attempting broadcast delivery" into klp-dev
2013-11-14 22:59:20 +00:00
Martijn Coenen
f180f30b0d
Add "urn:nfc" shortener.
...
As defined in the NFC Forum specification
"URI Record Type Definition". For some reason
0x23 wasn't added in the past, but it's present
in the specification.
Change-Id: If4ec2216fd53a31943f6de62aa1c69166f597616
2013-11-14 13:40:07 -08:00
Christopher Tate
ba629da331
Ensure recipient can be launched before attempting broadcast delivery
...
User removal or eviction inherently races with broadcast delivery. This
patch introduces a latest-possible recheck of the availbility of the
target application before attempting to send it a broadcast.
Once the process has actually been spun up the system is essentially
committed to presenting it as a running application, and there is no
later check of the availability of the app: the failure mode for
continuing to attempt delivery is a crash *in the app process*,
and is user-visible.
We now check the app+userid existence of the intended recipient
just prior to committing to launch its process for receipt, and
if it is no longer available we simply skip that receiver and
continue normally.
Bug 11652784
Bug 11272019
Bug 8263020
Change-Id: Ib19ba2af493250890db7371c1a9f853772db1af0
2013-11-14 12:37:31 -08:00
Zhijun He
e5d2af6be2
Merge "Camera2: Fix metadata unit test failures"
2013-11-14 20:13:22 +00:00
Zhijun He
2f1680be3d
Camera2: Fix metadata unit test failures
...
The get/set override for special cases broke the metadata unit test, add proper
handling to fix the test failures.
Also make the key equals check both names and types.
Bug: 11259962
Change-Id: I00ff53115e7043212035cc4306e0481f9d113747
2013-11-14 12:11:32 -08:00
Matthew Williams
ee7081d1ed
Resolve build breakage for merge of fix to b/11559103
...
Change-Id: Ib42eb48a234f53d34d23f5c661331b2f37be4209
2013-11-14 11:52:58 -08:00
Matthew Williams
bef1f9a370
am 72402f9d: am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
...
* commit '72402f9de7b108d77316e3c93399b07a2f98c42a':
SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:32:02 -08:00
Matthew Williams
72402f9de7
am 09d8e3cf: am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
...
* commit '09d8e3cf4e411b016ee65d8328dd7a443c9de0ff':
SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:27:26 -08:00
Matthew Williams
09d8e3cf4e
am c68bb182: Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
...
* commit 'c68bb18244aa12d19bea9f9d59f2fe0d81478904':
SyncManager now returns copy on getCurrentSyncs()
2013-11-14 09:23:32 -08:00
Matthew Williams
c68bb18244
Merge "SyncManager now returns copy on getCurrentSyncs()" into klp-dev
2013-11-14 17:18:58 +00:00
Satoshi Kataoka
4335047ea4
am b97e102c: am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
...
* commit 'b97e102c4b9041ea8c5bb753743f2e1d7d3cf06a':
Fix compatibility issue on InputMethodSubtype
2013-11-13 22:32:43 -08:00
Satoshi Kataoka
b97e102c4b
am 1b570b57: am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
...
* commit '1b570b571a63311f7f7d5b7cc5e17b3103fa8af9':
Fix compatibility issue on InputMethodSubtype
2013-11-13 22:28:47 -08:00
Satoshi Kataoka
1b570b571a
am 5fd5aa3d: Fix compatibility issue on InputMethodSubtype
...
* commit '5fd5aa3d066fc12c92b5b6541d85ac243556223f':
Fix compatibility issue on InputMethodSubtype
2013-11-13 22:25:01 -08:00
Adam Powell
c3c0c18d5a
am 73a4aeb9: am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background
...
* commit '73a4aeb9ffa15a2c08edf3ba69157c08821930ee':
Reset padding flags when set programmatically or implicitly from background
2013-11-13 22:18:10 -08:00
Satoshi Kataoka
5fd5aa3d06
Fix compatibility issue on InputMethodSubtype
...
Bug: 11032428
Change-Id: If722bbbfb69d00e1830007582d46a33319203eea
2013-11-14 15:08:39 +09:00
Adam Powell
73a4aeb9ff
am 75ae8983: am 48d2bcf2: Reset padding flags when set programmatically or implicitly from background
...
* commit '75ae89837615fa9cebd6cbb051213c025c48bcf6':
Reset padding flags when set programmatically or implicitly from background
2013-11-13 19:45:21 -08:00