summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
Commit message (Expand)AuthorAgeFilesLines
* Merge "Document behavior change of isUninstallBlocked() since L MR1"Rubin Xu2015-03-101-1/+6
|\
| * Document behavior change of isUninstallBlocked() since L MR1Rubin Xu2015-03-101-1/+6
* | Merge "Revert "Remove TrustAgent whitelisting API""Adrian Roos2015-03-091-2/+0
|\ \
| * | Revert "Remove TrustAgent whitelisting API"Adrian Roos2015-03-051-2/+0
* | | Merge "Add a new extra to specify the admin component for provisioning."Nicolas Prevot2015-03-091-2/+39
|\ \ \
| * | | Add a new extra to specify the admin component for provisioning.Nicolas Prevot2015-03-091-2/+39
* | | | Block setting wallpapers from managed profiles.Benjamin Franz2015-03-093-16/+70
* | | | Annotate methods to be called from overrides with @CallSuperTor Norbye2015-03-072-0/+16
* | | | am 208e80d9: am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unneces...Andreas Gampe2015-03-081-3/+1
|\ \ \ \
| * \ \ \ am a3d5b230: am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern ...Andreas Gampe2015-03-081-3/+1
| |\ \ \ \
| | * \ \ \ am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"Andreas Gampe2015-03-071-3/+1
| | |\ \ \ \
| | | * | | | Frameworks/base: Remove unnecessary Pattern instanceAndreas Gampe2015-03-071-3/+1
* | | | | | | Merge "Add new debug feature to automatically create heap dumps."Dianne Hackborn2015-03-074-3/+53
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add new debug feature to automatically create heap dumps.Dianne Hackborn2015-03-064-3/+53
* | | | | | | Merge "Annotate ARGB integer parameters with @ColorInt"Tor Norbye2015-03-061-3/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Annotate ARGB integer parameters with @ColorIntTor Norbye2015-03-051-3/+8
* | | | | | | Merge "Don't back up / restore the code_cache/ directory"Christopher Tate2015-03-061-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Don't back up / restore the code_cache/ directoryChristopher Tate2015-03-051-2/+9
| |/ / / / / /
* | | | | | | Merge "Deprecate things that rely on Debug.startAllocCounting."Hiroshi Yamauchi2015-03-061-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Deprecate things that rely on Debug.startAllocCounting.Hiroshi Yamauchi2015-03-051-0/+6
* | | | | | | Merge "Allow device and profile owners to set a user icon."Julia Reynolds2015-03-052-0/+18
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Allow device and profile owners to set a user icon.Julia Reynolds2015-03-042-0/+18
* | | | | | | Add security check for clearDeviceInitializer in the service.Julia Reynolds2015-03-052-4/+6
* | | | | | | Clean up the lock task APIs for COSU devices.Benjamin Franz2015-03-054-9/+59
* | | | | | | DOs can clear the DI; rehide hasUserSetupCompleted.Julia Reynolds2015-03-041-4/+4
|/ / / / / /
* | | | | | Allow the device initializer to perform user setup tasks.Julia Reynolds2015-03-043-18/+217
|/ / / / /
* | | | | am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequ...Craig Mautner2015-03-032-54/+44
|\ \ \ \ \ | |/ / / /
| * | | | am 358188f5: Merge "Change ActivityView startActivity state sequence" into lm...Craig Mautner2015-03-032-54/+44
| |\ \ \ \
| | * \ \ \ Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular...Craig Mautner2015-03-032-54/+44
| | |\ \ \ \
| | | * | | | Change ActivityView startActivity state sequenceCraig Mautner2015-03-032-54/+44
* | | | | | | resolved conflicts for merge of 5864f5ed to masterJoe Fernandez2015-03-032-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc:...Joe Fernandez2015-03-032-6/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor...Joe Fernandez2015-03-032-6/+8
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed pro...Joe Fernandez2015-03-032-6/+8
| | | |\ \ \ \
| | | | * \ \ \ am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc ...Joe Fernandez2015-03-032-6/+8
| | | | |\ \ \ \
| | | | | * | | | Minor typo fixes in managed profile Javadoc reference pages.Andrew Solovay2015-03-022-6/+8
| | | | | * | | | docs: Added info on noHistory and onActivityResult().Ricardo Cervera2015-01-161-0/+4
* | | | | | | | | Merge "Improve docs for drawable tint and color filters"Chris Craik2015-03-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Improve docs for drawable tint and color filtersChris Craik2015-03-021-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge "Add generic "INTERACTION" event type to UsageStatsManager"Adam Lesinski2015-03-022-0/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add generic "INTERACTION" event type to UsageStatsManagerAdam Lesinski2015-03-022-0/+15
* | | | | | | | | | Remove unused imports in frameworks/base.John Spurlock2015-02-2811-19/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Implement landscape layout for time picker dialog"Alan Viverette2015-02-271-34/+46
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Implement landscape layout for time picker dialogAlan Viverette2015-02-261-34/+46
* | | | | | | | | Merge "Rework voice interaction session lifecycle."Dianne Hackborn2015-02-261-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rework voice interaction session lifecycle.Dianne Hackborn2015-02-251-2/+2
* | | | | | | | | | Merge "Fix target location on nested shared elements."George Mount2015-02-261-32/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix target location on nested shared elements.George Mount2015-02-251-32/+16
* | | | | | | | | | | Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly"Nicolas Prevot2015-02-261-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fail silently when changing BLUETOOTH_ON/WIFI_ON directlyNicolas Prevot2015-02-261-2/+7