summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix includes so that they no longer rely on the global Skia includes d...Derek Sollenberger2014-02-282-2/+2
|\
| * Fix includes so that they no longer rely on the global Skia includes director...Derek Sollenberger2014-02-272-2/+2
* | Refactor smooth scrolling sub-row calculation and clamp targetAlan Viverette2014-02-271-57/+58
* | Merge "Cleanup unnecessary includes for libskia."Derek Sollenberger2014-02-271-2/+0
|\ \
| * | Cleanup unnecessary includes for libskia.Derek Sollenberger2014-02-271-2/+0
| |/
* | Merge "Add support for USB devices with multiple configurations and alternate...Mike Lockwood2014-02-276-26/+364
|\ \
| * | Add support for USB devices with multiple configurations and alternate interf...Mike Lockwood2014-02-276-26/+364
* | | Merge "Fix broken link in javadoc."George Mount2014-02-271-2/+2
|\ \ \ | |/ / |/| |
| * | Fix broken link in javadoc.George Mount2014-02-271-2/+2
| |/
* | Introduce zen mode.John Spurlock2014-02-271-0/+18
|/
* Merge "Change Activity Scene Transitions to be more automatic redo."George Mount2014-02-2714-354/+332
|\
| * Change Activity Scene Transitions to be more automatic redo.George Mount2014-02-2614-354/+332
* | am 7aec4109: am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglG...Narayan Kamath2014-02-271-1/+1
|\ \
| * \ am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EG...Narayan Kamath2014-02-271-1/+1
| |\ \
| | * \ Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"Narayan Kamath2014-02-271-1/+1
| | |\ \
| | | * | AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAYAshok Bhat2014-02-261-1/+1
* | | | | am 2589067d: am 9fc8e6fe: am f61add84: am 2000fe58: Merge "Make getAssetInt t...Narayan Kamath2014-02-271-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-02-271-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-02-271-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Make getAssetInt throw unconditionally.Narayan Kamath2014-02-251-1/+1
* | | | | Add unit test for InputMethodInfoYohei Yukawa2014-02-271-0/+54
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-02-273-11/+11
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-263-11/+11
* | | | | | Always set item type on obtained ListView item viewsAlan Viverette2014-02-261-13/+20
* | | | | | Merge "Collect per-uid mobile radio usage."Dianne Hackborn2014-02-275-48/+333
|\ \ \ \ \ \
| * | | | | | Collect per-uid mobile radio usage.Dianne Hackborn2014-02-265-48/+333
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "VideoPlaneView initial implementation"Wonsik Kim2014-02-274-110/+178
|\ \ \ \ \ \
| * | | | | | VideoPlaneView initial implementationWonsik Kim2014-02-264-110/+178
* | | | | | | Fix progress bar tinting, add tint support to ShapeDrawableAlan Viverette2014-02-261-5/+10
| |/ / / / / |/| | | | |
* | | | | | Merge "Move Session apis to android.media.session"RoboErik2014-02-262-3/+3
|\ \ \ \ \ \
| * | | | | | Move Session apis to android.media.sessionRoboErik2014-02-252-3/+3
* | | | | | | Revert "Change Activity Scene Transitions to be more automatic."George Mount2014-02-2614-320/+346
* | | | | | | Merge "Add support.multidex tests app for an update bug."Yohann Roussel2014-02-2621-0/+618
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add support.multidex tests app for an update bug.Yohann Roussel2014-02-2621-0/+618
* | | | | | | Merge "Constrain starting sub row to list bounds"Alan Viverette2014-02-261-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Constrain starting sub row to list boundsAlan Viverette2014-02-251-1/+2
* | | | | | | | Merge "Deal with apps known to LocalTransport backend but with no data"Christopher Tate2014-02-261-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Deal with apps known to LocalTransport backend but with no dataChristopher Tate2014-02-251-1/+3
* | | | | | | | | Merge "Change Activity Scene Transitions to be more automatic."George Mount2014-02-2514-346/+320
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change Activity Scene Transitions to be more automatic.George Mount2014-02-2514-346/+320
* | | | | | | | | | More battery stats.Dianne Hackborn2014-02-259-20/+93
* | | | | | | | | | Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-2528-174/+174
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Tabs -> spaces in frameworks/base.John Spurlock2014-02-2528-174/+174
| |/ / / / / / / / /
* | | | | | | | | | Fix NFC docs breakage.Martijn Coenen2014-02-251-2/+2
* | | | | | | | | | am c407ace3: am d4c819c0: am dd9ce628: Merge "Clean up activities and display...Craig Mautner2014-02-253-1/+31
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | am dd9ce628: Merge "Clean up activities and displays when done" into klp-modu...Craig Mautner2014-02-253-1/+31
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Clean up activities and displays when done" into klp-modular-devCraig Mautner2014-02-253-1/+31
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Clean up activities and displays when doneCraig Mautner2014-02-253-1/+31
* | | | | | | | | | | | Merge "Add an API to manually invoke Android Beam."Martijn Coenen2014-02-254-1/+90
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add an API to manually invoke Android Beam.Martijn Coenen2014-02-144-1/+90