summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add comment block matching the type defines added by RS.Jason Sams2010-02-121-2/+26
|
* Merge "Dump original-package entries."Jeff Hamilton2010-02-121-0/+9
|\
| * Dump original-package entries.Jeff Hamilton2010-02-121-0/+9
| | | | | | | | Change-Id: I29b20811847555ff9858ef47cca69c8b992b24ea
* | Merge "Map base station lat-lng of "0","0" to undefined."Nico Sallembien2010-02-123-20/+35
|\ \
| * | Map base station lat-lng of "0","0" to undefined.Mark Vandevoorde2010-02-123-20/+35
| | | | | | | | | | | | | | | | | | Also introduce a public constant for the invalid lat/lng value. Change-Id: Ifaa1e563bfa94c06dfbba51157b9160055442682
* | | Merge "Fix javadoc link for SDK build breakage"Adam Powell2010-02-121-2/+2
|\ \ \
| * | | Fix javadoc link for SDK build breakageAdam Powell2010-02-121-2/+2
| | | |
* | | | am 79b646ff: (-s ours) am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript ↵Jason Sams2010-02-120-0/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Merge commit '79b646ffe51c532f00b69dc4967ee51ca28986cf' * commit '79b646ffe51c532f00b69dc4967ee51ca28986cf': DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
| * | | am 0b9bbb6d: DO NOT MERGE. Merge Froyo renderscript to Eclair to support ↵Jason Sams2010-02-1279-2593/+3113
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Merge commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8' into eclair-plus-aosp * commit '0b9bbb6dc5d7dabecf23e8c6bb4a267ba8c34fe8': DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU.
| | * | | DO NOT MERGE. Merge Froyo renderscript to Eclair to support live wallpapers ↵Jason Sams2010-02-1179-2593/+3113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on droid. This gives the necessary CPU reduction to allow the wallpapers to work on the slower CPU. Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.cpp modified: libs/rs/rsContext.h modified: libs/rs/rsProgram.cpp modified: libs/rs/rsProgram.h Delete the old rollo sample which is obsolete. Fix film init Begin gl2 support. Renderscript still uses GL1.1 by default. However, 2.0 can be enabled and will render most tests correctly. Fix film Beging GL2 user shaders. Switch master to using GL2 by default. Implement RS tracked defered texture and buffer object uploads. Committer: Jason Sams <rjsams@android.com> On branch droid Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: libs/rs/rsAllocation.cpp modified: libs/rs/rsAllocation.h modified: libs/rs/rsContext.h modified: libs/rs/rsProgramFragment.cpp modified: libs/rs/rsSimpleMesh.cpp Remove check for surface valid that is no longer valid. Continue development of es2.0 user shader support for renderscript. This change cleans up ProgramVertex creation and adds support for passing input, output, and constant type info. Continue es2 shader dev Conflicts: graphics/java/android/renderscript/Program.java graphics/java/android/renderscript/ProgramVertex.java Place shader logging behind prop to declutter logs. Fix emulated glColor in es2 mode. Fix live wallpaper many. Z coordinate was being ignored for draw quad call. Add argument checking to sampler builder to disallow illegal modes. Move texture bindings to base program object. Change ProgramFragment creation to require a texture format in 1.0 mode. Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures. This will break some apps, checkings for other projects will follow to unbreak them. Disable excessive RS logging. Add RS support for generic attribs as input to vertex programs. More complete support for named attribs. Adds user typed attribs as available to programVertex. Non user attribs are not treated like user for GL2 for simplicity. Support npot on es 2.0 HW. Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots. Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor. Implement type generation for user uniforms in vertex shader. Remove excessive logging, fix error in GLSL uniform generation. Fix RS mipmap generation for 8 bit alpha textures. Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names. Fix some minor bugs with GL state setup that were exposed by Droids driver. Implement drawSpriteCropped on es2.0
* | | | | Modify ActivityInstrumentationTestCase2 to not require hardcoded package name.Brett Chabot2010-02-123-24/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate old constructor. Bug 2440167
* | | | | Merge "add Base64InputStream"Doug Zongker2010-02-122-53/+332
|\ \ \ \ \
| * | | | | add Base64InputStreamDoug Zongker2010-02-122-53/+332
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I777b54bd6d01c86105b473a6701a06d350cee8d1
* | | | | | Merge "Fix spurious ANRs involving window shuffling and non-fullscreen ↵Chris Tate2010-02-121-12/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | activities"
| * | | | | | Fix spurious ANRs involving window shuffling and non-fullscreen activitiesChristopher Tate2010-02-111-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force the event-target bookkeeping to reset when an app explicitly acknowledges event receipt. Furthermore, notify the event dispatcher whenever a new window is created, even if there is nominally an existing event target window. These changes in tandem address a subtle race bug in which the event dispatcher believes that there is an event recipient that it is still waiting for even when the event in question has been acknowledged; this results in a spurious ANR. There were checks in the existing code that wound up doing the right thing in the case of windows becoming hidden, but the case of non-fullscreen activities floating over them [unavailable for input but still visible] exposed the race condition. Bug: 2432828 Change-Id: I29fb741aace34736b029f9ba43f2c43184366258
* | | | | | | Merge "Fix key debounce (was too aggressive and buggy) and dismiss mini ↵Amith Yamasani2010-02-121-2/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | keyboard on cancel event."
| * | | | | | Fix key debounce (was too aggressive and buggy) and dismiss mini keyboard on ↵Amith Yamasani2010-02-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cancel event. Set a 70ms debounce time - i.e., if you spend less than 70ms on the touch-up key, which was less time than the time spent on the previous key (assuming they weren't the same), then don't emit the last key. Use the previous key that you lingered on for longer.
* | | | | | | Merge "Implement navigator.isApplicationInstalled() API"Andrei Popescu2010-02-123-0/+77
|\ \ \ \ \ \ \
| * | | | | | | Implement navigator.isApplicationInstalled() APIAndrei Popescu2010-02-123-0/+77
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL contains the framework plumbing to pass the package names to WebKit. Fix b: 2371005
* | | | | | | Overscrolling modifications. Overscroll will not allow the user toAdam Powell2010-02-128-38/+390
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scroll content out of view. Scrolling will slow down halfway to the barrier point. API added in View. AbsListView, ScrollView, HorizontalScrollView all use this API. Overscrolling uses haptic feedback. Added scroll barrier pattern to config.xml.
* | | | | | Merge "Fix issue 2418668: AudioManager isWiredHeadsetOn() always returns ↵Eric Laurent2010-02-121-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | false for headset without mic."
| * | | | | | Fix issue 2418668: AudioManager isWiredHeadsetOn() always returns false for ↵Eric Laurent2010-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | headset without mic.
* | | | | | | Merge "add NO_CLOSE flag for use by Base64OutputStream"Doug Zongker2010-02-122-1/+14
|\ \ \ \ \ \ \
| * | | | | | | add NO_CLOSE flag for use by Base64OutputStreamDoug Zongker2010-02-112-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2884e7b3853e4e4b2e329edf47c6f64c2f165a7
* | | | | | | | Merge "Fixing the bug where mic button is not shown"Bjorn Bringert2010-02-121-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixing the bug where mic button is not shownValentin Kravtsov2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ac7bd4c1db85058f863bcfaf5ee30212644b2bd
* | | | | | | | | Merge "Disable distracting status bar ticker text in car mode."Daniel Sandler2010-02-121-0/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Disable distracting status bar ticker text in car mode.Daniel Sandler2010-02-121-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2420702 Change-Id: I17ade6355b60da5e77d17f3556c86a4aaf40d173
* | | | | | | | | Move the animations in the UI threadNicolas Roard2010-02-121-58/+10
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Revert "RenderScript should not depend on libsurfaceflinger_client.so"Jack Palevich2010-02-122-6/+7
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 88b55fb090ace1a835f890758866f42f03795c12.
* | | | | | | Add APIs for mapping between new and current package names.Dianne Hackborn2010-02-116-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow Market and others to find out what the "real" name of a package is, when it is currently running under the old name of a previously installed version.
* | | | | | | Merge "Fix 2438785: Add missing key code to landscape keyboard and fix log ↵Jim Miller2010-02-113-7/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | spew."
| * | | | | | | Fix 2438785: Add missing key code to landscape keyboard and fix log spew.Jim Miller2010-02-113-7/+6
| | | | | | | |
* | | | | | | | Measure walltime in ContentResolver and SQLiteDatabase operations logging.Brad Fitzpatrick2010-02-112-7/+7
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The forgotten parts from Id72f718c / d72f718c9c. Whoops. Tested by watching a device's logcat -b events and observing no huge or negative values. And this time with the right system.img file, even!
* | | | | | | Merge "Hiding the new TextToSpeech Intent extras for voice data check to fix ↵Charles Chen2010-02-111-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | the build."
| * | | | | | | Hiding the new TextToSpeech Intent extras for voice data checkCharles Chen2010-02-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to fix the build.
* | | | | | | | Merge "Measure walltime in ContentResolver and SQLiteDatabase operations ↵Brad Fitzpatrick2010-02-112-19/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | logging."
| * | | | | | | Measure walltime in ContentResolver and SQLiteDatabase operations logging.Brad Fitzpatrick2010-02-112-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, SQLiteDatabase was using Debug.threadCpuTimeNanos(), which doesn't include I/O time (user-perceived latency), and ContentResolver was using System.currentTimeMillis(), which didn't account for deep sleeps. Now both are consistently using SystemClock.uptimeMillis().
* | | | | | | | Fix build.Raphael2010-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ica616f038436e3639d12064327ddd0a9fa49af8b
* | | | | | | | Merge "Adding Intent extra strings to TextToSpeech.Engine for doing voice ↵Charles Chen2010-02-111-0/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | data checks."
| * | | | | | | | Adding Intent extra strings to TextToSpeech.Engine for doingCharles Chen2010-02-111-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | voice data checks.
* | | | | | | | | Merge "Fix in layoutlib due to some changes in the frameworks."Xavier Ducrohet2010-02-112-37/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix in layoutlib due to some changes in the frameworks.Xavier Ducrohet2010-02-112-37/+10
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some methods disappear or became abstract in the base class (breaking @Override) Change-Id: Id4d298ee84ba008ac97ecaaf90b19003ac09f104
* | | | | | | | | Merge "Improve a comment in RecognitionService."Mike LeBeau2010-02-111-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve a comment in RecognitionService.Mike LeBeau2010-02-111-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge "Use the new RecognitionService.SERVICE_INTERFACE instead of ↵Mike LeBeau2010-02-112-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | RecognizerIntent.ACTION_RECOGNIZE_SPEECH when finding a voice recognition service."
| * | | | | | | | Use the new RecognitionService.SERVICE_INTERFACE instead ofMike LeBeau2010-02-112-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecognizerIntent.ACTION_RECOGNIZE_SPEECH when finding a voice recognition service.
* | | | | | | | | Merge "RenderScript should not depend on libsurfaceflinger_client.so"Mathias Agopian2010-02-112-7/+6
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | RenderScript should not depend on libsurfaceflinger_client.soMathias Agopian2010-02-112-7/+6
| | | | | | | | |
* | | | | | | | | Merge "Fix simulator build."Marco Nelissen2010-02-111-1/+1
|\ \ \ \ \ \ \ \ \