summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Add onSurfaceTextureDestroyed() callback.Romain Guy2011-06-101-10/+37
* Add a way to measure potential framerate of the view hierarchy.Romain Guy2011-06-092-8/+58
* Remove obsolete code.Romain Guy2011-06-081-13/+0
* The service part of the user space VPN support.Chia-chi Yeh2011-06-082-0/+49
* Merge "Move NDEF URI helper method into android.nfc.NfcRecord"Nick Pelly2011-06-081-0/+91
|\
| * Move NDEF URI helper method into android.nfc.NfcRecordNick Pelly2011-06-081-0/+91
* | Merge "Add 'Property' object"Chet Haase2011-06-0812-93/+925
|\ \
| * | Add 'Property' objectChet Haase2011-06-0812-93/+925
* | | Merge "Implement Felica timeout handling (API)."Martijn Coenen2011-06-084-11/+28
|\ \ \
| * | | Implement Felica timeout handling (API).Martijn Coenen2011-06-084-11/+28
* | | | Merge "resolved conflicts for merge of e139167c to master"Robert Greenwalt2011-06-081-9/+7
|\ \ \ \
| * \ \ \ resolved conflicts for merge of e139167c to masterRobert Greenwalt2011-06-081-9/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | |\ \ \
| | | * \ \ resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | | |\ \ \
| | | | * \ \ Merge "Reveal some network constants." into honeycomb-mr2Robert Greenwalt2011-06-071-9/+9
| | | | |\ \ \
| | | | | * | | Reveal some network constants.Robert Greenwalt2011-05-311-9/+9
* | | | | | | | Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"Mike Lockwood2011-06-081-20/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | UsbManager: Clean up extras for ACTION_USB_STATE broadcastMike Lockwood2011-06-081-20/+19
| |/ / / / / / /
* | | | | | | | Merge "Updates to Camera API documentation."Eino-Ville Talvala2011-06-081-67/+98
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Updates to Camera API documentation.Eino-Ville Talvala2011-06-071-67/+98
* | | | | | | | Merge "Fix the display name of InputMethodSubtype"satok2011-06-081-13/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix the display name of InputMethodSubtypesatok2011-06-081-13/+36
* | | | | | | | | Merge "Fix the threading behaviour of TTS audio requests."Narayan Kamath2011-06-087-240/+686
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix the threading behaviour of TTS audio requests.Narayan Kamath2011-06-077-240/+686
* | | | | | | | | Intent to manage application network data usage.Jeff Sharkey2011-06-081-0/+9
* | | | | | | | | Compute range-based usage in NetworkStatsHistory.Jeff Sharkey2011-06-071-0/+40
* | | | | | | | | UID network stats, secure settings, and random.Jeff Sharkey2011-06-073-10/+76
* | | | | | | | | Map network identity using ConnectivityService.Jeff Sharkey2011-06-077-33/+192
* | | | | | | | | resolved conflicts for merge of 8b2c0014 to masterJeff Brown2011-06-071-3/+37
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into h...Jeff Brown2011-06-061-3/+37
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2Jeff Brown2011-06-061-3/+37
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Touch pad improvements.Jeff Brown2011-06-061-3/+37
* | | | | | | | | am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when ...Jeff Brown2011-06-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mou...Jeff Brown2011-06-061-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." in...Jeff Brown2011-06-061-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Improve browser scrolling when using the mouse wheel.Jeff Brown2011-06-061-1/+1
* | | | | | | | | Merge "Update walled garden detection logic"Irfan Sheriff2011-06-071-0/+24
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update walled garden detection logicIrfan Sheriff2011-06-071-0/+24
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Rename atribute View horizontalDirection to layoutDirection and update unit t...Fabrice Di Meglio2011-06-073-55/+57
* | | | | | | | | Merge "StorageVolume: Add allowMassStorage flag"Mike Lockwood2011-06-071-5/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | StorageVolume: Add allowMassStorage flagMike Lockwood2011-06-071-5/+19
* | | | | | | | | | Merge "Implement shared-storage full backup/restore"Christopher Tate2011-06-074-17/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement shared-storage full backup/restoreChristopher Tate2011-06-074-17/+20
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of ...Alon Albert2011-06-071-5/+38
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add columns:Alon Albert2011-06-071-5/+38
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_...Mike Lockwood2011-06-071-2/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DIS...Mike Lockwood2011-06-071-2/+2
* | | | | | | | | Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED"Mike Lockwood2011-06-071-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | |
| * | | | | | | Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTEDMike Lockwood2011-06-071-2/+4
* | | | | | | | Merge "Improve android.hardware.Camera.Area javadoc."Wu-cheng Li2011-06-071-22/+34
|\ \ \ \ \ \ \ \