Chet Haase
ca43c96127
am 44b2fe3f: Track canvas clearing for swap buffers logic.
...
* commit '44b2fe3fc114ee5f7273c6b0fee2cc999bf244a2':
Track canvas clearing for swap buffers logic.
2012-06-07 09:45:16 -07:00
The Android Open Source Project
7c5c86d762
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: Ibd5be536b10a8df19d365da267d2ad46b84dc14c
2012-06-07 07:49:05 -07:00
The Android Automerger
8e2eaea676
merge in jb-release history after reset to jb-dev
2012-06-07 07:02:42 -07:00
Chet Haase
44b2fe3fc1
Track canvas clearing for swap buffers logic.
...
A previous fix made it necessary for a frame to render something to GL
in order to cause a call to eglSwapBuffers(). Besides the calls being
tracked as part of issuing a DisplayList, there is also a potential call
to clear the canvas (via glClear()) on non-opaque surfaces. This call is also
good to track, since a surface that gets cleared without any other drawing operations
is worth flipping to the screen (to erase old contents on that surface).
This fix tracks the status of the pre-draw operations to find out whether
glClear() was called and then sets the drawing status appropriately.
Issue #6606422 QuickContact dismissal is janky again (Tracking)
Change-Id: I5fcaccfdc9293dd46b83f2fc279730a5d2740ebf
2012-06-07 06:25:04 -07:00
Christian Robertson
5cb84d2b1d
am 43fa4c52: Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
...
* commit '43fa4c5261a732decae3bbfaea2a00f8bb9b709c':
New mouse pointer arrow with high res versions. Bug: 6579869
2012-06-06 17:58:55 -07:00
Christian Robertson
43fa4c5261
Merge "New mouse pointer arrow with high res versions. Bug: 6579869" into jb-dev
2012-06-06 17:56:36 -07:00
Chris Craik
0df6d579db
am 37e0c368: Merge "Revert "Add temporary functor detach logging"" into jb-dev
...
* commit '37e0c3681ef403e5a43a4f3dbca954ec8a4bfb5d':
Revert "Add temporary functor detach logging"
2012-06-06 17:01:27 -07:00
Chris Craik
37e0c3681e
Merge "Revert "Add temporary functor detach logging"" into jb-dev
2012-06-06 16:59:01 -07:00
Chris Craik
6d99a02464
am 8f1f714f: Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev
...
* commit '8f1f714f831bf8bf10f94211c42e36ef2851810d':
Revert "Add more temporary logging for investigating detachFunctor"
2012-06-06 16:47:57 -07:00
Chris Craik
aa3b7d88ef
Revert "Add temporary functor detach logging"
...
bug:6608646
This reverts commit f98851ab37c07b243c485168cca201b07a22e6c7
2012-06-06 16:45:53 -07:00
Chris Craik
8f1f714f83
Merge "Revert "Add more temporary logging for investigating detachFunctor"" into jb-dev
2012-06-06 16:45:04 -07:00
Keun young Park
310c067e23
am b0de6224: Merge "add MINIMAL_FONT_FOOTPRINT configuration for PDK" into jb-dev
...
* commit 'b0de6224fcd31ba088bd828819d181629ea9adf9':
add MINIMAL_FONT_FOOTPRINT configuration for PDK
2012-06-06 16:26:51 -07:00
Keun young Park
b0de6224fc
Merge "add MINIMAL_FONT_FOOTPRINT configuration for PDK" into jb-dev
2012-06-06 16:24:25 -07:00
Jean-Michel Trivi
567f0e22a9
Always queue A2DP connection state message with wakelock held
...
Messages for changes to A2DP connection state are intended to be
queued in AudioService after acquiring a wake lock, which is
released after the message has been handled.
This was correctly done for connection messages when the system
is up and running, but wasn't when the BluetoothProfile service
listener gets an onServiceConnected() event, which is the case
the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.
Bug 6616292
Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
2012-06-06 16:13:15 -07:00
Irfan Sheriff
2654105b15
am ca96a322: Merge "Update group capability before connect" into jb-dev
...
* commit 'ca96a322f0485db9f0beed243e10a607c909729f':
Update group capability before connect
2012-06-06 15:51:23 -07:00
Marco Nelissen
f9800a01fe
am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
...
* commit '08b3090848ad211e043a561b6bb774adf3a7bba1':
Ensure we compute display name when needed
2012-06-06 15:47:28 -07:00
Irfan Sheriff
ca96a322f0
Merge "Update group capability before connect" into jb-dev
2012-06-06 15:45:41 -07:00
Marco Nelissen
08b3090848
Merge "Ensure we compute display name when needed" into jb-dev
2012-06-06 15:44:20 -07:00
Craig Mautner
fd62576f06
am a9144ffd: Merge "Disable automatic screen dimming." into jb-dev
...
* commit 'a9144ffd6466a914a9138dabab8bc331fdc70e2f':
Disable automatic screen dimming.
2012-06-06 15:28:37 -07:00
Craig Mautner
a9144ffd64
Merge "Disable automatic screen dimming." into jb-dev
2012-06-06 15:24:36 -07:00
Dianne Hackborn
ecc42f8bdc
am 4ca17df3: Fix build.
...
* commit '4ca17df3802cad87a4d07b804823ad9c11e090ea':
Fix build.
2012-06-06 15:10:33 -07:00
Dianne Hackborn
4ca17df380
Fix build.
...
Change-Id: I42c3f6466d926258bbd303f2082de7207734451a
2012-06-06 15:02:25 -07:00
Irfan Sheriff
57e42f4117
Update group capability before connect
...
We need to get the latest group capability information before connect
now that the supplicant behavior is to do a delayed cleanup.
Bug: 6613470
Change-Id: Ie374d750950f3bd4376fd6a767bb253fd7986eb1
2012-06-06 15:00:31 -07:00
Craig Mautner
a4e96d5a6e
Disable automatic screen dimming.
...
Done by setting the dimming period to Integer.MAX_VALUE. While it
doesn't technically disable dimming it will take 248 days to get to
any target value.
Fixes bug 6616423.
Change-Id: I5b753286b9d93664fbff79021be38adf4d8a007d
2012-06-06 14:49:44 -07:00
Craig Mautner
55ab60cd7f
am 8c4b40ec: Merge "Set screen brightness to match sensor at power on." into jb-dev
...
* commit '8c4b40eceba39a493a1d01ed83decc8b43fbfb5d':
Set screen brightness to match sensor at power on.
2012-06-06 14:42:06 -07:00
Craig Mautner
8c4b40eceb
Merge "Set screen brightness to match sensor at power on." into jb-dev
2012-06-06 14:39:29 -07:00
Keun young Park
087610198e
add MINIMAL_FONT_FOOTPRINT configuration for PDK
...
- all non-latin fonts excluded
- symlink used to create additional fonts
Bug: 6540216
Change-Id: Id0909124dc1d71331bde3c5911c24eee5b1692a2
2012-06-06 14:21:37 -07:00
Dianne Hackborn
18aa041a62
am 6cd19e02: Merge "Fix some divide by zero errors that could crash the system." into jb-dev
...
* commit '6cd19e0266b3f4277f13dab7e9a86ebdd9905ee9':
Fix some divide by zero errors that could crash the system.
2012-06-06 14:17:54 -07:00
Dianne Hackborn
6cd19e0266
Merge "Fix some divide by zero errors that could crash the system." into jb-dev
2012-06-06 14:16:05 -07:00
Craig Mautner
3793368f72
Set screen brightness to match sensor at power on.
...
Use the first sensor value received after screen on to set the screen
brightness. Do this setting immediately rather than animate to the
target brightness.
Fixes bug 6612418.
Change-Id: I6c24c55e0bd35ef58a6494d3b5e449954241fd00
2012-06-06 14:13:39 -07:00
Jake Hamby
f2fb9044c5
am e60a35c1: Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
...
* commit 'e60a35c156ac9a354ad6434da483b43af20ae4a2':
DO NOT MERGE: Remove SMS shortcode warning feature.
2012-06-06 14:04:07 -07:00
Chris Craik
932b7f6765
Revert "Add more temporary logging for investigating detachFunctor"
...
bug:6608646
This reverts commit 8857b2f76abad1e4ec742dfd85d0c997880be376
Change-Id: I1563b5974c52b84201ae448298f804eb0dcc235d
2012-06-06 14:02:55 -07:00
Jake Hamby
e60a35c156
Merge "DO NOT MERGE: Remove SMS shortcode warning feature." into jb-dev
2012-06-06 14:01:24 -07:00
Marco Nelissen
81e85bbf67
Ensure we compute display name when needed
...
Since the media scanner no longer uses an in memory cache, it always
found an entry for files inserted via MTP, which made it follow a
different code path than before, which in turn made the media
provider skip computing the display name column.
By clearing the row id in the media scanner when handling an mtp
request, we steer it back to the correct code path.
b/6297105
b/6525450
Change-Id: I624522b176a0057d246ce3040598af255b00a141
2012-06-06 13:59:24 -07:00
Jake Hamby
004ff5ad2a
DO NOT MERGE: Remove SMS shortcode warning feature.
...
Fix jb-dev build. The SMS shortcode warning feature has some usability
limitations which need to be resolved before shipping. Remove the code
for JellyBean. It will be added back to a future release when the
feature is complete.
Bug: 6605549
Change-Id: Ic8a68dc0b1ad038618962185f5ee680d5281ca21
2012-06-06 13:56:50 -07:00
Eric Fischer
2c7f1325e1
am 5ddf003c: Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
...
* commit '5ddf003cb2957672038bf1db397422402dce930a':
Revert "Import translations. DO NOT MERGE"
2012-06-06 13:54:56 -07:00
Eric Fischer
5ddf003cb2
Merge "Revert "Import translations. DO NOT MERGE"" into jb-dev
2012-06-06 13:53:00 -07:00
Eric Fischer
25dcc321f7
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 6a6f746ece453c43aa92808cd140012866c8eb5c
2012-06-06 13:51:50 -07:00
Michael Jurka
f330b53955
am a2c628fb: Merge "Fix bug 6499508" into jb-dev
...
* commit 'a2c628fb402610ce65371fb06d5adaf7eaf9df9b':
Fix bug 6499508
2012-06-06 13:33:45 -07:00
Dianne Hackborn
82811d45ed
am 533fce25: Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
...
* commit '533fce25a22718c491a86c31866b7751f1f582b7':
Docs (mostly): enumerate JELLY_BEAN target SDK changes.
2012-06-06 13:33:43 -07:00
Jean-Michel Trivi
b8da1c90c4
am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev
...
* commit '88a89b29112a41885c31ddd7195f5d26981d4d11':
Always queue A2DP connection state message with wakelock held
2012-06-06 13:33:41 -07:00
Michael Jurka
a2c628fb40
Merge "Fix bug 6499508" into jb-dev
2012-06-06 13:31:59 -07:00
Dianne Hackborn
533fce25a2
Merge "Docs (mostly): enumerate JELLY_BEAN target SDK changes." into jb-dev
2012-06-06 13:31:59 -07:00
Jean-Michel Trivi
88a89b2911
Merge "Always queue A2DP connection state message with wakelock held" into jb-dev
2012-06-06 13:31:53 -07:00
Daniel Sandler
5926668f2e
am 622976ba: Merge "New background for notification panel header." into jb-dev
...
* commit '622976ba775ed2b2cebe83ec1e60e1db6db89e2a':
New background for notification panel header.
2012-06-06 13:00:01 -07:00
Daniel Sandler
622976ba77
Merge "New background for notification panel header." into jb-dev
2012-06-06 12:58:35 -07:00
Eric Fischer
8e62634acd
am 38987073: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '38987073c1b1a993a727210f981601217d30b899':
Import translations. DO NOT MERGE
2012-06-06 12:40:11 -07:00
Eric Fischer
38987073c1
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-06 12:37:51 -07:00
Eric Fischer
6a6f746ece
Import translations. DO NOT MERGE
...
Change-Id: I5a8719c293a25460058ad5b62069ea80c33da110
2012-06-06 12:02:00 -07:00
Dianne Hackborn
cdadee630e
Fix some divide by zero errors that could crash the system.
...
Change-Id: I66273df84e45de59b5b161f4d13de67a9e0f46d5
2012-06-06 11:48:46 -07:00