summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-18Merge branch 'linaro_android_4.0.1_origen' of ↵linaro_android_4.0.3_origenBernhard Rosenkraenzer
git://android.git.linaro.org/platform/frameworks/base into linaro_android_4.0.3_origen Conflicts: media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
2011-12-18Revert "frameworks/base: Disable hardware rendering for now"Zach Pfeffer
This reverts commit 4abc51753c40d39701beae07a658ef0364c0c245.
2011-12-18screenshot: Add include path to where png.h can be foundTony Mansson
Change-Id: I720b2bb2b939f6d2b879974961b3e5613426b453
2011-12-18frameworks/base: Fix aliasing violationsBernhard Rosenkraenzer
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-12-18frameworks/base: Fix aliasing violationsBernhard Rosenkraenzer
This makes it possible to build the code without disabling the strict-aliasing optimization in gcc. Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-12-18MediaSamplesTest: add test for play various format media filesYongqin Liu
modify Android.mk to make it be built into images when building at eng version. The blueprint is below: https://blueprints.launchpad.net/lava-android-test/+spec/lava-android-test-run-mmtest-in-lava Change-Id: Ia9b18eff04ee730c33cca85761f8d71d8b9e66c1 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2011-12-18aapt: update interfaces to libpng 1.5.7 beta 01Chao Yang
Libpng 1.5.7 beta 01 is integrated, where some interfaces are changed and some structures are not visible to libpng clients any more. The structure information can be retrieved through specific interfaces. The call to png_set_filler() is removed as it can corrupt some png files. This function was used for libpng 1.2.4, but actually it did nothing in aapt. Remove a building warning in ZipFile.h. Change-Id: I92ca6a2c0d734f9a5187d5a7f6727b8be0e77133
2011-12-18frameworks/base: Disable hardware rendering for nowBernhard Rosenkraenzer
Disable hardware rendering for now - let's get a build with software rendering using purely free stuff going first... Author: Vishal Bhoj <Vishal.Bhoj@linaro.org> Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkraenzer@linaro.org>
2011-12-18frameworks/base: Assorted build fixesBernhard Rosenkraenzer
Assorted build fixes for gcc 4.6 and -DNDEBUG Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2011-12-15SurfaceMediaSource: use the HW_TEXTURE usage bitandroid-4.0.3_r1Jamie Gennis
This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
2011-12-15merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-15SurfaceMediaSource: use the HW_TEXTURE usage bitJamie Gennis
This change makes SurfaceMediaSource request Gralloc buffers with the HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a temporary workaround for what is likely a Gralloc bug. Bug: 5771063 Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
2011-12-14merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-14Merge "Fix some java docs." into ics-mr1Dianne Hackborn
2011-12-14Merge "Doc change: add MR1 API summary and updated highlights." into ics-mr1Dirk Dougherty
2011-12-14Fix some java docs.Dianne Hackborn
Change-Id: I0eeba6f9108db74418063fba522ed3ef1c27ae95
2011-12-14Doc change: add MR1 API summary and updated highlights.Dirk Dougherty
Change-Id: I9a9b13b9c7b8ae3011772a62735c788762b45f7f
2011-12-14Revert the following patches because they may lead to power regression ↵James Dong
because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
2011-12-14am 56a3e326: Merge "docs: add Android U class for "Improving Performance of ↵Scott Main
Layouts"" into ics-mr0 * commit '56a3e326192c7496b67666b29071dc9f38c59da9': docs: add Android U class for "Improving Performance of Layouts"
2011-12-14am 4dc763c7: Merge "doc change: Android U lessons for audio and battery" ↵Scott Main
into ics-mr0 * commit '4dc763c700f79e33030e96eefabf8e5047cb9cb1': doc change: Android U lessons for audio and battery
2011-12-14Merge "docs: add Android U class for "Improving Performance of Layouts"" ↵android-sdk-adt_r16.0.1Scott Main
into ics-mr0
2011-12-14Merge "doc change: Android U lessons for audio and battery" into ics-mr0Scott Main
2011-12-14am 70645e36: Docs: Add class for Sharing ContentScott Main
* commit '70645e363e8601550468b726251f4f52f383b9fc': Docs: Add class for Sharing Content
2011-12-14Docs: Add class for Sharing ContentScott Main
Change-Id: I078a02d952e652c16f84e1b3f7613f3dc9364c97
2011-12-14Revert the following patches because they may lead to power regression ↵James Dong
because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
2011-12-14doc change: Android U lessons for audio and batteryScott Main
Change-Id: I98d83f8458e3ad62be28d09b85fe099916d1b73d
2011-12-13Merge "Doc change: API diff report for 15." into ics-mr1android-sdk-4.0.3_r1Dirk Dougherty
2011-12-13merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-13Merge "Fix issue #5756204: Crespo IME briefly appears shortened when..." ↵Dianne Hackborn
into ics-mr1
2011-12-13Merge "Do not spell check the foreground ExtractEditText." into ics-mr1Gilles Debunne
2011-12-13Fix issue #5756204: Crespo IME briefly appears shortened when...Dianne Hackborn
...rotating to landscape When doing spell checking in the same process as the spell checker, we need to make sure it is still done asynchronously. Putting this in I noticed quite a few threading issues in this code, so I also addressed those (which became very obviously a problem with the async stuff here now). Also tweaked the service side to run spell checking at background priority. Change-Id: I01bafe3bec6bceeca911d6bf2f61a486a2fd4c48
2011-12-13Do not spell check the foreground ExtractEditText.Gilles Debunne
Bug 5755099 In extracted text mode, we spell check the background and the foreground edit text. All changes in the background are already propagated to the foreground, and updates on the foreground may trigger a spell check of the entire text since we use setText. Change-Id: Ie44c3d9113258082ac6df5890851d0e21c702ea2
2011-12-13Merge "Fix issue #5755172: Soft menu key disappears when menu is open" into ↵Dianne Hackborn
ics-mr1
2011-12-13Merge "NPE in GMail / TextLine" into ics-mr1Gilles Debunne
2011-12-13am fc279e51: Merge "Created Android University lesson for Multiple APKs." ↵Scott Main
into ics-mr0 * commit 'fc279e51c0bca8086b87bd49e95367c400cb61b4': Created Android University lesson for Multiple APKs.
2011-12-13am 801fda54: AndroidU lesson on designing for multiple screens.Scott Main
* commit '801fda548c719a8618e7f4cd64cad8404b0970b9': AndroidU lesson on designing for multiple screens.
2011-12-13NPE in GMail / TextLineGilles Debunne
Bug 5753061 https://android-git.corp.google.com/g/#/c/154756/1 revealed an other bug in SpanSet. The fitered (non empty) spans were added in their original position instead of being indexed by count. The nullation on recycle hence left null holes in the array. Change-Id: If5c1435cee9a2cb88a608aa8e5f4f2f23382154c
2011-12-13Merge "Created Android University lesson for Multiple APKs." into ics-mr0Scott Main
2011-12-13Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" ↵Andreas Huber
into ics-mr1
2011-12-13Fix issue #5755172: Soft menu key disappears when menu is openDianne Hackborn
We need to work more like before in determining whether the menu key is needed -- in some cases look back in the window list to determine this if we don't know the value from the current window. This requires adding a new private flag indicating whether the compat menu state is known for a window, which is set by PhoneWindow as part of its existing process of computing the flag for its own windows. Now we can have a new API on WindowState to determine the value of this flag for a window, which if needed walks back in the window list to find a window the value is known for (or stops at what the policy has determined is the top full-screen window, so we stop like we used to at things like the lock screen or the bottom of an application). Change-Id: I829de6d629b5af8bcb422cb85249ee4041c7205e
2011-12-13Revert "frameworks/base: Disable hardware rendering for now"linaro_android_4.0.1_origenZach Pfeffer
This reverts commit 4abc51753c40d39701beae07a658ef0364c0c245.
2011-12-13DO NOT MERGE: Support for parsing of "folded" RTSP header valuesAndreas Huber
and some tweaks to the AMR assembler contributed by Samsung (untested). Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1 related-to-bug: 5669027
2011-12-12merge in ics-mr1-release history after reset to ics-mr1The Android Automerger
2011-12-12Merge "Avoid NPE when missing network stats." into ics-mr1Jeff Sharkey
2011-12-12Avoid NPE when missing network stats.Jeff Sharkey
Bug: 5750339 Change-Id: I4b739dbd076b270a5a2b2e2a1e0f6e445d8c124e
2011-12-12Doc change: API diff report for 15.Dirk Dougherty
Change-Id: Ifbe3cf600d9397dd42d855c4a271d514b008d45b
2011-12-12Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ↵Mike Cleron
ics-mr1
2011-12-12AndroidU lesson on designing for multiple screens.Scott Main
This change adds the text for the AndroidU lesson "Designing for Multiple Screens", which shows how to write applications that adapt properly to screen size, density and orientation for maximum compatibility. Update makefile and resources-data.js for rendering source in HTML Add ZIP file for sample Change-Id: I671bb3063d5bf02681bc547ffe5262a9df22037a
2011-12-12Final API 15.Dianne Hackborn
Change-Id: Ic356a7b4d56237e928e653c68e87b070e923d145
2011-12-12Update VIBRATE_ON to a supported value when upgrading from GB.Amith Yamasani
Bug: 5738552 If value has ringer set to VIBRATE_OFF, we need to update it to the now default, as VIBRATE_OFF is inconsistent with the new UI controls. Make sure notification vibrate setting follows ringer vibrate setting. Change-Id: I6638c8a8729d850e71db10d27a0b50d24dc11f19