summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* am 46b59ef0: Merge "Fix access point parsing: reset static link property ↵Xia Wang2011-04-133-57/+26
|\ | | | | | | | | | | | | after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1 * commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40': Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
| * Merge "Fix access point parsing: reset static link property after parsing ↵Xia Wang2011-04-133-57/+26
| |\ | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
| | * Fix access point parsing: reset static link property after parsingXia Wang2011-04-083-57/+26
| | | | | | | | | | | | | | | | | | | | | | | | static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi Change-Id: I619e79e9bc414b9aeae3537dbc642a7fbc9fca97
* | | EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
| | | | | | | | | | | | Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
* | | resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
|\ \ \ | |/ / | | | | | | Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
| * | Add support for USB Ethernet adaptersBenoit Goby2011-04-112-2/+335
| | | | | | | | | | | | Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
* | | Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTEWink Saville2011-04-113-255/+230
|\ \ \
| * | | Move ProcessedMessage into HierarchicalStateMachine.Wink Saville2011-04-113-255/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ProcessedMessage is really private to HSM and so moving it into the HSM class. Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is really a Gservices value being accessed through Secure Settings bug: 4100048 Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
* | | | am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix ↵Nicolas Roard2011-04-071-1/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | for bug:4183801" into honeycomb-mr1 * commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a': Remove uncalled function -- java counterpart of the fix for bug:4183801
| * | | Merge "Remove uncalled function -- java counterpart of the fix for ↵Nicolas Roard2011-04-071-1/+0
| |\ \ \ | | | | | | | | | | | | | | | bug:4183801" into honeycomb-mr1
| | * | | Remove uncalled function -- java counterpart ofNicolas Roard2011-04-071-1/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | the fix for bug:4183801 Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
* | | | am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1Teng-Hui Zhu2011-04-073-5/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * commit 'bb55777be1a3231d187205dc378ca35b01e8bc65': DO NOT MERGE : cherry pick of change Ieb7ae26b from master DO NOT MERGE : cherry pick of change I0f9f2c65 from master
| * | | DO NOT MERGE : cherry pick of change Ieb7ae26b from masterTeng-Hui Zhu2011-04-073-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Buffering in full screen mode will show progressView bug:4187252 Change-Id: Ia44d880ab126c2439fb13504db87492d45c90bc8
| * | | DO NOT MERGE : cherry pick of change I0f9f2c65 from masterTeng-Hui Zhu2011-04-072-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the loading progress UI when buffering bug:4187252 Change-Id: Ifbf63b248ac5f0e340be4057e0dcd80d33483662
* | | | Merge "Add external dependency API." into honeycomb-LTERobert Greenwalt2011-04-078-0/+124
|\ \ \ \
| * | | | Add external dependency API.Robert Greenwalt2011-04-078-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An APN will not be connected to if some external dependency is not met. bug:3486704 Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
* | | | | Merge "Make LinkProperties comparable." into honeycomb-LTEJohn Wang2011-04-074-4/+280
|\ \ \ \ \
| * | | | | Make LinkProperties comparable.John Wang2011-04-074-4/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add equals() and hashcode() to LinkProperties and related fields. Bug:3501569 Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
* | | | | | am b25181aa: Merge "Fix the issue the video can\'t start to play" into ↵Teng-Hui Zhu2011-04-072-9/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'b25181aaccb00fee405251bf3575ce1d40badf46': Fix the issue the video can't start to play
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In full screen mode, we shall not always rely on the auto start info. If the auto start is false, it will prevent the video from playing. The auto start should always happen inline mode when prepared. If we switch into full screen mode while playing, we will also do auto start. bug:4260063 Change-Id: I4b13c30b1f2c219951dc8edd659e221a21c86c2b
* | | | | | | am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into ↵Eric Fischer2011-04-062-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit '9f2f650f26941a7cd4931afc66f39918e7c2817c': Import revised translations. DO NOT MERGE
| * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-04-062-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
* | | | | | | am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is ↵Adam Powell2011-04-051-21/+136
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | enabled" into honeycomb-mr1 * commit '030b38ffc21ef3962b31d5bac5170531293b6046': Fix bug 4207704 - Gestures can be lost when Flash is enabled
| * | | | | Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into ↵Adam Powell2011-04-051-21/+136
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | honeycomb-mr1
| | * | | | Fix bug 4207704 - Gestures can be lost when Flash is enabledAdam Powell2011-04-041-21/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pre-queue WebView touch events as we send them to webkit so that we can run them through WebView later if webkit or hosted plugins go out to lunch. Change-Id: Id4e9f56beeb0c1d55e77233423844b15f6f00aef
* | | | | | am 3f39f653: Adding package description for android.hardware.usbRobert Ly2011-04-041-0/+9
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e': Adding package description for android.hardware.usb
| * | | | Adding package description for android.hardware.usbRobert Ly2011-04-041-0/+9
| |/ / / | | | | | | | | | | | | Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
* | | | am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-018-36/+205
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75': Improve Javadoc for USB Manager and MTP/PTP support.
| * | | Improve Javadoc for USB Manager and MTP/PTP support.Mike Lockwood2011-04-018-36/+205
| |/ / | | | | | | | | | | | | | | | | | | Bug: 4091519 Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am 53df89c7: Merge "Expand screen documentation with explicit screen size ↵Dianne Hackborn2011-03-301-0/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | dimensions." into honeycomb-mr1 * commit '53df89c74fb3a31a874ad575467c5d498a53646e': Expand screen documentation with explicit screen size dimensions.
| * | Merge "Expand screen documentation with explicit screen size dimensions." ↵Dianne Hackborn2011-03-301-0/+22
| |\ \ | | | | | | | | | | | | into honeycomb-mr1
| | * | Expand screen documentation with explicit screen size dimensions.Dianne Hackborn2011-03-301-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the various documentation on screen sizes to discuss the exact screen dimensions that are now associated with each size. In addition, the screen sizes vs. densities table is updated to include a number of additional representative screens. Change-Id: Id07491148b1857e0265cef7139e564e190f38e03
* | | | am 01b13a11: Merge "Replacing browser playback controls for inactive videos ↵Justin Ho2011-03-303-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | Bug: 4136024" into honeycomb-mr1 * commit '01b13a11e6492ebba66c496eaefdb008f2638870': Replacing browser playback controls for inactive videos Bug: 4136024
| * | Replacing browser playback controls for inactive videosJustin Ho2011-03-303-0/+0
| | | | | | | | | | | | | | | | | | Bug: 4136024 Change-Id: I1c48023005d711d5080fa17a695f709705e362b6
* | | am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into ↵Eric Fischer2011-03-292-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-03-292-9/+9
| |/ | | | | | | Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
* | am baa3380d: Fix bug 4170809 - Pages with flash lose touch eventsAdam Powell2011-03-251-9/+16
|\ \ | |/ | | | | | | * commit 'baa3380d74928baf6a5685c54c719af37171a625': Fix bug 4170809 - Pages with flash lose touch events
| * Fix bug 4170809 - Pages with flash lose touch eventsAdam Powell2011-03-251-9/+16
| | | | | | | | | | | | | | Fix WebView touch cancel behavior when we time out waiting for a response from webkit. Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
* | am 2d09b855: Merge "When the video is not on the front, it should be paused" ↵Teng-Hui Zhu2011-03-231-1/+1
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit '2d09b855d5c0749ab845d3f2775125fea294f07c': When the video is not on the front, it should be paused
| * When the video is not on the front, it should be pausedTeng-Hui Zhu2011-03-231-1/+1
| | | | | | | | | | bug:4165855 Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
* | am efb8eda4: Merge "Make sure the full screen playing continue when timeout" ↵Teng-Hui Zhu2011-03-231-1/+1
|\ \ | |/ | | | | | | | | | | into honeycomb-mr1 * commit 'efb8eda41a2dce03db0984c490c16f6a32867ded': Make sure the full screen playing continue when timeout
| * Merge "Make sure the full screen playing continue when timeout" into ↵Teng-Hui Zhu2011-03-231-1/+1
| |\ | | | | | | | | | honeycomb-mr1
| | * Make sure the full screen playing continue when timeoutTeng-Hui Zhu2011-03-231-1/+1
| | | | | | | | | | | | | | | bug:4165804 Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
* | | am 18cd686f: am ef6b305b: docs: fix markup errorScott Main2011-03-231-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '18cd686fc828c9c75596de1494ecaa5467fcc195': docs: fix markup error
| * | am ef6b305b: docs: fix markup errorScott Main2011-03-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f': docs: fix markup error
| | * | docs: fix markup errorScott Main2011-03-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
* | | | am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1Eric Rowe2011-03-223-238/+220
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a': Clean up BT stress tests.
generated by cgit v1.1 at 2025-01-12 09:34:18 +0000