summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-222-37/+44
|\
| * Split libmedia into libmedia and libmedia_nativeGlenn Kasten2012-03-212-37/+44
| | | | | | | | | | | | This is still in the old location Change-Id: Ic1be549b5b607cfd519cb4cecc581624510a4ee1
* | Remove superfluous @hide annotations from WebSettingsClassicSteve Block2012-03-221-34/+1
| | | | | | | | | | | | This entire class is now hidden Change-Id: Idb6c49b2e66e515e0979ac73e95dacfef8d18d23
* | Merge "Avoid calling into JNI if not needed."Jeff Brown2012-03-211-5/+15
|\ \
| * | Avoid calling into JNI if not needed.Jeff Brown2012-03-211-5/+15
| | | | | | | | | | | | | | | | | | Short-circuit a few MotionEvent JNI calls in simple cases. Change-Id: I6c97c06b5a5fd203a423dc88f428637b9dec71ae
* | | Fix typo... and buildJean-Baptiste Queru2012-03-211-2/+2
| | | | | | | | | | | | Change-Id: Ifc3c99c1e43423d0419031c7a389738b2232c6bd
* | | Merge "Throw if WAL enabled/disabled when connections are in use."Jeff Brown2012-03-213-13/+95
|\ \ \ | |/ /
| * | Throw if WAL enabled/disabled when connections are in use.Jeff Brown2012-03-213-13/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing WAL mode requires obtaining an exclusive lock on the database and can only be done when there are NO other active database connections. Check that this is really the case, and bail with a useful error message if an application attempts to change WAL mode while transactions are in progress. Expose disableWriteAheadLogging() in the API. Change-Id: I87599de3b88c53dcd75677aefd72e40de216c2c1
* | | Add SeekBar property accessors to match available style attributesAdam Powell2012-03-212-0/+11
| | | | | | | | | | | | | | | | | | Bug 6103624 Change-Id: I7bc863250f3b156cf6663e484baab2c35a949db5
* | | Merge "GridView attribute updates"Adam Powell2012-03-212-1/+105
|\ \ \
| * | | GridView attribute updatesAdam Powell2012-03-212-1/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring GridView's API in sync with its supported style attributes. Bug 6103758 Change-Id: Ib2c4d4d48061d23a7d886364965f0cb50c239e5d
* | | | am 34da2ffe: am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) ↵Joe Fernandez2012-03-210-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Release Notes (fix for build feature info)" into ics-mr1 * commit '34da2ffe246aaf2baa3dd738f045cb9502636f54':
| * \ \ \ am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes ↵Joe Fernandez2012-03-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fix for build feature info)" into ics-mr1 * commit 'f20ebda6efb711d1cda132ae89439e7aed5944f1':
| | * \ \ \ am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build ↵Joe Fernandez2012-03-212-2/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature info)" into ics-mr1 * commit '66f1bafb2326e12814df703a4285373e8651a3ce': docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
* | | \ \ \ \ am 5a8fb372: am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) ↵Joe Fernandez2012-03-212-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release Notes (fix for build feature info)" into ics-mr1 * commit '5a8fb3727f14a7c3a68b6e0f9bbc10704e26d5d1': docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
| * | | | | | am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes ↵Joe Fernandez2012-03-212-2/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fix for build feature info)" into ics-mr1 * commit '9eea888105b3d8d69a28e2dea840808d394f07b9': docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
| | * \ \ \ \ \ am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build ↵Joe Fernandez2012-03-212-2/+5
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature info)" into ics-mr1 * commit '66f1bafb2326e12814df703a4285373e8651a3ce': docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
| | | * | | | | Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature ↵Joe Fernandez2012-03-212-2/+5
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | info)" into ics-mr1
| | | | * | | | | docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)Joe Fernandez2012-03-212-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
* | | | | | | | | Merge "Changing rsg to rs where functions don't rely on graphics."Alex Sakhartchouk2012-03-214-267/+122
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Changing rsg to rs where functions don't rely on graphics.Alex Sakhartchouk2012-03-214-267/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92a93d7a520b4a5416be88c7c05c2f8d3cc89243
* | | | | | | | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-212-0/+63
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Add MetaData::dumpToLogMarco Nelissen2012-03-212-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utility method for dumping the content of a MetaData object to the log. Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
* | | | | | | | | Merge "Fix LayerDrawable#mutate"Adam Powell2012-03-211-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix LayerDrawable#mutateAdam Powell2012-03-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I985b80141ffc96db969eaf36538df938cb093661
* | | | | | | | | | Merge "Fix location of selection handles on rotated text."George Mount2012-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix location of selection handles on rotated text.George Mount2012-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6206177 Change-Id: If4509b75aa2f71f80e44e3820f69e1844534bed2
* | | | | | | | | | | Merge "Breaking up rs headers by logical components."Alex Sakhartchouk2012-03-216-123/+480
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Breaking up rs headers by logical components.Alex Sakhartchouk2012-03-216-123/+480
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2d23eec0277b1136852b8a7acb61aecf6f699a7d
* | | | | | | | | | Restore deleted string still referenced from public.xml.Eric Fischer2012-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I738c1ef185b306f5a25afc6ed4b0f46a14e3c6a7
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie99a723075c6e17d413dc055bc52feb81b1db73f
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-03-2149-62/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-2149-62/+12
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c22ac70a03bfc348fc201415c5a4e432d1add53
* | | | | | | | | | | Merge "Continue animations started from AppWindowToken."Craig Mautner2012-03-212-3/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Continue animations started from AppWindowToken.Craig Mautner2012-03-212-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animations that were started from AppWindowToken.showAllWindowsLocked were not setting mInnerFields.mAnimating and hence the animations were not progressing. This resulted in popups such as menus and time/date settings not showing up. Fixes bug 6205076. Change-Id: I4daae5895e64182328671e282331f14dd5561d5e
* | | | | | | | | | | | Merge "Plug memory leak. Bug #6196903"Romain Guy2012-03-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Plug memory leak.Romain Guy2012-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #6196903 Whenever a memory flush happens, the GL renderer discards some or all of its font caches. Each font cache holds an array of vertex indices that was initially designed to have the same life cycle as the process. This changed when memory flushes were introduced but this array was never taken care of in the destructor. Change-Id: Ief124f609ea55b671c0a9b43637d9e013629ebaa
* | | | | | | | | | | | | Merge "Fix Animation bugs from DisplayList properties integration"Chet Haase2012-03-211-12/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix Animation bugs from DisplayList properties integrationChet Haase2012-03-211-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new DisplayList properties functionality does not currently handle Animation (android.view.animation) functionality, so we fall back to the previous approach of redrawing the DisplayList when an Animation changes alpha/transform data for a View. The DL code was not, however, correctly using that logic, so that the Animation transform information was being ignored, or at least not set correctly on the DisplayList during redraws. This fix accounts for Animation changes and sets up the DisplayList correctly. Change-Id: I9f6e0382b05d0627f4779f30e74641dedcc77f82
* | | | | | | | | | | | | | Merge "Telephony: Remove coupling between phone and IccRecords"Wink Saville2012-03-2115-252/+368
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Telephony: Remove coupling between phone and IccRecordsAlex Yakavenka2012-03-2115-252/+368
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7af0f0f37c59b7554fa329a5b00ff28cb149b4d9
* | | | | | | | | | | | | | | Merge "Override not drawing to screen when screen is off."Craig Mautner2012-03-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | / / / / / / / / | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Override not drawing to screen when screen is off.Craig Mautner2012-03-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new test had been added to performDraw to provide an early return if the screen was off. Drawing should have proceeded however if mReportNextDraw is set. Otherwise views that turn on the screen (such as the alarm) are not shown. Fixes bug 6168158. Change-Id: If9013d9dbd39d60ee1de8aeb3e0c1facbc5a7db5
* | | | | | | | | | | | | | Fix merge errorGeorge Mount2012-03-211-1/+1
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia48e1f064b697fa328e5d582862dbe723f7ffd5d
* | | | | | | | | | | | | Merge "Make paste window and caret handle show up at the right time."George Mount2012-03-212-14/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make paste window and caret handle show up at the right time.George Mount2012-03-202-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6194009 Webkit Change: I7f8bc7266df52a67245b0a971826fd14e0d715c5 Change-Id: I460db436bd79d8ff72b457b5878ffe468400031f
* | | | | | | | | | | | | | Merge "Parse gapless info from mp4 files"Marco Nelissen2012-03-212-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Parse gapless info from mp4 filesMarco Nelissen2012-03-212-0/+49
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
* | | | | | | | | | | | | Merge "Minor refactoring prior to major refactoring."Craig Mautner2012-03-215-157/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-11-17 16:26:25 +0000