25829 Commits

Author SHA1 Message Date
Dianne Hackborn
5ef59976b1 am f59467b3: am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev
* commit 'f59467b3d6c5df8bf90de799e212275e5c26de86':
  Fix issue #6634325: View.setKeepScreenOn and...
2012-06-12 13:01:12 -07:00
Jeff Brown
d3f97dc0fb am 14afbba6: am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev
* commit '14afbba66355fab168bed25c9bab33058372584a':
  Improve ANR diagnostics.
2012-06-12 13:01:06 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
2012-06-12 13:00:47 -07:00
Jeff Brown
2dc7232140 am 62007aba: am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev
* commit '62007aba1998055cf6ab3e610ed97dbe06341056':
  Detect bad behavior earlier in Choreographer.
2012-06-12 13:00:40 -07:00
Victoria Lease
49ccb116e9 am 1b15102f: am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev
* commit '1b15102fc040f59c72c6453dee15b791f54c9f06':
  Revert "Fix fake bold for fallback fonts in frameworks."
2012-06-12 13:00:37 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
2012-06-12 13:00:33 -07:00
Romain Guy
bc62684f02 am 265888fe: am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev
* commit '265888fe6a57d5b77279c97b68cfa25865267e6b':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
2012-06-12 13:00:28 -07:00
Svetoslav Ganov
23ef5fcff4 am 5d15f40a: am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev
* commit '5d15f40a19be01fa9c5a9674b31b6b18774cbeac':
  NPE when iterating by character and word in Launcher widgets.
2012-06-12 13:00:25 -07:00
Dianne Hackborn
b1add0b8f2 am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery
2012-06-12 13:00:15 -07:00
Chia-chi Yeh
7c727e50f1 am a2becffc: am d667aebf: Merge "VPN: move VpnDialogs away from system uid." into jb-dev
* commit 'a2becffcf2a19889b90256a8479e276081ce6108':
  VPN: move VpnDialogs away from system uid.
2012-06-12 12:59:59 -07:00
Amith Yamasani
82f47c95b6 Merge "Disable lockscreen using a system property." 2012-06-12 12:57:18 -07:00
Dianne Hackborn
f59467b3d6 am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev
* commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5':
  Fix issue #6634325: View.setKeepScreenOn and...
2012-06-12 12:45:24 -07:00
Jeff Brown
14afbba663 am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev
* commit 'ea6b8188320202da072285b08fe6c0ee5c3f71e5':
  Improve ANR diagnostics.
2012-06-12 12:43:52 -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
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
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
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
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
681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp
* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.
2012-06-12 12:41:11 -07:00
Amith Yamasani
d1645f8d0f Disable lockscreen using a system property.
For factory testing.

Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
2012-06-12 11:53:26 -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
Dianne Hackborn
aabd9c230f Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 2012-06-12 10:40:11 -07:00
George Mount
7c79dd674a Merge "Move handle into view after using it for scrolling." 2012-06-12 08:32:48 -07:00
George Mount
ab70020137 Merge "Fix caret handle offset" 2012-06-12 08:32:35 -07:00
Dianne Hackborn
9d0908919a Fix issue #6634325: View.setKeepScreenOn and...
...MediaPlayer.setScreenOnWhilePlaying seem broken

We need to correctly clear the keep screen on flag when the view
hierarchy request is gone...  and to do that, we need to keep the
actual state of the flag requested by the app.  Also when the app
changes its state, we need to compute the proper value based on
both the app request and any requests in the view hierarchy.

Bug: 6634325
Change-Id: I060e9a34a10faffbaa77c06098cf21298bb4969f
2012-06-11 18:35:41 -07:00
Jeff Brown
265f1ccc51 Improve ANR diagnostics.
When an ANR occurs, log the associated reason.

When an event takes too long to process (currently more than 2 seconds)
log basic information about the event including how long it actually
took.

Dump the contents of the inbound, outbound and wait queues as part
of dumpsys input.

Bug: 6574842
Change-Id: I9ab754c320f609cb86fe266c469a61e7032dfed6
2012-06-11 18:05:31 -07:00
Dianne Hackborn
fdfe58126d am acfb11b7: am 2e479fef: am bb536096: Merge "Improved documentation (clarify on issue 8727)"
* commit 'acfb11b7c49cd0c3e653700f414c014fccc5aec3':
  Improved documentation (clarify on issue 8727)
2012-06-11 16:41:19 -07:00
Dianne Hackborn
23a947664f am 82b131f2: am f6e39b06: am a03696dc: Merge "ApplicationThread: Check interface before invoking scheduleLowMemory"
* commit '82b131f27418ecdd60d52638a72d01d4ad2b109f':
  ApplicationThread: Check interface before invoking scheduleLowMemory
2012-06-11 16:41:13 -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
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
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
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
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
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
Dianne Hackborn
a03696dc6b Merge "ApplicationThread: Check interface before invoking scheduleLowMemory" 2012-06-11 15:58:22 -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
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
Victoria Lease
aa0980afab Revert "Fix fake bold for fallback fonts in frameworks."
This reverts commit b26fa0ce68d3311b2fdffb930b27d897e481dd5a
2012-06-11 14:46:04 -07:00
Romain Guy
6b5caee490 Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 2012-06-11 14:15:40 -07:00
Svetoslav Ganov
f372e331e4 Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 2012-06-11 14:06:29 -07:00
Romain Guy
527ee91b60 Prevent crash in WebView when disabling the hw renderer
Bug #6596807

A crash would occur in the following situation:
- WebView registers a functor with the hardware renderer
- The hardware renderer gets disabled
- WebView attemps to unregister its functor

Unregistering the functor fails because the hardware renderer is now disabled.
When the renderer becomes enabled again, the functor is invoked, which leads
to a native crash.

This change simply allows functors to always be unregistered, even when the
renderer is disabled. A disabled renderer only means that it will not be used
for rendering; as such, unregistering a functor is a valid operation and
should be allowed.

Change-Id: I0ff897a0cca7e048c609033215cd0f7f5c940bcc
2012-06-11 13:24:30 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
2012-06-11 13:17:44 -07:00
Dianne Hackborn
0f6471ace7 Merge "Fix issue #6641368: can't launch gallery" into jb-dev 2012-06-11 13:09:22 -07:00
Fabrice Di Meglio
97eb02f16f Merge "Make GridView widget aware of layout direction" 2012-06-11 13:07:30 -07:00