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
Wink Saville
7183a7a584
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
2011-04-07 16:49:02 -07:00
Bill Gruber
216d98949d
am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:14:54 -07:00
Bill Gruber
6bb8b0ecb5
am afecd1e9: IAB docs--status codes fix Bug: 4208641
...
* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug: 4208641
2011-04-07 15:09:33 -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
Wink Saville
1dd2ada5cf
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
...
Added CommandsInterface.registerForRilConnected which allows components
to register for when the ril connects and provides the version of the
ril to the registrants or a -1 if the ril disconnects.
For ril version 6 RIL.setupDataCall needs to have RadioTechnology + 2
as the radioTechnology parameter when the rilVersion is >= 6.
DataConnection then uses registersForRilConnected to get the ril
version and provide the proper radioTechnology value to
RIL.setupDataCall
Change-Id: Iacba764b9e38a4a138d186ccf1625fea760cc56d
2011-04-07 14:34:29 -07:00
Bill Gruber
afecd1e992
IAB docs--status codes fix
...
Bug: 4208641
Change-Id: I91d4448b62950579081a7ec99f4a39237140d299
2011-04-07 14:30:38 -07:00
Wink Saville
9e7a5a1e56
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
2011-04-07 14:28:06 -07:00
Wink Saville
975c8488a3
ConnectivityService needs to use the new names for the NetConfig vars.
...
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -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
Teng-Hui Zhu
bb55777be1
Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
...
* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
2011-04-07 14:17:52 -07:00
Xavier Ducrohet
96ac85607b
am 515a08b0: Merge 59aad78e from master. do not merge.
...
* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
Merge 59aad78e from master. do not merge.
2011-04-07 13:38:13 -07:00
Robert Greenwalt
70c3d1c23b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
574d3c4b2c
Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
2011-04-07 12:44:14 -07:00
John Wang
5d6f116703
Merge "Make LinkProperties comparable." into honeycomb-LTE
2011-04-07 12:44:04 -07:00
John Wang
d3ba7d5bec
Refactor onSetupConnectionCompleted.
...
Refactor the part of setting linkProperties based
on data call responses.
Bug:3501569
Change-Id: I02bf0558e2f8a5924197b8c06f19673279dec815
2011-04-07 12:37:05 -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
Xavier Ducrohet
515a08b018
Merge 59aad78e from master. do not merge.
...
LayoutLib: don't render when shader's local matrix is set to 0 scale.
Change-Id: I02c0ddd856026357f468dcc8b81e0520470118de
2011-04-07 12:02:31 -07:00
Wink Saville
add3109178
Merge "Add a 4G icon for LTE." into honeycomb-LTE
2011-04-07 09:35:18 -07:00
Wink Saville
3cdff0ba67
Add a 4G icon for LTE.
...
This replaces an icon which said 3g and as such was
useful. This needs to be replaced with an official
icon but is better than the current version.
bug: 4260327
Change-Id: I59674464d510ae205020008383d60a984db2c9d0
2011-04-07 09:32: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
Wink Saville
1b87f1db89
Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
2011-04-06 17:52:22 -07:00
Roman Nurik
e2b81c3e88
am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
...
* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
2011-04-06 17:21:21 -07:00
Roman Nurik
b17cc8a83f
Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1
2011-04-06 17:18:47 -07:00
Wink Saville
d31fdf0565
Add getCdmaSubscriptionSource to CommandsInterface.
...
This was accidentally not added previously and it had an
extra parameter.
Change-Id: Ic48ab9e637a5343b63d3e03377acd2679b0f77e0
2011-04-06 16:55:39 -07:00
Roman Nurik
c8754f3479
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.
...
Change-Id: I2a1a4b31fe546eddfb8d6e8b8ab5f4a3900734d4
2011-04-06 16:25:26 -07:00
Eric Fischer
ad3bddab92
am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE
2011-04-06 14:12:31 -07:00
Eric Fischer
9f2f650f26
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-04-06 14:09:32 -07:00
Bill Gruber
2811358f68
am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
IAB docs: fixes line break issues
2011-04-06 13:58:34 -07:00
Eric Fischer
6d5f5faae0
Import revised translations. DO NOT MERGE
...
Change-Id: I30c20fa78fc821c943d947a058f482e87d70dbd6
2011-04-06 13:47:57 -07:00
Bill Gruber
3bd373079e
am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb
...
* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues
2011-04-06 13:20:27 -07:00
Bill Gruber
48a1b52bc7
Merge "IAB docs: fixes line break issues" into honeycomb
2011-04-06 12:52:41 -07:00
Xavier Ducrohet
73dc260289
am c5aeac7f: LayoutLib: Fix issue with rendering mode.
...
* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
LayoutLib: Fix issue with rendering mode.
2011-04-06 12:41:17 -07:00
Xavier Ducrohet
c5aeac7f15
LayoutLib: Fix issue with rendering mode.
...
When the layout content is embedded inside a decor layout
to emulate system bar (top or bottom) and title bar (or action bar)
then the code computing the full required size based on the RenderingMode
would fail because the decor layout would prevents the content layout to
take as much room as possible.
There is also an issue with the way we know render dialogs as the
dialogs usually as a frame with some padding and the previous measurements
would not take into account the dialog padding when increasing the
screen size.
This fix makes the code measure the size of the content layout in the
normal rendering, and then separately from the root layout with the proper
MeasureSpec to let the content grown. The difference in size is then added
to the screen size.
Bug: http://code.google.com/p/android/issues/detail?id=15892
Change-Id: Ibb9ca2a67c6c450d10d9f9a8050536e094650f8b
2011-04-05 20:45:48 -07:00
Bill Gruber
0a8084d78f
IAB docs: fixes line break issues
...
Change-Id: Iad795520a4544638bd26c354b4a8718afb28646a
2011-04-05 15:54:21 -07:00
Scott Main
c70d483f4b
am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs
...
* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
docs: fix the TOC in a few docs
2011-04-05 14:28:23 -07:00
Scott Main
e4cafabbcc
am a90eb8fe: docs: fix the TOC in a few docs
...
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
docs: fix the TOC in a few docs
2011-04-05 14:21:36 -07:00
Scott Main
a90eb8fec1
docs: fix the TOC in a few docs
...
Change-Id: Iff2b91701ba39e17cc0d88804f3eb3f658e13c27
2011-04-05 14:05:03 -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
Bill Gruber
f0d2c1c4eb
am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb
...
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
SDK doc updates
2011-04-04 17:31:23 -07:00
Bill Gruber
63ac03794d
am d36bc32e: Merge "SDK doc updates" into honeycomb
...
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates
2011-04-04 17:21:25 -07:00
Bill Gruber
d36bc32ea9
Merge "SDK doc updates" into honeycomb
2011-04-04 17:15:08 -07:00