summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Merge "Usage stats!"Dianne Hackborn2014-05-081-0/+10
|\
| * Usage stats!Dianne Hackborn2014-05-081-0/+10
* | Merge "Add android.hardware.camera.external feature."Eino-Ville Talvala2014-05-081-1/+9
|\ \ | |/ |/|
| * Add android.hardware.camera.external feature.Eino-Ville Talvala2014-05-081-1/+9
* | Remove reference to WifiScanner till the API is made publicVinit Deshapnde2014-05-081-3/+0
* | Initial implementation of WifiScannerVinit Deshapnde2014-05-071-0/+17
* | Merge "Fix erroneous javadoc example SyncRequest.Builder.setExtras"Russ Schnapp2014-05-081-1/+1
|\ \
| * | Fix erroneous javadoc example SyncRequest.Builder.setExtrasRuss Schnapp2014-05-071-1/+1
| |/
* | am 03498d34: am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular...Vinod Krishnan2014-05-071-0/+7
|\ \
| * \ am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-devVinod Krishnan2014-05-071-0/+7
| |\ \
| | * \ Merge "Adding a HeartRate Feature" into klp-modular-devVinod Krishnan2014-05-071-0/+7
| | |\ \
| | | * | Adding a HeartRate FeatureVinod Krishnan2014-05-051-0/+7
* | | | | resolved conflicts for merge of 3bbef521 to masterBrian Carlstrom2014-05-071-4/+7
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aospBrian Carlstrom2014-05-071-4/+7
| |\ \ \
| | * \ \ am edb88bcd: Merge "Use package usage information to decide what dex files to...Brian Carlstrom2014-05-071-4/+7
| | |\ \ \
| | | * | | Use package usage information to decide what dex files to optimize in Package...Brian Carlstrom2014-05-061-4/+7
| | * | | | Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEADBill Yi2014-04-294-15/+15
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation"Jeff Brown2014-03-131-1/+1
| | | |\ \ \
| | | * \ \ \ am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."Narayan Kamath2014-03-111-0/+9
| | | |\ \ \ \
| | | * \ \ \ \ am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."Narayan Kamath2014-03-111-1/+1
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am 29d60b95: am 8d41e653: Merge "Miscellaneous small documentation fixes."Elliott Hughes2014-03-081-1/+1
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."Narayan Kamath2014-03-071-4/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am 4ad93639: am 67754d93: Merge "Runtime resource overlay, iteration 2"Dianne Hackborn2014-03-073-6/+61
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 77a1986c: am 49b7ba4d: Merge "AArch64: Make AssetManager and related class...Narayan Kamath2014-03-074-70/+70
| | | |\ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ am 1e822a8f: Merge "Hide HDMI CEC from KKWT DO NOT MERGE" into klp-modular-devJustin Koh2014-05-051-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Hide HDMI CEC from KKWT DO NOT MERGEJustin Koh2014-05-051-0/+1
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | | | | | | | | | | | Add attributes and flags for DocCentric.Craig Mautner2014-05-073-15/+71
* | | | | | | | | | | | First pass at adding FingerprintManagerServiceJim Miller2014-05-071-0/+10
* | | | | | | | | | | | Cleaning code related to the forwarding intent filters.Nicolas Prevot2014-05-061-0/+22
* | | | | | | | | | | | Introducing removable and non-removable ForwardingIntentFilters.Nicolas Prevot2014-05-061-1/+2
* | | | | | | | | | | | Partial revert "Load device default theme mapping from resources"Alan Viverette2014-05-051-26/+23
* | | | | | | | | | | | Merge "Load device default theme mapping from resources"Alan Viverette2014-05-011-25/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Load device default theme mapping from resourcesAlan Viverette2014-05-011-25/+28
* | | | | | | | | | | | | Merge "TaskManager API first pass."Matthew Williams2014-05-012-0/+466
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | TaskManager API first pass.Matthew Williams2014-04-212-0/+466
* | | | | | | | | | | | | Merge "Adds an enabled state in UserInfo instead of DevicePolicyManager"Alexandra Gherghina2014-05-011-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Adds an enabled state in UserInfo instead of DevicePolicyManagerAlexandra Gherghina2014-05-011-2/+11
* | | | | | | | | | | | | | Merge "Introduce forwarding intents across profiles."Nicolas Prevot2014-05-011-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Introduce forwarding intents across profiles.Nicolas Prevot2014-04-301-0/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "Extend LauncherApps service to expose enabled state."Kenny Guy2014-04-302-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Extend LauncherApps service to expose enabled state.Kenny Guy2014-04-292-0/+35
* | | | | | | | | | | | | | Only remember the signer certificates for SignaturesKenny Root2014-04-292-9/+48
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Handle density request in LauncherActivityInfo"Amith Yamasani2014-04-251-8/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Handle density request in LauncherActivityInfoAmith Yamasani2014-04-251-8/+21
* | | | | | | | | | | | | | Provide access to ActivityInfo.name from LauncherActivityInfoKenny Guy2014-04-251-0/+8
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Initial implementation of new voice interaction API.Dianne Hackborn2014-04-244-1/+30
* | | | | | | | | | | | | Add support for muliple active development codenames.Dianne Hackborn2014-04-241-8/+24
* | | | | | | | | | | | | resolved conflicts for merge of f8a58208 to masterCraig Mautner2014-04-242-1/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-devCraig Mautner2014-04-242-1/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Add activity attribute allowEmbeddedCraig Mautner2014-04-242-1/+14