Commit Graph

2096 Commits

Author SHA1 Message Date
Android (Google) Code Review
c9065c6e84 Merge change 5385 into donut
* changes:
  Updating the TextToSpeech.java with skeleton methods.
2009-06-25 13:22:57 -07:00
Android (Google) Code Review
defcf8020d Merge change 5352 into donut
* changes:
  fix [1942438] eglGetCurrentSurface() returns bogus value
2009-06-25 13:22:55 -07:00
Android (Google) Code Review
1bc9e127d9 Merge change 5390 into donut
* changes:
  When mPreventDrag is true, don't respond to long press. This should prevent the context menu popping up in the Map sites.
2009-06-25 13:18:24 -07:00
Android (Google) Code Review
6d3252d748 am 24a4f20c: Merge change 5239 into donut
Merge commit '24a4f20c0b907babb11dd824550018cbab09b7b2'

* commit '24a4f20c0b907babb11dd824550018cbab09b7b2':
  Fix SMS Ack.
2009-06-25 13:13:47 -07:00
Android (Google) Code Review
e1b2ac977a am 35a47a6e: Merge change 5389 into donut
Merge commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a'

* commit '35a47a6eebae21738bcf9b481e0bb606328cbd1a':
  Skip spaces and tabs in readProcLines()
2009-06-25 13:13:43 -07:00
Android (Google) Code Review
53fae4c3fb Merge change 5239 into donut
* changes:
  Fix SMS Ack.
2009-06-25 13:12:30 -07:00
Android (Google) Code Review
e22b11a13e Merge change 5389 into donut
* changes:
  Skip spaces and tabs in readProcLines()
2009-06-25 13:11:18 -07:00
Android (Google) Code Review
96fcccf91c Merge change 5376
* changes:
  WifiService: Update all scan result values in our scan result cache.
2009-06-25 13:07:38 -07:00
Android (Google) Code Review
30f7aa1b0b am a1fb3950: Merge change 5394 into donut
Merge commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e'

* commit 'a1fb3950cf46f61800d2ca41d2020037d6b2307e':
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical
2009-06-25 13:04:23 -07:00
Android (Google) Code Review
2ec79d0cc0 Merge change 5394 into donut
* changes:
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical dependencies.
2009-06-25 13:02:50 -07:00
Android (Google) Code Review
a8a641fae5 am e88d8031: Merge change 4739 into donut
Merge commit 'e88d803183b4999965fd3cda856420ad69ee0a4a'

* commit 'e88d803183b4999965fd3cda856420ad69ee0a4a':
  Add PPTP, L2TP/IPSec preshared key and other fixes.
2009-06-25 12:27:21 -07:00
Android (Google) Code Review
1e29daf91b Merge change 4739 into donut
* changes:
  Add PPTP, L2TP/IPSec preshared key and other fixes.
2009-06-25 12:26:02 -07:00
Android (Google) Code Review
8255f92994 am a7251991: Merge change 5288 into donut
Merge commit 'a7251991ffb6a26e4cf23e60633c8250c78bd9df'

* commit 'a7251991ffb6a26e4cf23e60633c8250c78bd9df':
  Invoke getSystem.updateConfiguration when binding an application to
2009-06-25 12:16:48 -07:00
Android (Google) Code Review
912e5d0f38 Merge change 5288 into donut
* changes:
  Invoke getSystem.updateConfiguration when binding an application to update config changes in Resources.mSystem Since Resources is preloaded in the zygote, system resources in Resources need to be updated with config changes every time an application is started
2009-06-25 12:14:53 -07:00
Dan Egnor
39910eca45 am 6f21128d: Switch the default transport to GOOGLE.
Merge commit '6f21128d1fc949828b1a4c2a0023f07bfd280e2e'

* commit '6f21128d1fc949828b1a4c2a0023f07bfd280e2e':
  Switch the default transport to GOOGLE.
2009-06-25 12:12:30 -07:00
Android (Google) Code Review
4040015ef0 am 0bcfc537: Merge change 5386 into donut
Merge commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d'

* commit '0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d':
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is
2009-06-25 12:07:12 -07:00
Android (Google) Code Review
28d48710f1 Merge change 5386 into donut
* changes:
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is targeted.
2009-06-25 12:05:08 -07:00
Hung-ying Tyan
c0b5d8a5fe Add PPTP, L2TP/IPSec preshared key and other fixes.
* Changes
  + Add PptpProfile.java, PptpService.java.
  + Add L2tpIpsecPskProfile.java
  + Add PPTP and L2TP_IPSEC_PSK entries in VpnType.java.
  + Add the secret option to L2tpProfile.java and have L2tpIpsecProfile
    extend it.
  + Add MtpdHelper to send common PPP options.
  + Add getGatewayIp() to VpnService().
  + Revise VpnService.reallyGetHostIp().

  Patch Set 6, 7, 8:
  + Add L2TP secret flag in L2tpProfile.

  Patch Set 9:
  + Add description to VpnType.

  Patch Set 11:
  + Pass ipparam to mtpd.

  Patch Set 12:
  + Add L2TP secret support
  + Fix string constants
2009-06-26 03:02:22 +08:00
Android (Google) Code Review
45802bafc1 Merge change 5383
* changes:
  Oops, need to hide the new api.
2009-06-25 11:57:14 -07:00
Grace Kloba
5a53548800 resolved conflicts for merge of 0d8b77c2 to master 2009-06-25 11:42:46 -07:00
Android (Google) Code Review
c3d936e093 Merge change 5316
* changes:
  add Gservices setting for data messaging app token url.
2009-06-25 10:32:38 -07:00
Android (Google) Code Review
219ebad565 am d4eac5f3: Merge change 5300 into donut
Merge commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7'

* commit 'd4eac5f3840de7ddf084a36053d8e63766b4a0f7':
  Using a sendBroadcast to notify interested parties of when
2009-06-25 10:21:34 -07:00
Android (Google) Code Review
4af209f6b0 Merge change 5300 into donut
* changes:
  Using a sendBroadcast to notify interested parties of when the TTS queue has finished processing.
2009-06-25 10:20:31 -07:00
Android (Google) Code Review
33c49708b2 Merge change 5348
* changes:
  Add missing filename remap to RenamingDelegatingContext
2009-06-25 09:24:08 -07:00
Android (Google) Code Review
e54af13157 am f881762f: Merge change 5351 into donut
Merge commit 'f881762f97c74253bbc7f629380bb65739457041'

* commit 'f881762f97c74253bbc7f629380bb65739457041':
  Add a method to Process to get uid for a pid.
2009-06-25 00:47:51 -07:00
Android (Google) Code Review
e0ed7d7660 Merge change 5351 into donut
* changes:
  Add a method to Process to get uid for a pid.
2009-06-25 00:46:17 -07:00
Android (Google) Code Review
6b4855db08 am d48388ab: Merge change 5344 into donut
Merge commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca'

* commit 'd48388ab8239d2b0f4b8a9a4189fe9eeddddedca':
  frameworks/base: CDMA voicemail support
2009-06-25 00:10:18 -07:00
Android (Google) Code Review
e8503ae079 Merge change 5344 into donut
* changes:
  frameworks/base: CDMA voicemail support
2009-06-25 00:09:18 -07:00
Android (Google) Code Review
53aeca1d37 am 6184a2ad: Merge change 5339 into donut
Merge commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e'

* commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e':
  Fix intermittent crash related to call waiting
2009-06-25 00:00:31 -07:00
Mathias Agopian
f51f9c8af3 fix [1942438] eglGetCurrentSurface() returns bogus value 2009-06-24 23:59:16 -07:00
Android (Google) Code Review
7863d064fe Merge change 5339 into donut
* changes:
  Fix intermittent crash related to call waiting
2009-06-24 23:57:59 -07:00
Android (Google) Code Review
8b04323a32 am 60a0ad65: Merge change 5329 into donut
Merge commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6'

* commit '60a0ad65f4cd7dedbbd06993d107fb1b72d072c6':
  frameworks/base - CDMA settings additions
2009-06-24 23:41:00 -07:00
Android (Google) Code Review
8ceb326988 Merge change 5329 into donut
* changes:
  frameworks/base - CDMA settings additions
2009-06-24 23:39:07 -07:00
Android (Google) Code Review
8da70e8049 am c6a482e7: Merge change 5199 into donut
Merge commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112'

* commit 'c6a482e778e7b5fc5790edf22e554c93f53b1112':
  Only remove client after the hardware is teared down, so a new client
2009-06-24 20:34:35 -07:00
Android (Google) Code Review
6007b6d7fa Merge change 5199 into donut
* changes:
  Only remove client after the hardware is teared down, so a new client is rejected before old client is done.
2009-06-24 20:33:11 -07:00
Android (Google) Code Review
d54efb52ac am 83b8678d: Merge change 5319 into donut
Merge commit '83b8678dd4cc78dc89fe853161bd470ef28561c8'

* commit '83b8678dd4cc78dc89fe853161bd470ef28561c8':
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:31:09 -07:00
Android (Google) Code Review
01fb8feae5 Merge change 5319 into donut
* changes:
  Add new APIs to LauncherActivity to be used elsewhere.
2009-06-24 20:29:21 -07:00
Chih-Chung Chang
d2d6bc7552 Only remove client after the hardware is teared down, so a new client
is rejected before old client is done.

Also check mUsers in all cases to make sure there are no existing client.
2009-06-25 11:03:55 +08:00
Android (Google) Code Review
2ff5c78161 Merge change 4292
* changes:
  Moved owning package and restricted flag to Contact.
2009-06-24 19:51:29 -07:00
Jack Palevich
df0be3d154 am c7410f6f: Add includes to enable host C++ tools to compile with GCC 4.4
Merge commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190'

* commit 'c7410f6f9f8f2aeb9368502a4a725b1a7abe1190':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:35:14 -07:00
Android (Google) Code Review
3d377e3468 am ad39eb0a: Merge change 5302 into donut
Merge commit 'ad39eb0a2555762a1d9157f8017097579d14f39d'

* commit 'ad39eb0a2555762a1d9157f8017097579d14f39d':
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:15:57 -07:00
Android (Google) Code Review
d5b7ba2daf Merge change 5302 into donut
* changes:
  Add includes to enable host C++ tools to compile with GCC 4.4
2009-06-24 19:14:17 -07:00
Android (Google) Code Review
8e5a0e87fe am 5416d7c9: Merge change 5317 into donut
Merge commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2'

* commit '5416d7c905e723a978ac29ccaf22a91b76e9d5c2':
  Start backing up wallpaper
2009-06-24 18:48:39 -07:00
Android (Google) Code Review
1fe7737153 Merge change 5317 into donut
* changes:
  Start backing up wallpaper
2009-06-24 18:46:59 -07:00
Android (Google) Code Review
6ebed66004 am 7941e903: Merge change 5091 into donut
Merge commit '7941e903c973af66075bbd4fa4bcadf021a61ccc'

* commit '7941e903c973af66075bbd4fa4bcadf021a61ccc':
  * new screen resolution support impl.
2009-06-24 17:56:05 -07:00
Android (Google) Code Review
3e6438995b Merge change 5091 into donut
* changes:
  * new screen resolution support impl.   * use full window for activities, and shift & clip the content   * refactored the compatibility code, and introdcued Translator class to handle cooridnate translations.   * removed a workaround to handle an activity with configChagne=rotation in old implementation.   * I'll fix background issue on rotation in next CL.
2009-06-24 17:53:57 -07:00
Android (Google) Code Review
c571dc43c0 am 69e1f472: Merge change 5289 into donut
Merge commit '69e1f472c33e241f729c470285a5680866ede75c'

* commit '69e1f472c33e241f729c470285a5680866ede75c':
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:39:19 -07:00
Android (Google) Code Review
7feb4cb790 am 67669c9c: Merge change 5196 into donut
Merge commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7'

* commit '67669c9c1753b062fe2a71f89b589d01b32ba0f7':
  Modify the IBackupTransport API to support bulk restore operations.
2009-06-24 17:39:15 -07:00
Android (Google) Code Review
d7a055a03f Merge change 5289 into donut
* changes:
  Fix TextView's fading edge when compound drawables are setup.
2009-06-24 17:18:48 -07:00
Charles Chen
46bc681cad resolved conflicts for merge of 5158cc55 to master 2009-06-24 16:54:35 -07:00