Commit Graph

38903 Commits

Author SHA1 Message Date
Android (Google) Code Review
bfcfb7eec6 Merge change 22302 into eclair
* changes:
  Set BondState to Canceled when user cancels pairing.
2009-08-21 11:54:15 -07:00
Jaikumar Ganesh
397d8f4f48 Set BondState to Canceled when user cancels pairing. 2009-08-21 11:51:12 -07:00
Dmitri Plotnikov
eb1a2ec4b2 Adding a "Photo" directory under Contacts. 2009-08-21 11:11:19 -07:00
Romain Guy
07ef599b9f Fix typo: the x offset was assigned to the y coordinate.
Also remove a couple of useless casts.
2009-08-21 10:40:49 -07:00
Libin Tang
7850cdde66 Fix +NANP issue and cleanup plus code conversion.
This patch includes the plus code conversion clean up.
1. change the plus code conversion based on the current and default
   number systems retrieved from MCC.
2. for format such as +NANP, replace the '+' with the current IDP (011).
3. comments changes.
2009-08-21 10:26:58 -07:00
Jean-Baptiste Queru
fe484346f9 am 1afb1cd3: merge from open-source master
Merge commit '1afb1cd3875afb2f53a413d9bb5a16adba01e261'

* commit '1afb1cd3875afb2f53a413d9bb5a16adba01e261':
  Fixed errors javadoc tags
  Ignore pause and seek for live streaming.
2009-08-21 10:23:37 -07:00
Jean-Baptiste Queru
1afb1cd387 merge from open-source master 2009-08-21 10:19:09 -07:00
Guo-Bin Zhang
775ad38ab7 am c813129f: Merge change 22282 into eclair
Merge commit 'c813129fe7317c45e07211cd285c614e8b319ca7'

* commit 'c813129fe7317c45e07211cd285c614e8b319ca7':
  Fix Calling screen shows "In Call" on pressing mute button
2009-08-21 09:59:15 -07:00
Android (Google) Code Review
c813129fe7 Merge change 22282 into eclair
* changes:
  Fix Calling screen shows "In Call" on pressing mute button
2009-08-21 09:55:41 -07:00
Yong Zhang
472c7529b4 am 475ead0c: Merge change 22281 into eclair
Merge commit '475ead0c5107b620d487c1ed4298a3f6671fc2b2'

* commit '475ead0c5107b620d487c1ed4298a3f6671fc2b2':
  Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker
2009-08-21 09:55:37 -07:00
Android (Google) Code Review
475ead0c51 Merge change 22281 into eclair
* changes:
  Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker
2009-08-21 09:50:48 -07:00
Android Code Review
34d7fd715f Merge change 10274
* changes:
  Ignore pause and seek for live streaming.
2009-08-21 06:23:31 -07:00
Romain Guy
1c92706e68 am 5df4494c: Remove unused field from PhoneWindow.DecorView.
Merge commit '5df4494c6ca3cf2e90dc6612234b8a40980a217a'

* commit '5df4494c6ca3cf2e90dc6612234b8a40980a217a':
  Remove unused field from PhoneWindow.DecorView.
2009-08-21 00:32:27 -07:00
Romain Guy
8e9a594936 Remove unused field from PhoneWindow.DecorView. 2009-08-20 23:34:42 -07:00
Dianne Hackborn
9bbbc1a673 am 3be63c09: Infrastructure for supporting wallpaper previews.
Merge commit '3be63c09309b21c01b535271625d4c39045690e5'

* commit '3be63c09309b21c01b535271625d4c39045690e5':
  Infrastructure for supporting wallpaper previews.
2009-08-20 20:39:32 -07:00
Dianne Hackborn
f4680a4f31 am 0257f52e: Update to implement new APIs.
Merge commit '0257f52edc7f718d9598fd54d3a5580255f329b9'

* commit '0257f52edc7f718d9598fd54d3a5580255f329b9':
  Update to implement new APIs.
2009-08-20 20:39:24 -07:00
Dianne Hackborn
3be63c0930 Infrastructure for supporting wallpaper previews.
Various things that will allow us to show previews of wallpapers.
Also some fixes to animations across wallpapers.
2009-08-20 20:34:42 -07:00
Xavier Ducrohet
6766894a09 am e13ec26e: Merge change 22135 into eclair
Merge commit 'e13ec26e6cab65831eefbd7b3c7aeee9ea714c91'

* commit 'e13ec26e6cab65831eefbd7b3c7aeee9ea714c91':
  Support full length rendering.
2009-08-20 20:29:03 -07:00
Android (Google) Code Review
e13ec26e6c Merge change 22135 into eclair
* changes:
  Support full length rendering.
2009-08-20 20:25:28 -07:00
Fred Quintana
0b7c89072f am be8b7763: Merge change 22178 into eclair
Merge commit 'be8b77636be041754e646f3ea03d8f2f858f9e05'

* commit 'be8b77636be041754e646f3ea03d8f2f858f9e05':
  - add a reset to EntityIterator to allow it to go back to the beginning
2009-08-20 20:07:22 -07:00
Android (Google) Code Review
be8b77636b Merge change 22178 into eclair
* changes:
  - add a reset to EntityIterator to allow it to go back to the beginning - clean up the debug printing of SyncResult
2009-08-20 20:02:37 -07:00
Bob Lee
92af1a4bf7 am 5dc0c002: am e97c2006: Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
Merge commit '5dc0c00258f90a546efcfdeca87f8e57c5a07a54'

* commit '5dc0c00258f90a546efcfdeca87f8e57c5a07a54':
  Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
2009-08-20 19:36:36 -07:00
Dianne Hackborn
93a0a5f2ca Update to implement new APIs. 2009-08-20 19:33:02 -07:00
Bob Lee
5dc0c00258 am e97c2006: Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
Merge commit 'e97c2006bf7c391c933307e520a392e532aa5d6a' into eclair

* commit 'e97c2006bf7c391c933307e520a392e532aa5d6a':
  Updated Browser and MCS to use shared default trust manager instead of initializing their own copies.
2009-08-20 19:31:59 -07:00
Mathias Agopian
d4382e5279 am 4717cace: Merge change 22222 into eclair
Merge commit '4717caceb95a2c5edc055fbf9e7a2ae53afd5278'

* commit '4717caceb95a2c5edc055fbf9e7a2ae53afd5278':
  fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
2009-08-20 19:16:47 -07:00
Android (Google) Code Review
4717caceb9 Merge change 22222 into eclair
* changes:
  fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
2009-08-20 19:12:51 -07:00
Mathias Agopian
82fd4fce16 fix a bug in ComponentSizeChooser where it could pick a software EGLConfig instead of a better h/w one.
We now just try to honor the stencil / depth buffer "at least", while doing a "shortest distance" on the colors.
2009-08-20 19:09:34 -07:00
Bob Lee
e97c2006bf Updated Browser and MCS to use shared default trust manager instead of initializing their own copies. 2009-08-20 18:48:31 -07:00
Guang Zhu
b44740c8fa am 89668bd2: Merge change 22208 into eclair
Merge commit '89668bd25e78dcae302a8815c756f3024f75643d'

* commit '89668bd25e78dcae302a8815c756f3024f75643d':
  Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:26:25 -07:00
Android (Google) Code Review
89668bd25e Merge change 22208 into eclair
* changes:
  Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces.
2009-08-20 18:22:07 -07:00
Guang Zhu
5080b6736e Fixed the missing EOL in last line of crashed tests list file. Also fixed some whitespaces. 2009-08-20 18:20:46 -07:00
Yong Zhang
25254db31a Delay radio reset to wait for data cleanup in CdmaDataConnectionTracker
Issue to be addressed:
In radioRestart() method in CdmaDataConnectionTracker, if the radio is
restarted right after cleaning up connection, it is possible that the
connection setup request triggered by radio-on may happen before the
connection cleanup has been completed so that the connection may not
be set up correctly after the radio is restarted. The end result could
be that the phone lost the data capability.

The patch includes the following changes:
1) Add EVENT_RESTART_RADIO in DataConnectionTracker.
2) In CdmaDataConnectionTracker, method restartRadio(), send a message
   delayed by 20s, the purpose of which is to wait for connection cleanup
   to be completed, then to restart radio.
3) In CdmaDataConnectionTracker, method trySetupData(), don't try to setup
   data if there is pending message to restart radio.

Addtional notes:
   A system property is not used to config the delayed timer because we
   think this fix is to address the unusual error case and waiting for
   long time should not impact user experience much. 12s is the longest
   time to complete the data cleanup as we have seen so far, so we are
   using a 20s timer.
2009-08-20 18:16:02 -07:00
Guo-Bin Zhang
5abc78405f Fix Calling screen shows "In Call" on pressing mute button
Send a flash command to CDMA network for putting the other party on hold.
For CDMA networks which do not support this the user would just hear a beep
from the network.
For CDMA networks which do support this, it will put the other party on hold.
2009-08-20 17:40:40 -07:00
Jason Sams
8b0b85aedb am 41ceb907: Merge change 22186 into eclair
Merge commit '41ceb907b5d13ee58759022ac8d830b04686baba'

* commit '41ceb907b5d13ee58759022ac8d830b04686baba':
  Allow null to be re-bound as a root script.  This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:28:19 -07:00
Android (Google) Code Review
41ceb907b5 Merge change 22186 into eclair
* changes:
  Allow null to be re-bound as a root script.  This was always legal from native and just a limitation of the java binding for the API.
2009-08-20 17:24:52 -07:00
Jason Sams
d8e4161f11 Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API. 2009-08-20 17:22:40 -07:00
Fred Quintana
77709755b7 - add a reset to EntityIterator to allow it to go back to the beginning
- clean up the debug printing of SyncResult
2009-08-20 17:18:58 -07:00
Evan Millar
48b3540e6b am 9468f800: Merge change 22086 into eclair
Merge commit '9468f8006d56789cb8912459dd3e899529995297'

* commit '9468f8006d56789cb8912459dd3e899529995297':
  Tweak the ContactsHeaderWidget to match the newest specs.
2009-08-20 17:16:40 -07:00
Android (Google) Code Review
9468f8006d Merge change 22086 into eclair
* changes:
  Tweak the ContactsHeaderWidget to match the newest specs.
2009-08-20 17:12:43 -07:00
Romain Guy
662d05364e am 75e6c771: Merge change 22169 into eclair
Merge commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be'

* commit '75e6c77139dac6bc8f408e3e3a1c87bbfe8078be':
  Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:12:19 -07:00
Jason Sams
f0e50f12eb am d57ca2de: Merge change 22163 into eclair
Merge commit 'd57ca2deff2a3d7e346043d39d9245a578b691a2'

* commit 'd57ca2deff2a3d7e346043d39d9245a578b691a2':
  Point Sprites
2009-08-20 17:12:17 -07:00
Android (Google) Code Review
75e6c77139 Merge change 22169 into eclair
* changes:
  Cleanup the Galaxy, add a few RS functions for Grass.
2009-08-20 17:08:54 -07:00
Romain Guy
d22fff7185 Cleanup the Galaxy, add a few RS functions for Grass. 2009-08-20 17:08:33 -07:00
Android (Google) Code Review
d57ca2deff Merge change 22163 into eclair
* changes:
  Point Sprites
2009-08-20 16:53:25 -07:00
Amith Yamasani
21af9cc3d5 am 4e297203: Merge change 22154 into eclair
Merge commit '4e297203ec2f44dcce58bbe4c3600a08f8a322ea'

* commit '4e297203ec2f44dcce58bbe4c3600a08f8a322ea':
  Fix fastscroll overlay size on WVGA by using dip.
2009-08-20 16:52:46 -07:00
Android (Google) Code Review
4e297203ec Merge change 22154 into eclair
* changes:
  Fix fastscroll overlay size on WVGA by using dip.
2009-08-20 16:49:25 -07:00
Amith Yamasani
1ffaebc41b Fix fastscroll overlay size on WVGA by using dip.
Move constant dimensions to resources.
2009-08-20 16:15:46 -07:00
Jason Sams
25ffcdc9d7 Point Sprites 2009-08-20 16:11:03 -07:00
Eric Fischer
227f0b58e8 am ac81c429: (-s ours) am b7aec912: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'ac81c42971ddcd0726c4f2050fd82942914d0e1c'

* commit 'ac81c42971ddcd0726c4f2050fd82942914d0e1c':
  Import revised translations.  DO NOT MERGE
2009-08-20 16:06:19 -07:00
Scott Main
aadd44e18a am a10f45ef: (-s ours) am 185d74ba: Merge change 21977 into donut
Merge commit 'a10f45efbc400ccd241c34c5c6d52c3982baf3ae'

* commit 'a10f45efbc400ccd241c34c5c6d52c3982baf3ae':
  docs only.
2009-08-20 16:06:17 -07:00