Commit Graph

6831 Commits

Author SHA1 Message Date
Li Zhe
0c0392faa9 am f3b8994b: am 6c6d822f: Merge change 22318 into eclair
Merge commit 'f3b8994b6630d79f566d1cf8edf891fa8914adef'

* commit 'f3b8994b6630d79f566d1cf8edf891fa8914adef':
  Framework changes to support HSDPA/HSUPA/HSPA
2009-08-21 13:48:17 -07:00
Dmitri Plotnikov
f367ba5b35 am b0ef6ca4: am 358e6e3c: Merge change 22292 into eclair
Merge commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6'

* commit 'b0ef6ca47d6f8e24b6bbf0a605c2e42000929bc6':
  Adding a "Photo" directory under Contacts.
2009-08-21 13:45:45 -07:00
Li Zhe
f3b8994b66 am 6c6d822f: Merge change 22318 into eclair
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp

* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
  Framework changes to support HSDPA/HSUPA/HSPA
2009-08-21 13:45:30 -07:00
Android (Google) Code Review
6c6d822f7b Merge change 22318 into eclair
* changes:
  Framework changes to support HSDPA/HSUPA/HSPA HSDPA: High-Speed Downlink Packet Access HSUPA: High-Speend Uplink Packet Access HSPA:  High-Speed Packet Access
2009-08-21 13:43:01 -07:00
Dmitri Plotnikov
b0ef6ca47d am 358e6e3c: Merge change 22292 into eclair
Merge commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083' into eclair-plus-aosp

* commit '358e6e3c121f8ac5ac4a2c99b9d2211dfb2d3083':
  Adding a "Photo" directory under Contacts.
2009-08-21 13:42:54 -07:00
Romain Guy
79d9e19d5f am b5a79aa3: am cc0a17cb: Merge change 22290 into eclair
Merge commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a'

* commit 'b5a79aa3e56321f5616ca560e1e7930193fd392a':
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:41:20 -07:00
Li Zhe
ebe66345e7 Framework changes to support HSDPA/HSUPA/HSPA
HSDPA: High-Speed Downlink Packet Access
HSUPA: High-Speend Uplink Packet Access
HSPA:  High-Speed Packet Access

Add support for HSDPA/HSUPA/HSPA:
 1) extend TelephonyManager.NETWORK_TYPE for HSDPA/HSUPA/HSPA
 2) extend ServiceState.RADIO_TECHNOLOGY for HSDPA/HSUPA/HSPA
 3) set radioTechnology into ServiceState in GsmServiceStateTracker
 4) change the implementation of TelephonyManager.getNetworkType to
    solve the competition timing issue between the time of setting
    system property and the time of receiving notification through
    PhoneStateListener
    4.1) add a getNetworkType interface in ITelephony.aidl
 5) add icons resources for HSDPA/HSUPA/HSPA
 6) make use of HSDPA/HSUPA/HSPA icons in StatusBarPolicy
2009-08-21 13:41:05 -07:00
Android (Google) Code Review
358e6e3c12 Merge change 22292 into eclair
* changes:
  Adding a "Photo" directory under Contacts.
2009-08-21 13:40:40 -07:00
Romain Guy
b5a79aa3e5 am cc0a17cb: Merge change 22290 into eclair
Merge commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9' into eclair-plus-aosp

* commit 'cc0a17cb08c6a6ee2f27c00b7f658e4734fdf0c9':
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:38:44 -07:00
Android (Google) Code Review
cc0a17cb08 Merge change 22290 into eclair
* changes:
  Fix typo: the x offset was assigned to the y coordinate.
2009-08-21 13:36:30 -07:00
Xavier Ducrohet
b01d4f2e03 am 53cc3b3c: am 51afbd30: Merge change 22308 into eclair
Merge commit '53cc3b3c864d51b46851f77137e2563e3782172c'

* commit '53cc3b3c864d51b46851f77137e2563e3782172c':
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:31:14 -07:00
Xavier Ducrohet
53cc3b3c86 am 51afbd30: Merge change 22308 into eclair
Merge commit '51afbd308dff8bd7accf5510e60367107d4c40a1' into eclair-plus-aosp

* commit '51afbd308dff8bd7accf5510e60367107d4c40a1':
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:28:48 -07:00
Android (Google) Code Review
51afbd308d Merge change 22308 into eclair
* changes:
  Replace fullHeight support by fullSize (height and width)
2009-08-21 13:26:19 -07:00
Jean-Baptiste Queru
56a63fedcf am 761f7934: am dd03c613: resolved conflicts for merge of 081a136d to eclair
Merge commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8'

* commit '761f79349a6019dc9f2322c3bbc66e0fa8e3b6c8':
  Remove third party support for Quick Search Box (aka global search).
2009-08-21 13:02:50 -07:00
Jean-Baptiste Queru
761f79349a am dd03c613: resolved conflicts for merge of 081a136d to eclair
Merge commit 'dd03c6135f91df6d5d9e71de1487520dc3345742' into eclair-plus-aosp

* commit 'dd03c6135f91df6d5d9e71de1487520dc3345742':
  Remove third party support for Quick Search Box (aka global search).
2009-08-21 13:01:22 -07:00
Jean-Baptiste Queru
dd03c6135f resolved conflicts for merge of 081a136d to eclair 2009-08-21 12:59:04 -07:00
Xavier Ducrohet
ad013fae0d Replace fullHeight support by fullSize (height and width)
This is useful for linearlayout in horizontal mode.
2009-08-21 12:55:59 -07:00
Anonymous Coward
081a136d25 Remove third party support for Quick Search Box (aka global search).
- @hides relevant APIs
- removes relevant javadoc
- enforces that only system apps can participate

note: general support is still there, will be easy to reenable when we are ready.
2009-08-21 12:47:14 -07:00
Jaikumar Ganesh
d7f4d90902 am 595b728a: am bfcfb7ee: Merge change 22302 into eclair
Merge commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d'

* commit '595b728a83c8ccdc8aeee30d0c46cd9dfbff9c1d':
  Set BondState to Canceled when user cancels pairing.
2009-08-21 11:57:28 -07:00
Jaikumar Ganesh
595b728a83 am bfcfb7ee: Merge change 22302 into eclair
Merge commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048' into eclair-plus-aosp

* commit 'bfcfb7eec61bd196cfd91f7b2c5715751308c048':
  Set BondState to Canceled when user cancels pairing.
2009-08-21 11:56:06 -07:00
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
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
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
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
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