summaryrefslogtreecommitdiffstats
path: root/core/java/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTERobert Greenwalt2011-05-041-1/+9
|\
| * Add auto-restore timeout for secondary networks.Robert Greenwalt2011-05-031-1/+9
* | DO NOT MERGE MTP and media provider support for multiple storage devices:Mike Lockwood2011-05-041-0/+7
* | DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methodsMike Lockwood2011-05-042-0/+55
* | Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTERobert Greenwalt2011-05-024-28/+222
|\ \
| * | Add RouteInfo objects for tracking routes.Robert Greenwalt2011-05-024-28/+222
* | | Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTEIrfan Sheriff2011-05-022-0/+363
|\ \ \ | |_|/ |/| |
| * | Add DhcpStateMachine for interation with dhcpcdIrfan Sheriff2011-04-302-0/+363
| |/
* | am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" in...Scott Main2011-04-291-13/+75
|\ \ | |/ |/|
| * am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycombScott Main2011-04-291-13/+75
| |\
| | * docs: more documentation for ProgressBarScott Main2011-04-291-13/+75
* | | Make new networkAttribute parameter non-optional.Robert Greenwalt2011-04-251-5/+1
* | | new LTE prepay related valuesFreeman Ng2011-04-221-0/+16
* | | am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration cla...Scott Main2011-04-211-1/+5
|\ \ \ | |/ /
| * | am b8a57841: Merge "docs: add a little info to Configuration class descriptio...Scott Main2011-04-211-1/+5
| |\ \ | | |/
| | * docs: add a little info to Configuration class descriptionScott Main2011-04-201-1/+5
* | | Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.Wink Saville2011-04-182-33/+33
* | | EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
* | | resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
|\ \ \ | |/ /
| * | Add support for USB Ethernet adaptersBenoit Goby2011-04-112-2/+335
* | | Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTEFreeman Ng2011-04-111-0/+7
|\ \ \
| * | | Add prepaid data services URL to Secure SettingsFreeman Ng2011-04-071-0/+7
* | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix f...Nicolas Roard2011-04-071-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Remove uncalled function -- java counterpart of the fix for bug:418380...Nicolas Roard2011-04-071-1/+0
| |\ \ \
| | * | | Remove uncalled function -- java counterpart ofNicolas Roard2011-04-071-1/+0
* | | | | am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
|\ \ \ \ \ | |/ / / /
| * | | | DO NOT MERGE : cherry pick of change Ieb7ae26b from masterTeng-Hui Zhu2011-04-073-9/+34
| * | | | DO NOT MERGE : cherry pick of change I0f9f2c65 from masterTeng-Hui Zhu2011-04-072-3/+33
* | | | | Merge "Add external dependency API." into honeycomb-LTERobert Greenwalt2011-04-077-0/+123
|\ \ \ \ \
| * | | | | Add external dependency API.Robert Greenwalt2011-04-077-0/+123
* | | | | | Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-073-4/+81
|\ \ \ \ \ \
| * | | | | | Make LinkProperties comparable.John Wang2011-04-073-4/+81
* | | | | | | am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeyc...Teng-Hui Zhu2011-04-072-9/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "Fix the issue the video can't start to play" into honeycomb-mr1Teng-Hui Zhu2011-04-072-9/+3
| |\ \ \ \ \ \
| | * | | | | | Fix the issue the video can't start to playTeng-Hui Zhu2011-04-062-9/+3
* | | | | | | | am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enab...Adam Powell2011-04-051-21/+136
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into hon...Adam Powell2011-04-051-21/+136
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix bug 4207704 - Gestures can be lost when Flash is enabledAdam Powell2011-04-041-21/+136
* | | | | | | am 3f39f653: Adding package description for android.hardware.usbRobert Ly2011-04-041-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Adding package description for android.hardware.usbRobert Ly2011-04-041-0/+9
| |/ / / /
* | | | | am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-018-36/+205
|\ \ \ \ \ | |/ / / /
| * | | | Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-018-36/+205
| |/ / /
* | | | am 53df89c7: Merge "Expand screen documentation with explicit screen size dim...Dianne Hackborn2011-03-301-0/+22
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Expand screen documentation with explicit screen size dimensions.Dianne Hackborn2011-03-301-0/+22
* | | am baa3380d: Fix bug 4170809 - Pages with flash lose touch eventsAdam Powell2011-03-251-9/+16
|\ \ \ | |/ /
| * | Fix bug 4170809 - Pages with flash lose touch eventsAdam Powell2011-03-251-9/+16
* | | am 2d09b855: Merge "When the video is not on the front, it should be paused" ...Teng-Hui Zhu2011-03-231-1/+1
|\ \ \ | |/ /
| * | When the video is not on the front, it should be pausedTeng-Hui Zhu2011-03-231-1/+1
* | | am efb8eda4: Merge "Make sure the full screen playing continue when timeout" ...Teng-Hui Zhu2011-03-231-1/+1
|\ \ \ | |/ /
| * | Merge "Make sure the full screen playing continue when timeout" into honeycom...Teng-Hui Zhu2011-03-231-1/+1
| |\ \