summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "camera2: Enable configuration failure to call #onConfigureFailed" into...Igor Murashkin2014-08-212-13/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | camera2: Enable configuration failure to call #onConfigureFailedIgor Murashkin2014-08-202-13/+53
* | | | | | | | | | | | | | | | Merge "Allow Activities to opt into using Overlay for shared elements." into ...George Mount2014-08-216-7/+62
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Allow Activities to opt into using Overlay for shared elements.George Mount2014-08-216-7/+62
* | | | | | | | | | | | | | | | Merge "MediaHTTPConnection: handles cross protocol redirects." into lmp-devRonghua Wu2014-08-211-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | MediaHTTPConnection: handles cross protocol redirects.Ronghua Wu2014-08-211-1/+8
* | | | | | | | | | | | | | | | | VoLTE incoming call numberJing Zhao2014-08-211-0/+34
* | | | | | | | | | | | | | | | | Merge "Add better error message for AAPT file conflicts" into lmp-devAdam Lesinski2014-08-211-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Add better error message for AAPT file conflictsAdam Lesinski2014-08-211-9/+11
* | | | | | | | | | | | | | | | | | Merge "AAPT: mipmaps should not end up in Splits" into lmp-devAdam Lesinski2014-08-214-10/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | AAPT: mipmaps should not end up in SplitsAdam Lesinski2014-08-214-10/+70
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "We need to specify a target SDK < 21 to use graphics RS." into lmp-devStephen Hines2014-08-212-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | We need to specify a target SDK < 21 to use graphics RS.Stephen Hines2014-08-202-1/+2
* | | | | | | | | | | | | | | | | | | Merge "Work on issue #16683269: system_server still leaking memory" into lmp-devDianne Hackborn2014-08-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Work on issue #16683269: system_server still leaking memoryDianne Hackborn2014-08-211-0/+3
* | | | | | | | | | | | | | | | | | | | Merge "Don't say "Arabic (Egypt)" in Settings." into lmp-devElliott Hughes2014-08-211-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Don't say "Arabic (Egypt)" in Settings.Elliott Hughes2014-08-211-0/+12
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Change the NetworkInfo for disconnected types." into lmp-devRobert Greenwalt2014-08-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Change the NetworkInfo for disconnected types.Robert Greenwalt2014-08-211-1/+3
* | | | | | | | | | | | | | | | | | | | Merge "Enable scissor for rounded outline clips" into lmp-devChris Craik2014-08-211-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Enable scissor for rounded outline clipsChris Craik2014-08-211-3/+5
* | | | | | | | | | | | | | | | | | | | | Merge "Update Split example with application icon" into lmp-devAdam Lesinski2014-08-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Update Split example with application iconAdam Lesinski2014-08-211-2/+2
* | | | | | | | | | | | | | | | | | | | | | Merge "Report the right resource version in am get-config" into lmp-devAdam Lesinski2014-08-211-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Report the right resource version in am get-configAdam Lesinski2014-08-211-1/+7
* | | | | | | | | | | | | | | | | | | | | | JobScheduler needs to flush queue on chargingMatthew Williams2014-08-215-11/+42
* | | | | | | | | | | | | | | | | | | | | | Merge "Write device owner name to XML" into lmp-devJason Monk2014-08-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Write device owner name to XMLJason Monk2014-08-211-0/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Don't run animators in buildLayer" into lmp-devJohn Reck2014-08-213-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Don't run animators in buildLayerJohn Reck2014-08-213-2/+16
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix supporting modifying listeners in callbacks" into lmp-devJohn Reck2014-08-211-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix supporting modifying listeners in callbacksJohn Reck2014-08-211-3/+13
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Update form spinner and search field assets" into lmp-devAlan Viverette2014-08-2123-31/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Update form spinner and search field assetsAlan Viverette2014-08-2123-31/+21
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Jump drawable state (including ripples) on view detach" into lmp-devAlan Viverette2014-08-214-22/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Jump drawable state (including ripples) on view detachAlan Viverette2014-08-214-22/+128
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Update material switch styling" into lmp-devAlan Viverette2014-08-218-31/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Update material switch stylingAlan Viverette2014-08-218-31/+73
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Use the crop function in the surfaceflinger screenshot api." into lmp-devRiley Andrews2014-08-211-13/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Use the crop function in the surfaceflinger screenshot api.Riley Andrews2014-08-201-13/+44
* | | | | | | | | | | | | | | | | | | | | | Merge "Implement GradientDrawable getColorFilter." into lmp-devJohn Spurlock2014-08-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Implement GradientDrawable getColorFilter.John Spurlock2014-08-211-0/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge "Show lock to app request on all users" into lmp-devJason Monk2014-08-212-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Show lock to app request on all usersJason Monk2014-08-212-1/+8
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix layer shadow transform crash" into lmp-devChris Craik2014-08-213-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix layer shadow transform crashChris Craik2014-08-213-9/+8
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "In startActivityAsCaller, changing the way we get the userId." into lm...Nicolas Prevot2014-08-211-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | In startActivityAsCaller, changing the way we get the userId.Nicolas Prevot2014-08-211-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge "Always set transport control flags" into lmp-devRoboErik2014-08-211-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Always set transport control flagsRoboErik2014-08-211-3/+1