Jason Simmons
92f5f589d2
Do not report a duration for a live stream.
...
Also, do not clamp the playback position to the duration if the duration
is unknown.
Bug: 6672119
Change-Id: Id18bf3d45d4fe7d5edc2ac2da492ca5b4f217826
2012-06-22 16:19:06 -07:00
Craig Mautner
4170c37446
Merge "Move animation step from layout to animator."
2012-06-22 15:46:28 -07:00
Hiroshi Lockheimer
0f5541775c
am 3fee3eb7: am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev
...
* commit '3fee3eb7e0a83cd7fc8df3994692232ba6953c02':
Don't display based on a dummy animation.
2012-06-22 15:39:55 -07:00
Jeff Brown
8411df2ffd
Merge "Remove dead code in PowerManagerService."
2012-06-22 15:37:56 -07:00
Hiroshi Lockheimer
3fee3eb7e0
am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev
...
* commit '5beeb04b528fec320d3453601b4adf4efbd8eba7':
Don't display based on a dummy animation.
2012-06-22 15:34:56 -07:00
Jeff Brown
dc6f8b2b8c
Merge "Deprecate DatabaseUtils.InsertHelper."
2012-06-22 15:34:33 -07:00
Hiroshi Lockheimer
5beeb04b52
Merge "Don't display based on a dummy animation." into jb-dev
2012-06-22 15:33:15 -07:00
Jeff Brown
b33eb4e32a
Deprecate DatabaseUtils.InsertHelper.
...
This class does not offer any advantages over SQLiteStatement
and just makes code more complex and error-prone.
Documented that the class is not thread-safe.
Removed a potential deadlock in insert() and replace() caused
by the insertInternal() method being synchronized in the case
where the class was being used concurrently (woe to you!).
Thread A would start a transaction.
Thread B would call insertInternal() and acquire the object monitor,
but block because it could not obtain the db connection because
thread A is holding onto it.
Thread A would call insertInternal() and block because Thread B
was holding the object monitor.
Deadlock.
Changed this code to use a transaction instead of a lock,
which provides the necessary mutual exclusion guarantee without
the potential for a deadlock. Even so, the class really isn't
thread safe.
Bug: 6625094
Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
2012-06-22 15:24:26 -07:00
The Android Open Source Project
b06e79d737
am de9d2fb6: Reconcile with jb-release
...
* commit 'de9d2fb699bd5162a66910e68db989a7bad0575b':
2012-06-22 15:23:54 -07:00
The Android Open Source Project
de9d2fb699
Reconcile with jb-release
...
Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac
2012-06-22 15:20:16 -07:00
Craig Mautner
9c5bf3b36f
Don't display based on a dummy animation.
...
The Starting window was being made visible early because the app
token had the dummy animation set. When the real animation started
the Starting window picked it up and became transparent causing
the underlying window to become visible again => jank.
Fixes bug 6691421.
Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283
2012-06-22 15:19:13 -07:00
The Android Automerger
b519fac279
merge in jb-release history after reset to jb-dev
2012-06-22 15:07:26 -07:00
Ying Wang
bd1404519c
am 5539e720: (-s ours) am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '5539e720b45418e5d159a66beb29e38044a5f733':
Import translations. DO NOT MERGE
2012-06-22 15:04:22 -07:00
Ying Wang
5539e720b4
am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
Import translations. DO NOT MERGE
2012-06-22 15:01:52 -07:00
Ying Wang
ddeb7bd3c7
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-22 14:58:39 -07:00
Ying Wang
604d3eb76a
Merge "Import translations. DO NOT MERGE"
2012-06-22 14:58:26 -07:00
Michael Jurka
0adefbd1d1
Merge "Remove duplicate code to update wallpaper"
2012-06-22 14:44:06 -07:00
Michael Jurka
e1a1e40358
am 037faad0: am ab779e0b: Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev
...
* commit '037faad0f437c5fdc5435c030ef03d61de75090f':
Increase bitmap memory cap for widgets (Bug 6597440)
2012-06-22 14:42:07 -07:00
Michael Jurka
037faad0f4
am ab779e0b: Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev
...
* commit 'ab779e0bb2948bdfac461f931f9d165a5a38b84a':
Increase bitmap memory cap for widgets (Bug 6597440)
2012-06-22 14:39:52 -07:00
Michael Jurka
ab779e0bb2
Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev
2012-06-22 14:38:12 -07:00
Scott Main
91b5ecc486
docs: change class names for links to design docs
...
Change-Id: I34d85096eecb4e83f52e481411cf2f590d553a37
2012-06-22 14:37:27 -07:00
Jean-Baptiste Queru
cee303fac4
am cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"
...
* commit 'cc6cf51b80eabd199f797f40b76f7980c343962b':
Initialize mJunkPath to false
2012-06-22 14:36:49 -07:00
Jean-Baptiste Queru
cc6cf51b80
am 8c71784e: Merge "Initialize mJunkPath to false"
...
* commit '8c71784e9e83e914135e996591aa7903edd2fd96':
Initialize mJunkPath to false
2012-06-22 14:34:54 -07:00
Adam Powell
17f006ea92
am 8a0f63bb: am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
...
* commit '8a0f63bb588138a9e4f1ef7830e94282efe57c6b':
Allow sloppy touch targeting on Action Bar home/up
2012-06-22 14:30:33 -07:00
Adam Powell
8a0f63bb58
am 40a9da3b: Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
...
* commit '40a9da3b9e5ae9d4d03b89f61f24ee6d96bd3bf4':
Allow sloppy touch targeting on Action Bar home/up
2012-06-22 14:28:26 -07:00
Adam Powell
40a9da3b9e
Merge "Allow sloppy touch targeting on Action Bar home/up" into jb-dev
2012-06-22 14:26:20 -07:00
Winson Chung
e92aad432a
Increase bitmap memory cap for widgets (Bug 6597440)
...
Change-Id: I4149b8c5f204f10ebf0ef1f8d03709c0559178d0
2012-06-22 14:12:39 -07:00
Adam Powell
6231ab8bbb
Allow sloppy touch targeting on Action Bar home/up
...
Bug 6521608
When there are no custom views or other actionable views next to the
action bar's home/up affordance, expand the touch target by a generous
slop value. This helps frustrating cases where a user accidentally
hits just to the right of Up and nothing happens.
Change-Id: I09ef604ce70ad380aab62a373b04c4b02007c644
2012-06-22 14:09:25 -07:00
Jeff Brown
88c997a5ab
Remove dead code in PowerManagerService.
...
Also update some code to match coding conventions.
Change-Id: I70be0e6575a20ad268fecdbc6d59ab83915c0f23
2012-06-22 13:57:45 -07:00
Santos Cordon
fe930ade67
Fix a bad comment.
...
Change-Id: I923fb003cc37f562ff6cc5a4cdcc8dd4ea227dc0
2012-06-22 13:55:53 -07:00
Glenn Kasten
10a9831b66
Remove AudioRecord record_flags
...
Change-Id: I8a3d62ea64415582c87f43e94b17aa884d7d572d
2012-06-22 13:49:38 -07:00
Jean-Baptiste Queru
8c71784e9e
Merge "Initialize mJunkPath to false"
2012-06-22 13:47:51 -07:00
Scott Main
adba6ffbb9
am 101a120c: am 9be0105f: docs: fix several links
...
* commit '101a120c27f68fb7d44e6221244cb9441dfc4285':
docs: fix several links
2012-06-22 13:35:52 -07:00
Scott Main
101a120c27
am 9be0105f: docs: fix several links
...
* commit '9be0105fbc56eb1b1813bb7c5fe258a144867a43':
docs: fix several links
2012-06-22 13:33:30 -07:00
Santos Cordon
a72d0dd444
Merge "Telephony Capability-Distinguish dialing & connect"
2012-06-22 13:13:06 -07:00
Santos Cordon
6cb805f8c3
Telephony Capability-Distinguish dialing & connect
...
New capability returns true if the device can distinguish between
dialing/active and connected reliably. Currently returns true only for
GSM phones.
Change-Id: I50751abaf74b31fdc747f4d04ca9a2ac4d73a1ff
2012-06-22 13:11:16 -07:00
Ying Wang
3f2d325174
Import translations. DO NOT MERGE
...
Change-Id: I28f8e247b1decb089fb2c3c39c8315605d1e0ec1
2012-06-22 13:01:05 -07:00
Ying Wang
8f2acd0a2b
Import translations. DO NOT MERGE
...
Change-Id: Idcb453e08823c584fb0f748ebe46ed036046c9d4
2012-06-22 12:53:57 -07:00
Dianne Hackborn
357d99c61d
DO NOT MERGE Fix issue #6697105 : App launching sometimes has random pauses
...
In the course of the window manager refactoring into a separate
layout state, we introduced a bad interaction between the two
sides of the world. This resulting in multiple hops needed between
the two sides after an application has said it is finished drawing
its window, until the window/app transition is actually started.
Especially since these hops require going through the anim side
which is vsynced (so will delay its operation until the next frame),
this could introduce a notable delay until the window is first shown.
Fix this by re-arranging the code to make one straight path from
when a window reports it is shown to us starting the app transition
that is waiting for it. This change also includes various improvements
to debugging code that was done while working on it.
Change-Id: I7883674052da1a58df89cd1d9b8d754843cdd3db
2012-06-22 12:50:50 -07:00
The Android Open Source Project
d1b9d25a22
am 66082790: Reconcile with jb-release
...
* commit '66082790018c39911718f0b30f93267a4295671c':
2012-06-22 12:39:28 -07:00
The Android Open Source Project
6608279001
Reconcile with jb-release
...
Change-Id: Ibbea3fea4ef24b191309ae45a060b4190f1786ca
2012-06-22 12:37:09 -07:00
Scott Main
9be0105fbc
docs: fix several links
...
Change-Id: I89d9fd64dc22c90680bb05415cc966c255165af9
2012-06-22 12:35:08 -07:00
Adam Powell
6081420604
am 92a175ca: am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
...
* commit '92a175ca6fae7b607d81f632b14b2219c64dc791':
Avoid memory leak by only registering callback while attached to window.
2012-06-22 10:48:20 -07:00
alanv
3a67eb3be4
Ensure screen reader URL gets updated during ICS to JB update.
...
Bug: 6702042
Change-Id: I771863c53fa420ba0746fce30cd17eb8b2b9fba1
2012-06-22 10:47:28 -07:00
Adam Powell
92a175ca6f
am 3cd46244: Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
...
* commit '3cd4624448dcaddecc75461ef645da72e7e5c098':
Avoid memory leak by only registering callback while attached to window.
2012-06-22 10:46:15 -07:00
Adam Powell
3cd4624448
Merge "Avoid memory leak by only registering callback while attached to window." into jb-dev
2012-06-22 10:44:27 -07:00
Dianne Hackborn
ca08198f41
am 176a8a8b: am 0b9b053c: Merge "Don\'t crash in window manager if we fail getting .apk resources." into jb-dev
...
* commit '176a8a8b7cba2654f50617b14a841ef977b95b11':
Don't crash in window manager if we fail getting .apk resources.
2012-06-22 10:43:07 -07:00
Dianne Hackborn
176a8a8b7c
am 0b9b053c: Merge "Don\'t crash in window manager if we fail getting .apk resources." into jb-dev
...
* commit '0b9b053ce6fdc48e922b6af37fe747b4ef40324a':
Don't crash in window manager if we fail getting .apk resources.
2012-06-22 10:40:53 -07:00
Dianne Hackborn
0b9b053ce6
Merge "Don't crash in window manager if we fail getting .apk resources." into jb-dev
2012-06-22 10:38:45 -07:00
George Mount
5048cd77dc
Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS"
2012-06-22 10:29:50 -07:00