summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/res
Commit message (Expand)AuthorAgeFilesLines
* am 096c4c44: am 251384a7: Merge "Improve performance when getting styled stri...Brad Fitzpatrick2010-11-191-27/+53
|\
| * am 251384a7: Merge "Improve performance when getting styled string."Brad Fitzpatrick2010-11-191-27/+53
| |\
| | * Improve performance when getting styled string.Peter Eliasson2010-11-181-27/+53
| * | am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fd...Jeff Hamilton2010-10-281-1/+5
| |\ \
| | * | DO NOT MERGE. Fix asset file descriptor for pipe based fds.Jeff Hamilton2010-10-281-1/+5
| * | | am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbreadDianne Hackborn2010-10-221-1/+0
| |\ \ \ | | |/ /
| | * | Fix issue #3122240: Expose xlarge in GB.Dianne Hackborn2010-10-221-1/+0
* | | | Add path to get different DPI drawablesKenny Root2010-10-292-5/+73
* | | | am 8fda1636: am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gi...Kenny Root2010-10-151-0/+9
|\ \ \ \ | |/ / /
| * | | am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbreadKenny Root2010-10-131-0/+9
| |\ \ \ | | |/ /
| | * | OBB: use PBKDF2 for key generation.Kenny Root2010-10-131-0/+9
* | | | am 6ce5f60c: am 38cf8867: Remove OBBs from state list when volume unmountedKenny Root2010-09-302-0/+12
|\ \ \ \ | |/ / /
| * | | am 38cf8867: Remove OBBs from state list when volume unmountedKenny Root2010-09-302-0/+12
| |\ \ \ | | |/ /
| | * | Remove OBBs from state list when volume unmountedKenny Root2010-09-302-0/+12
* | | | Drag/drop APIs and infrastructureChristopher Tate2010-09-301-0/+12
* | | | am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmoun...Kenny Root2010-09-291-1/+1
|\ \ \ \ | |/ / /
| * | | am 212d81a0: Merge "Move all the permissions check up for unmount" into ginge...Kenny Root2010-09-291-1/+1
| |\ \ \ | | |/ /
| | * | Move all the permissions check up for unmountKenny Root2010-09-291-1/+1
* | | | resolved conflicts for merge of d8e8186c to masterKenny Root2010-09-282-12/+31
|\ \ \ \ | |/ / /
| * | | am 05105f7a: Update OBB API to include callbacksKenny Root2010-09-282-12/+31
| |\ \ \ | | |/ /
| | * | Update OBB API to include callbacksKenny Root2010-09-282-12/+31
| * | | am 69717ccd: DO NOT MERGE. Some stuff that is Not Ready.Dianne Hackborn2010-09-031-1/+2
| |\ \ \ | | |/ /
| | * | DO NOT MERGE. Some stuff that is Not Ready.Dianne Hackborn2010-09-031-1/+2
* | | | am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed...Gilles Debunne2010-08-211-3/+1
|\ \ \ \ | |/ / /
| * | | am 189de282: Merge "Fix for a Resource system bug that displayed the wrong na...Gilles Debunne2010-08-191-3/+1
| |\ \ \ | | |/ /
| | * | Merge "Fix for a Resource system bug that displayed the wrong name for missin...Gilles Debunne2010-08-191-3/+1
| | |\ \
| | | * | Fix for a Resource system bug that displayed the wrong name for missing asset.Gilles Debunne2010-08-191-3/+1
* | | | | am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into ging...Kenny Root2010-08-211-3/+21
|\ \ \ \ \ | |/ / / /
| * | | | am 54d41379: Merge "Add OBB flags to support overlays" into gingerbreadKenny Root2010-08-191-3/+21
| |\ \ \ \ | | |/ / /
| | * | | Add OBB flags to support overlaysKenny Root2010-08-181-3/+21
| | |/ /
* | | | New API and implementation of DB and memory-backed FDsBjorn Bringert2010-08-181-91/+1
* | | | More fragment work:Dianne Hackborn2010-08-151-1/+1
* | | | am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbreadDianne Hackborn2010-08-111-1/+1
|\ \ \ \ | |/ / /
| * | | am a5ae50cd: Merge "More native work." into gingerbreadDianne Hackborn2010-08-111-1/+1
| |\ \ \ | | |/ /
| | * | More native work.Dianne Hackborn2010-08-111-1/+1
* | | | Add new ContentProvider for doing conversions to data streams.Dianne Hackborn2010-08-081-2/+6
* | | | am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; ...Scott Main2010-08-051-1/+3
|\ \ \ \ | |/ / /
| * | | am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to r...Scott Main2010-08-041-1/+3
| |\ \ \ | | |/ /
| | * | am 8dd87ad9: fix some doc errors in the resources; add link to resource docs ...Scott Main2010-08-041-1/+3
| | |\ \
| | | * | fix some doc errors in the resources;Scott Main2010-08-041-1/+3
* | | | | More readable Configuration#toString() output.Daniel Sandler2010-07-221-5/+12
* | | | | am 42ef77f3: merge from open-source masterThe Android Open Source Project2010-07-211-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-07-211-4/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Shoud specify the Resource class instance as an argument of the methodMasanori Ogino2010-07-201-4/+4
* | | | | am 5adfe6c5: merge from open-source masterThe Android Open Source Project2010-07-161-38/+69
|\ \ \ \ \ | |/ / / /
| * | | | merge from open-source masterThe Android Open Source Project2010-07-161-38/+69
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Fix the problem that color drawable cache key conflicts another drawable one.Masanori Ogino2010-07-161-38/+69
| | |/
* | | resolved conflicts for merge of 181bb0ab to masterKenny Root2010-07-163-0/+130
|\ \ \ | |/ /
| * | Add API to call to vold for mounting OBBsKenny Root2010-07-153-0/+130
* | | am 078ccbdb: am 2c40582a: Merge "Add native C APIs for working with the Asset...Christopher Tate2010-07-151-0/+1
|\ \ \ | |/ /