summaryrefslogtreecommitdiffstats
path: root/core/java/android/content
Commit message (Expand)AuthorAgeFilesLines
* Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.Amith Yamasani2013-04-241-3/+4
* Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-devMatthew Xie2013-04-231-0/+8
|\
| * Add hardware feature android.hardware.bluetooth.leMatthew Xie2013-04-231-0/+8
* | Merge "Add ContentValues & CursorWindow to framework.aidl" into jb-mr2-devNick Pelly2013-04-231-0/+19
|\ \
| * | Add ContentValues & CursorWindow to framework.aidlNick Pelly2013-04-231-0/+19
| |/
* | Follow up on issue #8159072: Spinner widget should be RTL'izedDianne Hackborn2013-04-192-22/+43
* | Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-2/+2
|\ \
| * | Improve API and documentationAmith Yamasani2013-04-191-2/+2
| |/
* | Merge "Improve fix for bug #8159072 Spinner widget should be RTL'ized" into j...Fabrice Di Meglio2013-04-191-8/+28
|\ \ | |/ |/|
| * Improve fix for bug #8159072 Spinner widget should be RTL'izedFabrice Di Meglio2013-04-181-8/+28
* | Modify restrictions bundle per api council recommendationsAmith Yamasani2013-04-172-14/+20
|/
* Allow non-system apps to use restricted accountsAmith Yamasani2013-04-151-5/+6
* Merge "Introducing manifest flag requiredAccountType" into jb-mr2-devAmith Yamasani2013-04-132-3/+18
|\
| * Introducing manifest flag requiredAccountTypeAmith Yamasani2013-04-122-3/+18
* | Add a little more resource load tracing.Dianne Hackborn2013-04-121-0/+10
* | Add new resources trace, also trace apk dex loading.Dianne Hackborn2013-04-121-1/+7
|/
* Merge "Document the behavior of 'null' values in SharedPreferences" into jb-m...Christopher Tate2013-04-121-2/+6
|\
| * Document the behavior of 'null' values in SharedPreferencesChristopher Tate2013-04-111-2/+6
* | Merge "More fix for bug #8159072 Spinner widget should be RTL'ized" into jb-m...Fabrice Di Meglio2013-04-122-9/+12
|\ \
| * | More fix for bug #8159072 Spinner widget should be RTL'izedFabrice Di Meglio2013-04-112-9/+12
* | | Merge "Implement #7341342 API request: way to determine current orientation.....Dianne Hackborn2013-04-121-1/+29
|\ \ \
| * | | Implement #7341342 API request: way to determine current orientation...Dianne Hackborn2013-04-111-1/+29
| | |/ | |/|
* | | Optional <uses-permission> not yet supported.Nick Kralevich2013-04-113-1/+5
|/ /
* | Merge "Queues, queues, queues and input." into jb-mr2-devJeff Brown2013-04-081-0/+6
|\ \
| * | Queues, queues, queues and input.Jeff Brown2013-04-081-0/+6
* | | Error on conflicting <uses-permission>Nick Kralevich2013-04-041-17/+35
* | | PackageParser: ignore <uses-permission> android:required on older appsNick Kralevich2013-04-041-0/+11
|/ /
* | Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-devJeff Sharkey2013-04-034-1/+51
|\ \
| * | Warn when exposing file:// Uris beyond a process.Jeff Sharkey2013-04-034-1/+51
| |/
* | Merge "Add direct API to get ManifestDigest" into jb-mr2-devKenny Root2013-04-032-26/+58
|\ \
| * | Add direct API to get ManifestDigestKenny Root2013-04-022-26/+58
| |/
* | Add global key configuration fileJustin Koh2013-04-021-0/+8
|/
* Merge "Improve RestrictionEntry API" into jb-mr2-devAmith Yamasani2013-03-302-51/+198
|\
| * Improve RestrictionEntry APIAmith Yamasani2013-03-292-51/+198
* | Merge "Unhide Bluetooth Low Energy public APIs" into jb-mr2-devMatthew Xie2013-03-281-1/+0
|\ \
| * | Unhide Bluetooth Low Energy public APIsMatthew Xie2013-03-281-1/+0
| |/
* | am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc u...kmccormick2013-03-281-4/+4
|\ \ | |/ |/|
| * am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superc...kmccormick2013-03-281-4/+4
| |\
| | * am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > super...kmccormick2013-03-281-4/+4
| | |\
| | | * Doc update: superceeded > supersededkmccormick2013-03-281-4/+4
* | | | Merge "Restricted account visibility" into jb-mr2-devAmith Yamasani2013-03-282-0/+15
|\ \ \ \
| * | | | Restricted account visibilityAmith Yamasani2013-03-272-0/+15
* | | | | resolved conflicts for merge of 603f987f to jb-mr2-devkmccormick2013-03-271-39/+39
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 418172bf: am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix ty...kmccormick2013-03-271-39/+39
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am 19840a8d: am 65c66c74: am 6e6e861a: Merge "Doc change: Fix typo DONT_DELTE...kmccormick2013-03-271-39/+39
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Doc change: Fix typo DONT_DELTEkmccormick2013-03-271-39/+39
| | | * | am 67f29573: am bb2aa63b: am a2e929e1: Tighten enforcement of file modes.Jeff Sharkey2013-03-011-2/+2
| | | |\ \
| * | | \ \ am 4bcea122: Merge "Add seinfo parsing to PackageManagerService."Geremy Condra2013-03-251-0/+15
| |\ \ \ \ \
| | * | | | | Add seinfo parsing to PackageManagerService.Robert Craig2013-03-251-0/+15
* | | | | | | Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-devNick Kralevich2013-03-283-5/+2
|\ \ \ \ \ \ \