Scott Main
511ec082bb
am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
docs: more documentation for ProgressBar
2011-04-29 14:59:08 -07:00
Scott Main
de506220d8
am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb
...
* commit '1462813a28270d4255f9542b666960182e274a6e':
docs: more documentation for ProgressBar
2011-04-29 14:55:43 -07:00
Scott Main
42f139c069
docs: more documentation for ProgressBar
...
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
2011-04-29 14:51:05 -07:00
Irfan Sheriff
3fc75e9267
Define Protocol class for use with StateMachine
...
Adds a common namespace for communication across
different state machines
Change-Id: I0a9ae872112567afd35a1dc95ac9283170f3f459
2011-04-28 11:10:03 -07:00
Robert Greenwalt
af2eb4f6db
Make new networkAttribute parameter non-optional.
...
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Freeman Ng
3b9089c1fa
new LTE prepay related values
...
bug: 4082355
Change-Id: Id5a8f9b8bca64d9cf6ee13b00bd32c4911e9a3fa
2011-04-22 16:42:57 -07:00
Scott Main
69ccfd7a29
am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit 'ca7f30ebb20dcf4c056f57a8c4ab3342cafaed83':
docs: add a little info to Configuration class description
2011-04-21 10:55:20 -07:00
Scott Main
ca7f30ebb2
am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit 'b8a57841316171d6db4311a65914720213516153':
docs: add a little info to Configuration class description
2011-04-21 10:53:08 -07:00
Scott Main
63848e3df3
docs: add a little info to Configuration class description
...
Change-Id: I3278759bd1c323330c1143ef71d0644872caa085
2011-04-20 22:20:46 -07:00
Wink Saville
64c42cae44
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
...
Change-Id: Ib4b33894da75f5f156066092fb145b478e52f7d7
2011-04-18 14:55:10 -07:00
Benoit Goby
43be7a6120
EthernetDataTracker: implement setDependencyMet
...
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
2011-04-11 20:13:10 -07:00
Benoit Goby
2869d1715d
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Benoit Goby
08c39c6a11
Add support for USB Ethernet adapters
...
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Wink Saville
3156a8c169
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -07:00
Wink Saville
d3059487ab
Move ProcessedMessage into HierarchicalStateMachine.
...
ProcessedMessage is really private to HSM and so moving
it into the HSM class.
Change-Id: Ida476fc7aae5e9bfb6ac632dac979e11f489b6fc
2011-04-11 11:51:28 -07:00
Freeman Ng
b7e8a54d98
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
2011-04-11 11:10:18 -07:00
Freeman Ng
96be4e01e6
Add prepaid data services URL to Secure Settings
...
This is really a Gservices value being accessed through Secure Settings
bug: 4100048
Change-Id: I6e2eb72b17594b5c8f14a6ecfc21eafeff80fa1b
2011-04-07 18:21:40 -07:00
Nicolas Roard
3e37a2f3ae
am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
...
* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:24:05 -07:00
Nicolas Roard
fcba23536b
Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
2011-04-07 17:21:53 -07:00
Nicolas Roard
4bae836784
Remove uncalled function -- java counterpart of
...
the fix for bug:4183801
Change-Id: Icaaa83743976be180ba570158bd4016e7f53c95a
2011-04-07 15:04:26 -07:00
Teng-Hui Zhu
29fa50be24
am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:22:33 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
5d6f116703
Merge "Make LinkProperties comparable." into honeycomb-LTE
2011-04-07 12:44:04 -07:00
John Wang
4e900091c4
Make LinkProperties comparable.
...
Add equals() and hashcode() to LinkProperties and related fields.
Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
2011-04-07 12:36:56 -07:00
Robert Greenwalt
d55a6b498d
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Teng-Hui Zhu
2fcf82aee3
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
...
Buffering in full screen mode will show progressView
bug:4187252
Change-Id: Ia44d880ab126c2439fb13504db87492d45c90bc8
2011-04-07 09:14:16 -07:00
Teng-Hui Zhu
a9cadefde4
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
...
Add the loading progress UI when buffering
bug:4187252
Change-Id: Ifbf63b248ac5f0e340be4057e0dcd80d33483662
2011-04-07 09:14:05 -07:00
Teng-Hui Zhu
b3bb6fd5e3
am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play
2011-04-07 09:07:52 -07:00
Teng-Hui Zhu
b25181aacc
Merge "Fix the issue the video can't start to play" into honeycomb-mr1
2011-04-07 08:52:45 -07:00
Teng-Hui Zhu
0504967cb0
Fix the issue the video can't start to play
...
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
2011-04-06 18:20:19 -07:00
Adam Powell
2bb59637ca
am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
...
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:14:27 -07:00
Adam Powell
030b38ffc2
Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
2011-04-05 10:45:25 -07:00
Adam Powell
3c534772de
Fix bug 4207704 - Gestures can be lost when Flash is enabled
...
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
2011-04-04 22:06:50 -07:00
Robert Ly
6f7e4cb5ae
am 3f39f653: Adding package description for android.hardware.usb
...
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
2011-04-04 11:41:02 -07:00
Robert Ly
3f39f653a9
Adding package description for android.hardware.usb
...
Change-Id: I4d243424c6747531a1ac6ab2230c2af73bad4fed
2011-04-04 11:07:46 -07:00
Mike Lockwood
38f04c0f28
am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
...
* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
2011-04-01 11:34:39 -07:00
Mike Lockwood
11dd5ae97b
Improve Javadoc for USB Manager and MTP/PTP support.
...
Bug: 4091519
Change-Id: Ida79593d5a984f7ffd0934ae7bded23b8faf9eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-01 14:11:50 -04:00
Dianne Hackborn
a5b308e74c
am 53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
...
* commit '53df89c74fb3a31a874ad575467c5d498a53646e':
Expand screen documentation with explicit screen size dimensions.
2011-03-30 17:50:29 -07:00
Dianne Hackborn
2f98f26708
Expand screen documentation with explicit screen size dimensions.
...
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
2011-03-30 16:19:02 -07:00
Adam Powell
c8c78eed52
am baa3380d: Fix bug 4170809 - Pages with flash lose touch events
...
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
Fix bug 4170809 - Pages with flash lose touch events
2011-03-25 14:45:06 -07:00
Adam Powell
baa3380d74
Fix bug 4170809 - Pages with flash lose touch events
...
Fix WebView touch cancel behavior when we time out waiting for a
response from webkit.
Change-Id: I0aeeea64b156e204dbe2dda913a42df28704ed16
2011-03-25 13:58:19 -07:00
Teng-Hui Zhu
a7605d3b2e
am 2d09b855: Merge "When the video is not on the front, it should be paused" into honeycomb-mr1
...
* commit '2d09b855d5c0749ab845d3f2775125fea294f07c':
When the video is not on the front, it should be paused
2011-03-23 17:34:15 -07:00
Teng-Hui Zhu
1e26d82ffa
When the video is not on the front, it should be paused
...
bug:4165855
Change-Id: Icbdab81fe5beb8642841b16773b0e5350b4221cf
2011-03-23 16:56:12 -07:00
Teng-Hui Zhu
503735099d
am efb8eda4: Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
...
* commit 'efb8eda41a2dce03db0984c490c16f6a32867ded':
Make sure the full screen playing continue when timeout
2011-03-23 16:06:10 -07:00
Teng-Hui Zhu
efb8eda41a
Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1
2011-03-23 16:03:04 -07:00
Teng-Hui Zhu
2deec6651c
Make sure the full screen playing continue when timeout
...
bug:4165804
Change-Id: I5e0f4bdaecce36d074941ae6631b211227c13fcb
2011-03-23 15:29:22 -07:00
Scott Main
ee7cfaf289
am 18cd686f: am ef6b305b: docs: fix markup error
...
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
docs: fix markup error
2011-03-23 14:43:35 -07:00
Scott Main
18cd686fc8
am ef6b305b: docs: fix markup error
...
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
docs: fix markup error
2011-03-23 14:32:44 -07:00
Scott Main
ef6b305b93
docs: fix markup error
...
Change-Id: I59e379a7a36c4184862095442c53a6b9496d856e
2011-03-23 14:23:02 -07:00
Teng-Hui Zhu
2c6f2816d7
am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
...
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
fix for pause when loading
2011-03-22 13:56:35 -07:00