summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make vCard code a separated static library.Daisuke Miyakawa2010-05-2067-158/+256
| | | | | | | | | | | | | | - Move the library to a separate directory in framewokr/base, and rename its package from android.pim.vcard to com.android.vcard. - Move all tests for the library under the directory. - Confirm all tests for vCard are successful. It would be better for us to have this directory somewhere else (like external/). But I'll submit this here now and move it to the right place as soon as possible. From the view of build mechanism, we can do that immediately. BUG: 2689523 Change-Id: I435e10571b7160bfcc029bed7c37aaac1c6fd69a
* am 2ee95ad6: am 5badcaba: Merge "Fix javadoc of camera focus distances API." ↵Wu-cheng Li2010-05-201-9/+7
|\ | | | | | | into kraken
| * am 5badcaba: Merge "Fix javadoc of camera focus distances API." into krakenWu-cheng Li2010-05-201-9/+7
| |\
| | * Merge "Fix javadoc of camera focus distances API." into krakenWu-cheng Li2010-05-201-9/+7
| | |\
| | | * Fix javadoc of camera focus distances API.Wu-cheng Li2010-05-201-9/+7
| | | | | | | | | | | | | | | | | | | | bug:1955650 Change-Id: I073eb533dd1d5fcebbaa430de9af2bf4335c406e
* | | | am b482577a: am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv ↵Dirk Dougherty2010-05-201-11/+13
|\ \ \ \ | |/ / / | | | | | | | | to carousel.
| * | | am a6638606: am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.Dirk Dougherty2010-05-201-11/+13
| |\ \ \ | | |/ /
| | * | am 41a254cf: am dc737ca9: Doc change: Add new tv to carousel.Dirk Dougherty2010-05-201-11/+13
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken * commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf': Doc change: Add new tv to carousel.
| | | * am dc737ca9: Doc change: Add new tv to carousel.Dirk Dougherty2010-05-201-11/+13
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp * commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6': Doc change: Add new tv to carousel.
| | | | * Doc change: Add new tv to carousel.Dirk Dougherty2010-05-191-11/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibd36247bbab26d8d4a8e8c15a1d852a2f9cb0269
* | | | | Fix sdk build.Dianne Hackborn2010-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4106de6c85d69a68d80414db5dbf5cf48685ce54
* | | | | Prevent crash when changing adapter.Romain Guy2010-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #2697842 Change-Id: I3f94c7907c8881145638b9e9307458f1431d7e57
* | | | | am 5619e3ad: am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube ↵Scott Main2010-05-192-28/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | video to highlights" into froyo
| * | | | am 1442290a: am cf757914: am 55f383a9: Merge "docs: add youtube video to ↵Scott Main2010-05-192-28/+17
| |\ \ \ \ | | |/ / / | | | | | | | | | | highlights" into froyo
| | * | | am cf757914: am 55f383a9: Merge "docs: add youtube video to highlights" into ↵Scott Main2010-05-192-28/+17
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | froyo Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken * commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac': docs: add youtube video to highlights
| | | * | am 55f383a9: Merge "docs: add youtube video to highlights" into froyoScott Main2010-05-192-28/+17
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp * commit '55f383a9b8da99aa48857fea27a35badc515d8bd': docs: add youtube video to highlights
| | | | * Merge "docs: add youtube video to highlights" into froyoScott Main2010-05-192-28/+17
| | | | |\
| | | | | * docs: add youtube video to highlightsScott Main2010-05-192-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib498ab7e18d6e54df35009b4255fce96f11bcb39
* | | | | | am 67d8dce3: am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add ↵Scott Main2010-05-191-0/+20
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | developing and testing info to backup guide" into froyo
| * | | | | am fa966de2: am 864c3d1b: am 80259899: Merge "doc: add developing and ↵Scott Main2010-05-191-0/+20
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | testing info to backup guide" into froyo
| | * | | | am 864c3d1b: am 80259899: Merge "doc: add developing and testing info to ↵Scott Main2010-05-191-0/+20
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | backup guide" into froyo Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken * commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926': doc: add developing and testing info to backup guide
| | | * | | am 80259899: Merge "doc: add developing and testing info to backup guide" ↵Scott Main2010-05-191-0/+20
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp * commit '8025989957e5b6ad51e99a69a0e1e753e40cba67': doc: add developing and testing info to backup guide
| | | | * | Merge "doc: add developing and testing info to backup guide" into froyoScott Main2010-05-191-0/+20
| | | | |\ \ | | | | | |/
| | | | | * doc: add developing and testing info to backup guideScott Main2010-05-191-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e9c9f412033ecf517ea566ce70686f42e7c568e
* | | | | | More fragment work.Dianne Hackborn2010-05-196-246/+735
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up FragmentTransaction API, add more animation control, add new Fragment APIs for hiding and showing. Change-Id: Iffe31351024a7a63d164270b8a955a499076600e
* | | | | | am f9a1ebe5: am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move ↵Dirk Dougherty2010-05-196-543/+554
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | framework api change info higher in platform notes documents. Small adjustment to compatibility doc.
| * | | | | am 568f9305: am 1eb4a9d8: am 44108b54: Doc change: Move framework api change ↵Dirk Dougherty2010-05-196-543/+554
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | info higher in platform notes documents. Small adjustment to compatibility doc.
| | * | | | am 1eb4a9d8: am 44108b54: Doc change: Move framework api change info higher ↵Dirk Dougherty2010-05-196-543/+554
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in platform notes documents. Small adjustment to compatibility doc. Merge commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07' into kraken * commit '1eb4a9d8e97252427b785525f17b370b1ea5fe07': Doc change: Move framework api change info higher in platform notes documents.
| | | * | | am 44108b54: Doc change: Move framework api change info higher in platform ↵Dirk Dougherty2010-05-196-543/+554
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes documents. Small adjustment to compatibility doc. Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp * commit '44108b54543c87e2c46a6d5d4339b3c4e06373de': Doc change: Move framework api change info higher in platform notes documents.
| | | | * | Doc change: Move framework api change info higher in platform notes documents.Dirk Dougherty2010-05-196-543/+554
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Small adjustment to compatibility doc. Change-Id: I2af896292b00323d7f4eb2c828c8dea36b9e94ad
* | | | | Merge "Begin naming cleanup for renderscript runtime. Prefix functions with ↵Jason Sams2010-05-1921-1083/+997
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | "rs" or "rsg"."
| * | | | | Begin naming cleanup for renderscript runtime.Jason Sams2010-05-1921-1083/+997
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix functions with "rs" or "rsg". Change-Id: I4435b486831bfab1ea473ccfad435b404e68f1c9
* | | | | | am 868dbc89: am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform ↵Scott Main2010-05-198-0/+309
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | highlights
| * | | | | am 8db443d3: am fa6ee245: am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am fa6ee245: am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa6ee245c7010101d87194b00f34ea3448053f28' into kraken * commit 'fa6ee245c7010101d87194b00f34ea3448053f28': docs: add 2.2 platform highlights
| | | * | | am 68728cb3: docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '68728cb3b44aba16abc298a37f6110ed00a781dd' into froyo-plus-aosp * commit '68728cb3b44aba16abc298a37f6110ed00a781dd': docs: add 2.2 platform highlights
| | | | * | docs: add 2.2 platform highlightsScott Main2010-05-198-0/+309
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43bcdad9dbea11bfcc30eadac1ef91a2e5982df8
* | | | | | am 225eb7b5: am 66c46a6b: added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 66c46a6b: added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
| |\ \ \ \ | | |/ / /
| | * | | added RWLock C++ wrapperMathias Agopian2010-05-191-0/+90
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia736bf7f6e2c49915a9ab5669551cf89dafa7961
* | | | | Merge "Added benchmark mode. Added some image processing operations."Alex Sakhartchouk2010-05-197-75/+840
|\ \ \ \ \
| * | | | | Added benchmark mode.Alex Sakhartchouk2010-05-197-75/+840
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some image processing operations. Change-Id: Ic7ba45fbf57eff6fc7d20377c148d0ba7ac862f7
* | | | | | Merge "DatabaseCorruptionHandler causes NPE"Vasu Nori2010-05-192-4/+105
|\ \ \ \ \ \
| * | | | | | DatabaseCorruptionHandler causes NPEVasu Nori2010-05-192-4/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is trying to get attachedDb list (by executing a pragma) after closing the database. also added unittests. Change-Id: I7dce665ec7354402cdef6fbe055455f5798e123c
* | | | | | | am 84b6cd92: am 4414b9ad: Merge "Initial software encoder checkins" into krakenJames Dong2010-05-19217-42/+44262
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 4414b9ad: Merge "Initial software encoder checkins" into krakenJames Dong2010-05-19217-42/+44262
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Initial software encoder checkins" into krakenJames Dong2010-05-19217-42/+44262
| | |\ \ \ \ \
| | | * | | | | Initial software encoder checkinsJames Dong2010-05-19217-42/+44262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
* | | | | | | | am 199d3783: am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and ↵Wink Saville2010-05-192-153/+165
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | getCurrentMessage." into kraken
| * | | | | | am 7e3b31d7: Merge "Update docs, add HANDLED, NOT_HANDLED and ↵Wink Saville2010-05-192-153/+165
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | getCurrentMessage." into kraken