summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "docs: update fragment docs with revised APIs, add sample code from Api...Scott Main2011-01-172-379/+546
|\
| * docs: update fragment docs with revised APIs, add sample code from ApiDemos, ...Scott Main2011-01-162-379/+546
* | Merge "Add OBB size to PackageStats" into honeycombKenny Root2011-01-174-0/+74
|\ \
| * | Add OBB size to PackageStatsKenny Root2011-01-174-0/+74
* | | Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycombRomain Guy2011-01-171-2/+5
|\ \ \
| * | | Prevent NPE when no indicator is specified.Romain Guy2011-01-171-2/+5
* | | | Merge "Ensure that no callback is invoked while initializing DatePicker" into...Svetoslav Ganov2011-01-171-0/+2
|\ \ \ \
| * | | | Ensure that no callback is invoked while initializing DatePickerSvetoslav Ganov2011-01-171-0/+2
* | | | | Merge "Add back legacy layout for preference framework for compatibility." in...Amith Yamasani2011-01-1710-50/+320
|\ \ \ \ \
| * | | | | Add back legacy layout for preference framework for compatibility.Amith Yamasani2011-01-1610-50/+320
* | | | | | Merge "Delivering null cursor to loader callbacks." into honeycombJeff Hamilton2011-01-171-1/+1
|\ \ \ \ \ \
| * | | | | | Delivering null cursor to loader callbacks.Dmitri Plotnikov2011-01-171-1/+1
* | | | | | | Merge "Video editor API update - rework for Patch Set 3" into honeycombDharmaray Kundargi2011-01-1721-4667/+11183
|\ \ \ \ \ \ \
| * | | | | | | Video editor API update - rework for Patch Set 3Santosh Madhava2011-01-1621-4667/+11183
* | | | | | | | Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-173-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | integrate videoeditor preview player.Dharmaray Kundargi2011-01-163-0/+8
| |/ / / / / / /
* | | | | | | | Merge "videoeditor JNI files on honeycomb" into honeycombDharmaray Kundargi2011-01-1716-0/+10645
|\ \ \ \ \ \ \ \
| * | | | | | | | videoeditor JNI files on honeycombDharmaray Kundargi2011-01-1616-0/+10645
* | | | | | | | | Merge "Fix issue 3354692." into honeycombEric Laurent2011-01-171-10/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue 3354692.Eric Laurent2011-01-171-10/+32
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Yet another fix for 9patch rendering. Bug #3362133" into honeycombRomain Guy2011-01-172-16/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Yet another fix for 9patch rendering.Romain Guy2011-01-172-16/+17
* | | | | | | | Hide USB mass storage APIs in StorageManagerKenny Root2011-01-173-140/+10
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Make ImageProcessing work." into honeycombShih-wei Liao2011-01-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make ImageProcessing work.Shih-wei Liao2011-01-171-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "Implicitly/Explicitly subtypes bug." into honeycombsatok2011-01-162-7/+8
|\ \ \ \ \ \ \
| * | | | | | | Implicitly/Explicitly subtypes bug.satok2011-01-172-7/+8
* | | | | | | | Merge "Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE and FEATURE_ACTION_MODE_O...Adam Powell2011-01-163-8/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug 3360882 - Allow FEATURE_CUSTOM_TITLE andAdam Powell2011-01-163-8/+14
* | | | | | | | | Fixing bug related to collisions with AppWidget view ids and AppWidgetHost vi...Adam Cohen2011-01-161-1/+5
* | | | | | | | | Merge "LayoutLib: extract resource resolution into its own class." into honey...Xavier Ducrohet2011-01-169-561/+652
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | LayoutLib: extract resource resolution into its own class.Xavier Ducrohet2011-01-169-561/+652
* | | | | | | | | Merge "Fix 3005526: Properly update StatusView from Password/PIN unlock" into...Jim Miller2011-01-162-11/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix 3005526: Properly update StatusView from Password/PIN unlockJim Miller2011-01-162-11/+16
* | | | | | | | | | Merge "SystemServer: Do not register null BlueTooth service in the emulator" ...David 'Digit' Turner2011-01-161-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SystemServer: Do not register null BlueTooth service in the emulatorDavid 'Digit' Turner2011-01-171-4/+2
* | | | | | | | | | | Merge "Support non-rectangular input regions." into honeycombJeff Brown2011-01-1616-191/+270
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Support non-rectangular input regions.Jeff Brown2011-01-1616-191/+270
* | | | | | | | | | | Add API to get path to OBBs.Dianne Hackborn2011-01-1611-59/+305
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge "Implement SurfaceTexture frame-available callback." into honeycombJamie Gennis2011-01-164-37/+177
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement SurfaceTexture frame-available callback.Jamie Gennis2011-01-164-37/+177
* | | | | | | | | | | Merge "Fix SurfaceTexture transform matrix." into honeycombJamie Gennis2011-01-161-30/+48
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Fix SurfaceTexture transform matrix.Jamie Gennis2011-01-161-30/+48
* | | | | | | | | | | Merge "egl: fix GetProcAddress for EGLimage extensions" into honeycombMathias Agopian2011-01-161-0/+33
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | egl: fix GetProcAddress for EGLimage extensionsMichael I. Gold2011-01-161-0/+33
* | | | | | | | | | | | Merge "egl: expose EGLimage extensions" into honeycombMathias Agopian2011-01-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | egl: expose EGLimage extensionsMichael I. Gold2011-01-161-0/+2
* | | | | | | | | | | | Merge "Fix 3342063: Correctly update StatusView when battery changes." into h...Jim Miller2011-01-163-15/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix 3342063: Correctly update StatusView when battery changes.Jim Miller2011-01-163-15/+32
* | | | | | | | | | | | | Merge "Add some error checking." into honeycombJason Sams2011-01-163-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \