Dima Zavin
d975403a2d
PowerManagerService: only turn off screen when we really mean to
...
Change-Id: I8aa574b38a4d901fce91b6d7771207949f9c8044
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-05 13:13:33 -08:00
Fabrice Di Meglio
ff3aca3a4d
Fix bug #5815381 [DA] [Android Gallery] [Cut string in "no-response" box]
...
- fix layout for the Holo AlertDialog
Change-Id: I453b497f93bc07f6298c73ccb460be629e26c8c7
2012-03-05 12:49:35 -08:00
Daniel Sandler
079b33d215
New slide-out mechanism.
...
Instead of sliding the panel in from off-screen, the panel
is now stretched open (cropping the scrolling contents).
This is slower, so the layout has been dramatically
simplified to help performance.
Change-Id: I8343449c2b3fa4b4ee161f1de992d2242635d15e
2012-03-05 15:33:32 -05:00
Glenn Kasten
c8a0a15994
Merge "threadLoop merge"
2012-03-05 12:18:14 -08:00
Mathias Agopian
303a067373
Merge "BufferQueue: fixed acquire operation"
2012-03-05 12:09:45 -08:00
Scott Main
d55191d086
am 668f8125: am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '668f8125bb7e72780ee204278e4d0da189b8a4b3':
2012-03-05 11:58:52 -08:00
Scott Main
668f8125bb
am a7368087: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit 'a7368087d6f1f2682174139d9cacab48dc7bc198':
2012-03-05 11:56:48 -08:00
Scott Main
5e63175da7
am 6c4faf74: am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6c4faf74ae45ebd705620144150acfb677844523':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:56:43 -08:00
Scott Main
6c4faf74ae
am 6d2a18b5: am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6d2a18b51ee7f7f3aad0b7b76ab55a90900f9403':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:54:36 -08:00
Scott Main
a7368087d6
am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:59 -08:00
Scott Main
6d2a18b51e
am 6f63d6fc: Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
...
* commit '6f63d6fc044f259b7c796e7b7e8c5c8e4a3a3aed':
docs: updates to OBB guide for naming; plus other edits
2012-03-05 11:52:41 -08:00
Scott Main
6f63d6fc04
Merge "docs: updates to OBB guide for naming; plus other edits" into ics-mr1
2012-03-05 11:51:03 -08:00
Scott Main
837a5d83f5
docs: updates to OBB guide for naming; plus other edits
...
Change-Id: I0a3afa0388f89d7464471917fec7d767748a870e
2012-03-05 11:49:12 -08:00
Dianne Hackborn
c3b91e9afd
Merge "More work on rotation animation."
2012-03-05 11:45:19 -08:00
Dianne Hackborn
9fd74805c8
More work on rotation animation.
...
The black frame is now a separate animation element. This allows us
to have it move through the aspect ratio change, without the old
and new screen elements doing weird aspect ratio scalings. This
makes the animation generally look different (more like a reveal),
not sure if it is better or worse, but definitely has less artifacts
in things like the gallery.
Also tweaked the animation definitions a bit.
Change-Id: I94c274ba04bbc7a675946dc6c1778e19386e4a66
2012-03-05 11:44:10 -08:00
Daniel Sandler
c6d29fc0f5
Newly reimplemented PhoneStatusBar, now with fewer windows.
...
Change-Id: I4eaf69a1d46f9180d6911a6559ff24d173ccb35b
2012-03-05 14:40:17 -05:00
John Reck
5a2b607700
Merge "Delete more navcache stuff"
2012-03-05 11:33:44 -08:00
Glenn Kasten
67cb3126e8
threadLoop merge
...
Change-Id: Id8e6330ac6be76f9c2debba94f856de87e2d98f7
2012-03-05 11:01:10 -08:00
Jeff Sharkey
09c8f48c10
Merge "Report leaked Context registrations to StrictMode."
2012-03-05 10:49:11 -08:00
Jeff Brown
08cbdad565
Don't log SQLITE_SCHEMA errors.
...
These errors are usually transient. SQLite automatically retries
queries up to 5 times before actually reporting an error to the
application. We expect SQLITE_SCHEMA errors to occur occasionally
due to the prepared statement cache, and it is ok.
If SQLite fails to automatically resolve a schema error, then
a SQLiteException will be thrown as usual.
Bug: 6114391
Change-Id: I0cdafa1a1db5c567b95bec0c41310802fe75a8c7
2012-03-05 10:30:06 -08:00
John Reck
b2676f76b6
Delete more navcache stuff
...
Change-Id: Ic32559948b90abb3e8e755c5eb533dd9e83b3190
2012-03-05 10:12:15 -08:00
Scott Main
681abe6e60
am 79003f35: am bde31762: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '79003f35945fbbb0c55c23e8fd33085c4f129423':
2012-03-05 10:12:15 -08:00
Scott Main
b8b36b8b78
am dc022a6f: am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit 'dc022a6f9aa30d9282c4f82c1cc4d1c8bde7e808':
docs: fix misc bugs from external tracker
2012-03-05 10:09:44 -08:00
Scott Main
79003f3594
am bde31762: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit 'bde31762f989acbfde92e8f47ceea780cacc4e7a':
2012-03-05 10:08:54 -08:00
Scott Main
dc022a6f9a
am 08e91352: am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '08e91352169457ac86a2465e4db867971ce14b10':
docs: fix misc bugs from external tracker
2012-03-05 10:07:47 -08:00
Scott Main
bde31762f9
am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
2012-03-05 10:06:04 -08:00
Scott Main
08e9135216
am 93dc642e: docs: fix misc bugs from external tracker
...
* commit '93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
2012-03-05 10:06:00 -08:00
Michael Kolb
02b693ecd4
Merge "fix race condition in WebViewClassic.destroy()"
2012-03-05 09:16:35 -08:00
Alex Sakhartchouk
c730aceb64
Merge "Add multisampling support to renderscript."
2012-03-05 08:30:31 -08:00
Alex Sakhartchouk
e7de7258ed
Merge "Using surface texture as a default renderscript surface."
2012-03-05 08:29:57 -08:00
Jeff Sharkey
eb00769e89
Merge "Allow disk I/O while performing dump()."
2012-03-02 18:07:35 -08:00
Jean-Michel Trivi
4ed260feda
Add channel mask in AudioSink
...
Add support for specifying a channel mask when opening an AudioSink.
This parameter does not replace the channel count parameter in order
to not have to duplicate the logic to derive a mask from the
channel count everywhere an AudioSink is used without a known mask.
A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will
be automatically derived from the number of channels.
Update existing AudioSink implementations to use the channel mask,
and users of AudioSink to specify the mask if available, and
CHANNEL_MASK_USE_CHANNEL_ORDER otherwise.
Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
2012-03-02 17:26:49 -08:00
James Dong
1359adbc1d
Merge "Fix some JNI issues in the drm framework"
2012-03-02 17:12:24 -08:00
Mike Lockwood
6d49e0a8b0
Merge "Fix incorrect javadoc"
2012-03-02 17:02:18 -08:00
Scott Main
93dc642eaf
docs: fix misc bugs from external tracker
...
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
2012-03-02 16:55:41 -08:00
James Dong
f16a2724e0
Fix some JNI issues in the drm framework
...
o allocated array using new must be deleted using delete[]
o removed duplicated code
Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
2012-03-02 16:54:19 -08:00
The Android Open Source Project
1c32c8a170
am c071d874: am 37d6d98f: Reconcile with ics-mr1-release
...
* commit 'c071d874386564832ba0b4a87242fb786f96764c':
2012-03-02 16:51:22 -08:00
Scott Main
14db0a2ef9
am 80bc2bf7: am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
...
* commit '80bc2bf70571aee54eb3265f41260190fe904b6e':
2012-03-02 16:48:36 -08:00
The Android Open Source Project
c071d87438
am 37d6d98f: Reconcile with ics-mr1-release
...
* commit '37d6d98fe3ea739627e03b78196faba55b427503':
2012-03-02 16:48:24 -08:00
Scott Main
08e1ce82af
am a9fae13e: am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app li
...
* commit 'a9fae13e81fe8211b95bd55a42f3a9b612adfe48':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:45:44 -08:00
Scott Main
80bc2bf705
am cc902c78: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit 'cc902c78e41549749ad98d96530bef25a3aeae47':
2012-03-02 16:44:21 -08:00
The Android Open Source Project
37d6d98fe3
Reconcile with ics-mr1-release
...
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
2012-03-02 16:43:42 -08:00
Scott Main
a9fae13e81
am 9ad705ce: am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit '9ad705ce0b8271931f9a09d181069c7466afade4':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:42:36 -08:00
Scott Main
cc902c78e4
am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:40:21 -08:00
Scott Main
9ad705ce0b
am 4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
...
* commit '4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
2012-03-02 16:40:00 -08:00
The Android Open Source Project
b1ae294d25
am 55208109: am 3e72c93b: Reconcile with ics-mr1-release
...
* commit '552081091de745d5fc1114314fd0cccecfc3f38c':
2012-03-02 16:39:54 -08:00
Casey Ho
c3898820f6
Fix incorrect javadoc
...
Change-Id: I7f2cd95ced0f525b2c0ee20b64acbb35893664ed
2012-03-02 16:36:32 -08:00
The Android Open Source Project
552081091d
am 3e72c93b: Reconcile with ics-mr1-release
...
* commit '3e72c93b1652ec021fa0965e432b508b847b2b74':
2012-03-02 16:35:27 -08:00
Irfan Sheriff
db9e6937f1
Merge "Enhance WPS"
2012-03-02 16:33:01 -08:00
The Android Open Source Project
3e72c93b16
Reconcile with ics-mr1-release
...
Change-Id: Ia054839cf72145c96864f64012bf980e146b1b1a
2012-03-02 16:32:56 -08:00