summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* VolumeZen: combine ringer/notification volume and zen.John Spurlock2014-05-278-166/+77
* Merge "Modify task navigation to return to recent tasks. DO NOT MERGE" into l...Craig Mautner2014-05-251-0/+6
|\
| * Modify task navigation to return to recent tasks. DO NOT MERGECraig Mautner2014-05-241-0/+6
* | Merge "Add code for persisting tasks and activities to disk DO NOT MERGE" int...Craig Mautner2014-05-254-36/+710
|\ \ | |/
| * Add code for persisting tasks and activities to disk DO NOT MERGECraig Mautner2014-05-234-36/+710
* | Merge "Fix issue #15195464: battery history says wakelock held when it's not"...Dianne Hackborn2014-05-242-28/+22
|\ \
| * | Fix issue #15195464: battery history says wakelock held when it's notDianne Hackborn2014-05-232-28/+22
* | | Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-devRuben Brunk2014-05-244-0/+1145
|\ \ \
| * | | camera2: Move DngCreator to hardware/camera2.Ruben Brunk2014-05-224-0/+1145
* | | | Merge "Revert small / medium / large text sizes" into lmp-preview-devAlan Viverette2014-05-243-34/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | Revert small / medium / large text sizesAlan Viverette2014-05-233-34/+48
* | | | Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-previe...Chris Craik2014-05-233-579/+97
|\ \ \ \
| * | | | DO NOT MERGE Inspect SkShader to determine hw shader.Leon Scroggins III2014-05-233-579/+97
* | | | | Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-devZhijun He2014-05-233-32/+1
|\ \ \ \ \
| * | | | | Camera2: Mark the under-specified tags for FUTUREZhijun He2014-05-233-32/+1
| | |/ / / | |/| | |
* | | | | Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-devAlan Viverette2014-05-231-35/+33
|\ \ \ \ \
| * | | | | Handle hybrid themes correctly in Drawable cacheAlan Viverette2014-05-221-35/+33
* | | | | | Merge "Fix selection handle offsets" into lmp-preview-devAlan Viverette2014-05-238-0/+0
|\ \ \ \ \ \
| * | | | | | Fix selection handle offsetsAlan Viverette2014-05-238-0/+0
| |/ / / / /
* | | | | | Merge "DO NOT MERGE. Add more columns to TV metadata to enable newly requeste...Jae Seo2014-05-231-1/+69
|\ \ \ \ \ \
| * | | | | | DO NOT MERGE. Add more columns to TV metadata to enable newly requested use c...Jae Seo2014-05-221-1/+69
| |/ / / / /
* | | | | | Merge "Bag of scheduling tweaks" into lmp-preview-devJohn Reck2014-05-234-0/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Bag of scheduling tweaksJohn Reck2014-05-234-0/+31
* | | | | | Merge "DO NOT MERGE: Javadoc fix." into lmp-preview-devRuben Brunk2014-05-231-4/+4
|\ \ \ \ \ \
| * | | | | | DO NOT MERGE: Javadoc fix.Ruben Brunk2014-05-231-4/+4
| |/ / / / /
* | | | | | Merge "camera2: Refactor CameraMetadata.Key out into 3 key classes" into lmp-...Igor Murashkin2014-05-236-146/+873
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | camera2: Refactor CameraMetadata.Key out into 3 key classesIgor Murashkin2014-05-236-146/+873
* | | | | | Merge "Update switch, checkbox, radio button, button, and toggle button" into...Alan Viverette2014-05-23702-275/+516
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update switch, checkbox, radio button, button, and toggle buttonAlan Viverette2014-05-22702-275/+516
| |/ / / /
* | | | | Merge "Fix Ethernet documentation." into lmp-preview-devJaewan Kim2014-05-232-6/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix Ethernet documentation.Lorenzo Colitti2014-05-232-6/+3
* | | | | Merge "Create deviceowner gated APIs for creating and removing users in devic...Julia Reynolds2014-05-232-0/+42
|\ \ \ \ \
| * | | | | Create deviceowner gated APIs for creating and removing users in devicepolicy...Julia Reynolds2014-05-232-0/+42
* | | | | | Merge "Add a cache to LockPatternUtils" into lmp-preview-devAdrian Roos2014-05-234-2/+250
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add a cache to LockPatternUtilsAdrian Roos2014-05-234-2/+250
| | |/ / / | |/| | |
* | | | | Merge "SysUI: Use SBN keys instead of IBinder keys DO NOT MERGE" into lmp-pre...Christoph Studer2014-05-232-5/+5
|\ \ \ \ \
| * | | | | SysUI: Use SBN keys instead of IBinder keys DO NOT MERGEChristoph Studer2014-05-222-5/+5
| |/ / / /
* | | | | Camera2: Add croppingType tagZhijun He2014-05-224-18/+56
| |/ / / |/| | |
* | | | Merge "Camera2: Raw is not croppable" into lmp-preview-devZhijun He2014-05-232-4/+10
|\ \ \ \
| * | | | Camera2: Raw is not croppableZhijun He2014-05-222-4/+10
* | | | | Merge "Camera2: Clarify shading map spec" into lmp-preview-devZhijun He2014-05-232-4/+20
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Camera2: Clarify shading map specZhijun He2014-05-222-4/+20
| | |/ | |/|
* | | Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-devDianne Hackborn2014-05-221-5/+14
|\ \ \ | |/ / |/| |
| * | (DO NOT MERGE) Battery monitoring fixes:Dianne Hackborn2014-05-221-5/+14
| |/
* | Camera2: New capture session interfaceEino-Ville Talvala2014-05-224-28/+755
|/
* Merge "Remove unnecessary internal lock"Yohei Yukawa2014-05-222-31/+34
|\
| * Remove unnecessary internal lockYohei Yukawa2014-05-222-31/+34
* | Merge "Overrides ImeSubtypeListItem#toString"Yohei Yukawa2014-05-221-0/+11
|\ \
| * | Overrides ImeSubtypeListItem#toStringYohei Yukawa2014-05-221-0/+11
| |/
* | Merge "End-align alert dialog buttons to avoid layout bug on tablet"Alan Viverette2014-05-222-7/+2
|\ \