48829 Commits

Author SHA1 Message Date
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
80f7c594fa am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21':
  Add external dependency API.
2011-04-07 14:22:03 -07:00
Xavier Ducrohet
65ef6e8690 am 96ac8560: am 515a08b0: Merge 59aad78e from master. do not merge.
* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
  Merge 59aad78e from master. do not merge.
2011-04-07 14:18:20 -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
Robert Greenwalt
f4a29403ae resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Eric Fischer
567882e1f9 Merge "Import revised translations." 2011-04-07 14:08:55 -07:00
Eric Fischer
34ade71cff Import revised translations.
Change-Id: I66670dc3d9c37fc3818764fa9839219208e83fbb
2011-04-07 13:51:31 -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
Jeff Brown
6181de3443 Merge "Coalesce input events that arrive faster than 333Hz." 2011-04-07 13:18:38 -07:00
Jeff Brown
4e91a180be Coalesce input events that arrive faster than 333Hz.
Some drivers report individual finger updates one at a time
instead of all at once.  When 10 fingers are down, this can
cause the framework to have to handle 10 times as many events
each with 10 times as much data.  Applications like
PointerLocation would get significantly bogged down by all
of the redundant samples.

This change coalesces samples that are closely spaced in time,
before they are dispatched, as part of the motion event batching
protocol.

Increased the size of the InputChannel shared memory buffer so
that applications can catch up faster if they accumulate a
backlog of samples.

Added logging code to help measure input dispatch and drawing
latency issues in the view hierarchy.  See ViewDebug.DEBUG_LATENCY.

Change-Id: Ia5898f781f19901d2225c529a910c32bdf4f504f
2011-04-07 13:11:16 -07:00
Robert Greenwalt
70c3d1c23b Merge "Add external dependency API." into honeycomb-LTE 2011-04-07 13:02:28 -07:00
John Wang
6d4b4901eb am 91bc0f81: am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
* commit '91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e':
  Refactor onSetupConnectionCompleted.
2011-04-07 12:48:22 -07:00
John Wang
52c858f5f0 am c343c183: am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
* commit 'c343c18376b8fd7d27a07adc5bb617d0260a8cdc':
  Make LinkProperties comparable.
2011-04-07 12:48:17 -07:00
John Wang
91bc0f818c am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE
* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
  Refactor onSetupConnectionCompleted.
2011-04-07 12:46:21 -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
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
Brian Carlstrom
46703b0995 Tolerate missing AccountManager resource, not just missing resource name
In addition to the primary change in the subject, also some minor cleanup of javadoc, typos, CloseGuard warning, etc found while working on a new AbstractAccountAuthenticator.

Change-Id: I73f3408773a43a0021a15f8d051fd3dbbdf898a5
2011-04-07 11:58:37 -07:00
Jason Sams
e651c68ee8 Merge "Migrate most GL from context to driver." 2011-04-07 11:33:11 -07:00
James Dong
c35f01dc0e Merge "Media JNI code cleanup" 2011-04-07 11:16:49 -07:00
James Dong
c371a02e7c Media JNI code cleanup
o Don't throw exception again because an exception was already thrown
o Check on return values from FindClass() and GetMethodID

Change-Id: Id92bb8228f1f0d2798d1cdf7de73cbb43816060b
related-to-bug: 4139926
2011-04-07 11:10:25 -07:00
Eric Laurent
62c1a92dc5 Merge "Do not disable effect in AudioEffect destructor." 2011-04-07 10:31:11 -07:00
Eric Laurent
b8da6cb5b2 Do not disable effect in AudioEffect destructor.
Current implementation of AudioEffect class destructor disables
the effect before disconnecting from IAudioEffect interface.
This is problematic when more than one client has a handle on the same
effect engine as destroying one handle will disable the effect which is
not the intended behavior.

Change-Id: I10eacf981506469a7ef4eb9a1650813f0848de5d
2011-04-07 09:41:46 -07:00
Wink Saville
749aaf934c am 7ff3c410: am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
* commit '7ff3c410be00776159ff7a433ce218fabf3f44c4':
  Add a 4G icon for LTE.
2011-04-07 09:38:41 -07:00
Wink Saville
7ff3c410be am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE
* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
  Add a 4G icon for LTE.
2011-04-07 09:37:06 -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
c1b4d9691d am d4e8e4bb: am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1
* commit 'd4e8e4bb3c2921ae9e15ef012bafc504b48c7efe':
  Fix the issue the video can't start to play
2011-04-07 09:24:02 -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
Daisuke Miyakawa
54fcd4c81f Add params for primary account to ContactsContract
It is intentional to not use "primary_account_name" and
"primary_account_type" here. See Issue 3510087 and 4260119

Bug: 3510087
Bug: 4260119
Change-Id: I2a22be56822226e3ea6b6f2ef23bb77816d0345a
2011-04-07 08:10:49 -07:00
Joe Onorato
fcdebf88a4 Merge changes I4011db5c,I622bc5fa
* changes:
  less logging
  A system setting for "advanced settings."
2011-04-06 18:45:14 -07:00
Joe Onorato
5385974021 less logging
Change-Id: I4011db5c2a610e741a09e4e8fee68a86175769cc
2011-04-06 18:27:43 -07:00
Joe Onorato
9cdffa1788 A system setting for "advanced settings."
Change-Id: I622bc5fa7e5cba41362acd3b25ed9d3f119c72a2
2011-04-06 18:27:27 -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
5e0ecb75dd am 004da7e2: am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
* commit '004da7e2e0287cdad63a9009841309d45f038787':
  Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:56:55 -07:00
Wink Saville
004da7e2e0 am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
  Add getCdmaSubscriptionSource to CommandsInterface.
2011-04-06 17:54:11 -07:00
Jason Sams
803626f615 Migrate most GL from context to driver.
Change-Id: I5cba3a6e879d2e9332fc667a1061a5312fcf14ba
2011-04-06 17:52:23 -07:00
Wink Saville
1b87f1db89 Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE 2011-04-06 17:52:22 -07:00
Roman Nurik
5e5f069831 am 2059bdf3: am e2b81c3e: 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 '2059bdf34793dc75448e5cb6201db6c49a3a8e18':
  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:29:06 -07:00
Roman Nurik
2059bdf347 am e2b81c3e: 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 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
  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:25:08 -07:00
Jeff Brown
ae4dd53e8d Merge "Allow batching samples onto the pending motion event." 2011-04-06 17:22:26 -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