Freeman Ng
1e2e390fc7
am 3b9089c1: new LTE prepay related values
...
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
new LTE prepay related values
2011-04-22 16:46:52 -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
a23ae0d7be
am 69ccfd7a: am ca7f30eb: am b8a57841: Merge "docs: add a little info to Configuration class description" into honeycomb
...
* commit '69ccfd7a29fc492c25dcb96dc74daf2e900118f5':
docs: add a little info to Configuration class description
2011-04-21 10:57:10 -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
3767784999
am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
...
* commit '64c42cae4482fe0157e977b8ddd0f2c2436b3f31':
Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.
2011-04-18 15:24:47 -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
0b9b8711a1
am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
43be7a6120
EthernetDataTracker: implement setDependencyMet
...
Change-Id: I4be804e3c9dccacfacb5cb813a4ad6f513224f06
2011-04-11 20:13:10 -07:00
Benoit Goby
316594715d
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -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
Jason parks
f953d3e2ea
am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
...
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
a83bc16089
am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
...
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
Wink Saville
1b00dc66d4
am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
...
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -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
2df36fd6ec
am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
...
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings
2011-04-11 11:19:18 -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
16d8de7a29
am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1
...
* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
Remove uncalled function -- java counterpart of the fix for bug:4183801
2011-04-07 17:25:56 -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
4e790ee189
am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:24:22 -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
f4a29403ae
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
c343c18376
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.
2011-04-07 12:46:18 -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
d4e8e4bb3c
am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
...
* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
Fix the issue the video can't start to play
2011-04-07 09:14:50 -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
2e68ec1bc6
am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
...
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
Fix bug 4207704 - Gestures can be lost when Flash is enabled
2011-04-05 11:27:23 -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
Jason parks
5ee250aa74
am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
Send out a broadcast that the system is being factory reset.
2011-04-04 16:43:34 -07:00
Brad Fitzpatrick
e511fb33d3
am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit '9b1b64399502af0a08beac3014f2294644753602':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 15:25:33 -07:00
Jason parks
7f506024e9
am 78a9766b: Merge "Implement teardown script." into gingerbread
...
* commit '78a9766be2a08e1f6a448bdb336f2afeff71a52b':
Implement teardown script.
2011-04-04 14:42:54 -07:00
Jeff Hamilton
7bb236c3b5
am 84d34078: Make the NFC UID forward compatible.
...
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde':
Make the NFC UID forward compatible.
2011-04-04 14:42:44 -07:00
Jason parks
1d73362597
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Robert Ly
cbfeda13e7
am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
...
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
Adding package description for android.hardware.usb
2011-04-04 11:48:51 -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