summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Implement remaining infrastructure for user disabling apps.Dianne Hackborn2011-06-173-1/+42
* Merge "Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelyS...Fabrice Di Meglio2011-06-151-44/+5
|\
| * Introduce LocalUtil and getLayoutDirectionFromLocale() now use likelySubtagsFabrice Di Meglio2011-06-151-44/+5
* | resolved conflicts for merge of 77fc8b80 to masterDianne Hackborn2011-06-141-0/+20
|\ \ | |/ |/|
| * am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f...Dianne Hackborn2011-06-141-0/+20
| |\
| | * Add new landscape and portrait orientation features.Dianne Hackborn2011-06-141-0/+20
* | | Update Configuration for renaming and fixesFabrice Di Meglio2011-06-091-24/+26
* | | resolved conflicts for merge of 9dfd7d0a to masterDianne Hackborn2011-06-091-0/+32
|\ \ \ | |/ /
| * | am 2d618e41: am e22fe933: Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
| |\ \ | | |/
| | * Fix issue #4582417: Need to add new PackageManager...Dianne Hackborn2011-06-081-0/+32
* | | resolved conflicts for merge of e2aa0490 to masterDianne Hackborn2011-06-093-19/+53
|\ \ \ | |/ /
| * | am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode i...Dianne Hackborn2011-06-083-19/+53
| |\ \ | | |/
| | * Work on issue #4518815: Compatibility mode introduces compatibility regressio...Dianne Hackborn2011-06-083-19/+53
* | | Merge "Add Configuration.getLayoutDirectionFromLocale()"Fabrice Di Meglio2011-06-091-0/+53
|\ \ \
| * | | Add Configuration.getLayoutDirectionFromLocale()Fabrice Di Meglio2011-06-091-0/+53
* | | | Intent to manage application network data usage.Jeff Sharkey2011-06-081-0/+9
|/ / /
* | | Implement shared-storage full backup/restoreChristopher Tate2011-06-071-1/+2
* | | Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DIS...Mike Lockwood2011-06-071-2/+2
* | | Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTEDMike Lockwood2011-06-071-2/+4
* | | resolved conflicts for merge of cc20b4e3 to masterDianne Hackborn2011-06-033-6/+42
|\ \ \ | |/ /
| * | am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum a...Dianne Hackborn2011-06-013-6/+42
| |\ \ | | |/
| | * Add new supports-screen API to set maximum allowed size.Dianne Hackborn2011-06-013-6/+42
* | | am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-032-7/+29
|\ \ \ | |/ /
| * | am 8b9a2b6c: am e6676351: Work around OpenFeint bug.Dianne Hackborn2011-06-012-7/+29
| |\ \ | | |/
| | * Work around OpenFeint bug.Dianne Hackborn2011-06-012-7/+29
* | | am c11f6c3e: am 7cae137e: am 79841acb: Merge "Compatibility mode never needed...Dianne Hackborn2011-06-031-0/+3
|\ \ \ | |/ /
| * | am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal s...Dianne Hackborn2011-06-011-0/+3
| |\ \ | | |/
| | * Compatibility mode never needed for normal size screens.Dianne Hackborn2011-06-011-0/+3
* | | am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeyco...Dianne Hackborn2011-06-031-0/+20
|\ \ \ | |/ /
| * | am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2Dianne Hackborn2011-05-311-0/+20
| |\ \ | | |/
| | * Forgot this file.Dianne Hackborn2011-05-311-0/+20
* | | am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml r...Dianne Hackborn2011-06-033-16/+19
|\ \ \ | |/ /
| * | am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used...Dianne Hackborn2011-05-313-16/+19
| |\ \ | | |/
| | * Fix issue #4502672: Wrong xml resources used for homescreen widgets.Dianne Hackborn2011-05-313-16/+19
* | | am 9b94aa18: am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.Dianne Hackborn2011-06-021-53/+65
|\ \ \ | |/ /
| * | am e5d37701: am 8ea5e1d7: Fix compat mode bugs when updating apps.Dianne Hackborn2011-05-271-53/+65
| |\ \ | | |/
| | * Fix compat mode bugs when updating apps.Dianne Hackborn2011-05-271-53/+65
* | | am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of reso...Dianne Hackborn2011-06-021-9/+10
|\ \ \ | |/ /
| * | am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config h...Dianne Hackborn2011-05-271-9/+10
| |\ \ | | |/
| | * Small fixes and cleanup of resource config handling.Dianne Hackborn2011-05-271-9/+10
* | | resolved conflicts for merge of 5c2e4d20 to masterDianne Hackborn2011-06-023-67/+124
|\ \ \ | |/ /
| * | am 8fcbfb52: am 94250ac6: Merge "Add new supports-screens attributes for decl...Dianne Hackborn2011-05-263-67/+124
| |\ \ | | |/
| | * Merge "Add new supports-screens attributes for declaring the compatible scree...Dianne Hackborn2011-05-263-67/+124
| | |\
| | | * Add new supports-screens attributes for declaring the compatible screens.Dianne Hackborn2011-05-263-67/+124
* | | | am ca6c3a2b: am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes ...Gilles Debunne2011-06-021-11/+10
|\ \ \ \ | |/ / /
| * | | am 4ce6822b: am 24de44a1: Merge "ExternalStorageFormatter takes an optional S...Gilles Debunne2011-05-261-11/+10
| |\ \ \ | | |/ /
| | * | Merge "ExternalStorageFormatter takes an optional StorageVolume target." into...Gilles Debunne2011-05-261-11/+10
| | |\ \
| | | * | ExternalStorageFormatter takes an optional StorageVolume target.Gilles Debunne2011-05-261-11/+10
| | * | | Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2Kenny Root2011-05-263-2/+204
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Break apart queries to getInstalled* API DO NOT MERGEKenny Root2011-05-263-2/+204