Craig Mautner
1c92459a50
am 16a61a51: Merge "Revert "Merge errors."" into jb-dev
...
* commit '16a61a51ffdf0490d3fd201c8679a990723f7d8e':
Revert "Merge errors."
2012-06-12 12:43:29 -07:00
Craig Mautner
d5759f1c2c
am 73220fa0: Merge "Merge errors." into jb-dev
...
* commit '73220fa083f6b2b302434ad081dd062505744ed8':
Merge errors.
2012-06-12 12:43:26 -07:00
Dianne Hackborn
007f2b40f9
am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
...
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
Rework media router to be per-context with global process state.
2012-06-12 12:43:20 -07:00
Michael Jurka
823e202845
am 64dbcd64: Merge "Tweak recents out animation a bit more" into jb-dev
...
* commit '64dbcd64be34f83e51229891da865ca047b4f5f4':
Tweak recents out animation a bit more
2012-06-12 12:43:17 -07:00
Jeff Brown
62007aba19
am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev
...
* commit '519e91ef84aab79d0e18ba72e8a133d2306b821c':
Detect bad behavior earlier in Choreographer.
2012-06-12 12:43:01 -07:00
Victoria Lease
1b15102fc0
am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
...
* commit '72b8fc7e6da2f335880750513401d680417dfd13':
Revert "Fix fake bold for fallback fonts in frameworks."
2012-06-12 12:42:54 -07:00
Adam Powell
bee681a1d5
am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
...
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
Further work on MediaRouter
2012-06-12 12:42:48 -07:00
Mathias Agopian
0b986a7b3d
am 0d8eba64: Merge "Enable HW accelerated window shade for all devices" into jb-dev
...
* commit '0d8eba64b2ee2921915e0f6793ddd2d8f44e2428':
Enable HW accelerated window shade for all devices
2012-06-12 12:42:41 -07:00
Romain Guy
265888fe6a
am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807 " into jb-dev
...
* commit '6b5caee49085c63b0197fd1e5e952f3b76abe33d':
Prevent crash in WebView when disabling the hw renderer Bug #6596807
2012-06-12 12:42:32 -07:00
Svetoslav Ganov
5d15f40a19
am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev
...
* commit 'f372e331e46bb9852520fa76c76f99ad99441893':
NPE when iterating by character and word in Launcher widgets.
2012-06-12 12:42:27 -07:00
Dianne Hackborn
863df9aa30
am 409d563b: Merge "DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB." into jb-dev
...
* commit '409d563b51853fc9dce6b4c02df84f58ec887afd':
DO NOT MERGE: Cherry-pick 2ed524966d3c4bd04ea5f54026ed59558d73cd44 to JB.
2012-06-12 12:42:01 -07:00
Craig Mautner
0721bde26c
am 47adf865: Merge "Fix exposing wallpaper on rotations and other." into jb-dev
...
* commit '47adf865bddf6c81051d457e04785408d2710f60':
Fix exposing wallpaper on rotations and other.
2012-06-12 12:41:50 -07:00
Dianne Hackborn
6892f1ec96
am 0f6471ac: Merge "Fix issue #6641368 : can\'t launch gallery" into jb-dev
...
* commit '0f6471ace77387560988964ed0679f843bba6f1f':
Fix issue #6641368 : can't launch gallery
2012-06-12 12:41:36 -07:00
Eric Fischer
19e046c4d2
am 1b159f66: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '1b159f66eed528f9cda04a316a1958a7ce79ee48':
Import translations. DO NOT MERGE
2012-06-12 12:41:20 -07:00
Chia-chi Yeh
a2becffcf2
am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
...
* commit 'd667aebfb34085960e2b41a2f52d10ae749ec44c':
VPN: move VpnDialogs away from system uid.
2012-06-12 12:41:12 -07:00
Jeff Brown
7d9a18eeb6
Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp
2012-06-12 12:37:42 -07:00
Jeff Brown
f195b80c2b
resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp
...
Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e
2012-06-12 11:10:26 -07:00
Jean-Baptiste Queru
01cb25fdde
resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp
...
Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
2012-06-12 08:13:10 -07:00
Jean-Baptiste Queru
29bea61cac
am f01f6b6d: Merge "Added support for customization of mobile data setting."
...
* commit 'f01f6b6d379c911a2c1e350bc758cea26bfe6d9d':
Added support for customization of mobile data setting.
2012-06-12 08:04:53 -07:00
Jean-Baptiste Queru
f01f6b6d37
Merge "Added support for customization of mobile data setting."
2012-06-12 07:48:53 -07:00
Geremy Condra
6e66823873
am e1b573a3: (-s ours) am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy."
...
* commit 'e1b573a32b3c381dd2d0fd90f3d1cce7d5719ca9':
DO NOT MERGE Add API for file origin policy.
2012-06-11 17:47:16 -07:00
Geremy Condra
e1b573a32b
am b4151b29: (-s ours) Merge "DO NOT MERGE Add API for file origin policy."
...
* commit 'b4151b296fbeb39a367bb9930d605180d683ca11':
DO NOT MERGE Add API for file origin policy.
2012-06-11 17:43:10 -07:00
Craig Mautner
16a61a51ff
Merge "Revert "Merge errors."" into jb-dev
2012-06-11 17:11:47 -07:00
Craig Mautner
73220fa083
Merge "Merge errors." into jb-dev
2012-06-11 17:11:33 -07:00
Geremy Condra
b4151b296f
Merge "DO NOT MERGE Add API for file origin policy."
2012-06-11 16:53:43 -07:00
Dianne Hackborn
3430959c4d
am 569f5bdd: am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
...
* commit '569f5bddd2494bdeae07a6b278f6df6cc8579981':
SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:36:52 -07:00
Dianne Hackborn
acfb11b7c4
am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
...
* commit '2e479fefbfcb388d2aa62978307420357f322441':
Improved documentation (clarify on issue 8727)
2012-06-11 16:36:49 -07:00
Wink Saville
e0f8b91e04
am 4853f944: am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
...
* commit '4853f944ac4befba42219f6db8ed02b44a3e0d2b':
Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:36:46 -07:00
Dianne Hackborn
82b131f274
am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
...
* commit 'f6e39b068d1d5491dc3d73d73f598790688a1c4e':
ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:36:42 -07:00
Wink Saville
f75e3e01f6
am c07055c4: am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
...
* commit 'c07055c4a6e92a6c82e193c5b87b35d97418a73b':
Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:36:39 -07:00
Dianne Hackborn
569f5bddd2
am 37d8ac1b: Merge "SystemServer: Looper\'s getMainLooper to return ServerThread"
...
* commit '37d8ac1b5629e3159c662a0d77503cfe85660d86':
SystemServer: Looper's getMainLooper to return ServerThread
2012-06-11 16:32:29 -07:00
Dianne Hackborn
2e479fefbf
am bb536096: Merge "Improved documentation (clarify on issue 8727)"
...
* commit 'bb5360966668ca8e97c02363b0d87dc9c9ae2451':
Improved documentation (clarify on issue 8727)
2012-06-11 16:32:26 -07:00
Wink Saville
4853f944ac
am 3fe79dfd: Merge "Adds utility method to convert 0.25 secs to decimal degrees"
...
* commit '3fe79dfdf4ca63535ec9e586ebed553a862061ea':
Adds utility method to convert 0.25 secs to decimal degrees
2012-06-11 16:32:23 -07:00
Dianne Hackborn
f6e39b068d
am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
...
* commit 'a03696dc6b8128bd44dc700b62ef9b5fd3ac4534':
ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:32:20 -07:00
Wink Saville
c07055c4a6
am bc69f97c: Merge "Adds documentation to CdmaCellLocation get lat/long methods"
...
* commit 'bc69f97c663ec37aabf8ac4192752ecba0e00200':
Adds documentation to CdmaCellLocation get lat/long methods
2012-06-11 16:32:17 -07:00
Dianne Hackborn
f9d80b6b94
Merge "Rework media router to be per-context with global process state." into jb-dev
2012-06-11 16:31:55 -07:00
Craig Mautner
c38869abe5
Revert "Merge errors."
...
This reverts commit b0419a52008e57475ee254def1da20451da22d4c.
2012-06-11 16:30:48 -07:00
Craig Mautner
a5bbb8987b
Merge errors.
...
Change-Id: I33d0b1aa5dc5018cc879d2e9878e4825adaa4074
2012-06-11 16:30:48 -07:00
Michael Jurka
64dbcd64be
Merge "Tweak recents out animation a bit more" into jb-dev
2012-06-11 16:17:35 -07:00
Dianne Hackborn
37d8ac1b56
Merge "SystemServer: Looper's getMainLooper to return ServerThread"
2012-06-11 16:02:34 -07:00
Dianne Hackborn
bb53609666
Merge "Improved documentation (clarify on issue 8727)"
2012-06-11 16:01:38 -07:00
Jeff Brown
519e91ef84
Merge "Detect bad behavior earlier in Choreographer." into jb-dev
2012-06-11 15:59:48 -07:00
Wink Saville
3fe79dfdf4
Merge "Adds utility method to convert 0.25 secs to decimal degrees"
2012-06-11 15:58:26 -07:00
Dianne Hackborn
a03696dc6b
Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
2012-06-11 15:58:22 -07:00
Wink Saville
bc69f97c66
Merge "Adds documentation to CdmaCellLocation get lat/long methods"
2012-06-11 15:57:03 -07:00
Dianne Hackborn
b58b8f832d
Rework media router to be per-context with global process state.
...
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
2012-06-11 15:41:08 -07:00
Jeff Brown
4fdf9c6e2a
Detect bad behavior earlier in Choreographer.
...
Detect wonky vsync timestamps (should they occur) and
warn loudly about them.
Warn when too many frames are skipped. The threshold is pretty
conservative right now (only warn if at least 30 frames are skipped)
but it can be adjusted using system property. Even skipping just a
couple of frames is enough to generate noticeable jank.
The threshold is currently intended to help track down bigger problems
such when an app does too much work on the UI thread.
Bug: 6574842
Change-Id: I4aac7e5e17d1fb51adb0510e318a72a28b3775ed
2012-06-11 15:25:48 -07:00
Michael Jurka
c016aaaa42
Tweak recents out animation a bit more
...
Bug: 6490204
-Fading to black in the recents layer
-Tweaking duration and interpolators
-Removing some unnecessary debug exceptions (Bug: 6642072)
Change-Id: Iba18fade7f874078111fc1d79a81830ee07617d4
2012-06-11 15:23:20 -07:00
Victoria Lease
72b8fc7e6d
Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
2012-06-11 15:21:39 -07:00
Adam Powell
fbce66cb25
Merge "Further work on MediaRouter" into jb-dev
2012-06-11 15:00:57 -07:00