summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Split Activity Transitions out of PhoneWindow.George Mount2014-04-1712-422/+1485
* Allow ProfileOwner apps to manage app restrictionsRobin Lee2014-04-173-0/+70
* Merge "Add missing resume() call"John Reck2014-04-171-11/+0
|\
| * Add missing resume() callJohn Reck2014-04-161-11/+0
* | Merge "Clear mIgnoreDirtyState after draw"John Reck2014-04-172-3/+5
|\ \ | |/
| * Clear mIgnoreDirtyState after drawJohn Reck2014-04-162-3/+5
* | Merge "Update DNG tags."Ruben Brunk2014-04-163-175/+301
|\ \
| * | Update DNG tags.Ruben Brunk2014-04-163-175/+301
* | | Merge "Add Preference highlighting"Fabrice Di Meglio2014-04-162-4/+39
|\ \ \
| * | | Add Preference highlightingFabrice Di Meglio2014-04-162-4/+39
* | | | Merge "Revert the revert of adding isRound to WindowInsets after early merge"Adam Powell2014-04-162-9/+32
|\ \ \ \
| * | | | Revert the revert of adding isRound to WindowInsets after early mergeAdam Powell2014-04-162-9/+32
* | | | | Merge "Revert "Add isRound to WindowInsets""Michael Kolb2014-04-162-32/+9
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Add isRound to WindowInsets"Michael Kolb2014-04-162-32/+9
* | | | | Merge "Add isRound to WindowInsets"Michael Kolb2014-04-162-9/+32
|\ \ \ \ \ | |/ / / /
| * | | | Add isRound to WindowInsetsAdam Powell2014-04-162-9/+32
* | | | | Merge "Class for managing the active scorer application."Jeff Davidson2014-04-162-0/+163
|\ \ \ \ \
| * | | | | Class for managing the active scorer application.Jeff Davidson2014-04-162-0/+163
* | | | | | resolved conflicts for merge of 3ee9dc58 to masterJeff Brown2014-04-161-0/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-devJeff Brown2014-04-161-0/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-devJeff Brown2014-04-161-0/+5
| | |\ \ \ \ \
| | | * | | | | Declare VersionCodes.KITKAT_WATCH.Jeff Brown2014-04-161-0/+5
* | | | | | | | am 4b81e89d: am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." ...Craig Mautner2014-04-163-5/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modu...Craig Mautner2014-04-163-5/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix ActivityContainer callback parcelling." into klp-modular-devCraig Mautner2014-04-163-5/+15
| | |\ \ \ \ \
| | | * | | | | Fix ActivityContainer callback parcelling.Craig Mautner2014-04-163-5/+15
| | | |/ / / /
| * | | | | | resolved conflicts for merge of ec6676dd to klp-modular-dev-plus-aospDeepanshu Gupta2014-04-161-0/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 86384880: am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-0/+5
| | |\ \ \ \ \
| | | * \ \ \ \ am f1e71876: Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-0/+5
| | | |\ \ \ \ \
| | | | * | | | | Fix theme/style resolution in Layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-151-0/+5
| * | | | | | | | am d023360a: am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO ...Deepanshu Gupta2014-04-161-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 484c88c3: am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-2/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | / / / / | | | |_|/ / / / | | |/| | | | |
| | | * | | | | am 4ccc4bd5: Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-161-2/+4
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Action bar rendering in layoutlib [DO NOT MERGE]Deepanshu Gupta2014-04-151-2/+4
| * | | | | | | am 50d7bfd8: DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInset...Adam Powell2014-04-153-9/+444
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE Refactoring of fitSystemWindows to applyWindowInsets for viewsAdam Powell2014-04-153-9/+444
* | | | | | | | Stub APIs for network scoring.Jeff Davidson2014-04-163-0/+133
* | | | | | | | Merge "Data structures for communication with network scorer apps."Jeff Davidson2014-04-166-0/+477
|\ \ \ \ \ \ \ \
| * | | | | | | | Data structures for communication with network scorer apps.Jeff Davidson2014-04-166-0/+477
* | | | | | | | | Rename basePkg to opPkgChristoph Studer2014-04-167-32/+26
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge "Revert "Revert "Define new general permission APIs for webview."""Ben Murdoch2014-04-164-0/+117
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Revert "Revert "Define new general permission APIs for webview.""Tao Bai2014-04-154-0/+117
* | | | | | | | Merge "Don't crash if a null key is passed for verification/parsing"Christopher Tate2014-04-151-7/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't crash if a null key is passed for verification/parsingChristopher Tate2014-04-151-7/+11
* | | | | | | | | Context: fixup wrong Javadoc link for BatteryManagerTodd Poynor2014-04-151-1/+1
* | | | | | | | | Merge "Allow clamped bound position to be INVALID_POSITION"Alan Viverette2014-04-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow clamped bound position to be INVALID_POSITIONAlan Viverette2014-04-151-1/+1
* | | | | | | | | | Merge "BatteryManager: Add API and service for battery property retrieval"Todd Poynor2014-04-154-10/+106
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | BatteryManager: Add API and service for battery property retrievalTodd Poynor2014-04-154-10/+106
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Remove TvInputSession"Youngsang Cho2014-04-154-88/+17
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
generated by cgit v1.1 at 2025-02-09 18:02:24 +0000