3808 Commits

Author SHA1 Message Date
Grace Kloba
2b2e9d9152 Need to write the correct float math. 2009-06-25 14:43:53 -07:00
Mathias Agopian
864c0d50cd move ui/Time.cpp to core/jni, since this is the only place it is used 2009-06-25 14:39:56 -07:00
Evan Millar
c043752ca3 Adds precedence information to the CommonDataKinds.Im class.
There is now a method getPresencePrecedence() that returns an integer
representing the precedence of a presence status, 1 being the highest
prcedence.
2009-06-25 14:38:32 -07:00
Android (Google) Code Review
f5c50bab4a Merge change 5402
* changes:
  Settings: Add preference to enable/disable assisted GPS.
2009-06-25 14:34:58 -07:00
Android (Google) Code Review
a645143c16 am eb3ec64a: Merge change 5397 into donut
Merge commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc'

* commit 'eb3ec64a6a962aa48a46753c6e69ce24f889a4cc':
  Fixes #1943915. Prevents circular dependency exception when using several NO_ID
2009-06-25 14:33:58 -07:00
Android (Google) Code Review
831e0ff278 am 78fb3775: Merge change 5385 into donut
Merge commit '78fb3775ee20c48980a3cfe00b8a7263422158d0'

* commit '78fb3775ee20c48980a3cfe00b8a7263422158d0':
  Updating the TextToSpeech.java with skeleton methods.
2009-06-25 14:33:52 -07:00
Android (Google) Code Review
09c65522e4 am c6f36ed5: Merge change 5352 into donut
Merge commit 'c6f36ed547e7f480ea2484cc378698d4205b3155'

* commit 'c6f36ed547e7f480ea2484cc378698d4205b3155':
  fix [1942438] eglGetCurrentSurface() returns bogus value
2009-06-25 14:33:48 -07:00
Jean-Michel Trivi
87c9684fd0 Add caching of the speech rate and language in android.speech.tts.TextToSpeech
so the speech params can be passed along in calls for text synthesis.
2009-06-25 14:29:15 -07:00
Grace Kloba
959046c3aa resolved conflicts for merge of 7cb8182e to master 2009-06-25 14:28:04 -07:00
Mike Lockwood
bcab8df83e Settings: Add preference to enable/disable assisted GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-25 17:15:32 -04:00
Fred Quintana
8b81160054 add a new error code ERROR_CODE_BAD_REQUEST 2009-06-25 13:49:17 -07:00
Android (Google) Code Review
eb3ec64a6a Merge change 5397 into donut
* changes:
  Fixes #1943915. Prevents circular dependency exception when using several NO_ID views.
2009-06-25 13:32:52 -07:00
Romain Guy
1ab621e316 Fixes #1943915. Prevents circular dependency exception when using several NO_ID
views.
2009-06-25 13:31:57 -07:00
Android (Google) Code Review
78fb3775ee 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
c6f36ed547 Merge change 5352 into donut
* changes:
  fix [1942438] eglGetCurrentSurface() returns bogus value
2009-06-25 13:22:55 -07:00
Android (Google) Code Review
7cb8182e36 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
80e90c5fac 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
cf946df3f7 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
24a4f20c0b Merge change 5239 into donut
* changes:
  Fix SMS Ack.
2009-06-25 13:12:30 -07:00
Android (Google) Code Review
35a47a6eeb Merge change 5389 into donut
* changes:
  Skip spaces and tabs in readProcLines()
2009-06-25 13:11:18 -07:00
jsh
3960ced463 Fix SMS Ack.
There were a few places where we were not sending SMS ack.  This change fixes that, and helps ensure that we don't miss any others.

Also fix a bug I introduced in RIL.java for CDMA SMS ACK (it uses RIL_CDMA_SMS_Ack and not int[]).
2009-06-25 13:08:08 -07:00
Android (Google) Code Review
1af846b979 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
94e942107b 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
a1fb3950cf Merge change 5394 into donut
* changes:
  Fixes #1940605. RelativeLayout was swapping horizontal and vertical dependencies.
2009-06-25 13:02:50 -07:00
Romain Guy
e24ef6032f Fixes #1940605. RelativeLayout was swapping horizontal and vertical
dependencies.
2009-06-25 13:01:55 -07:00
Android (Google) Code Review
2bdd7d816a 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
e88d803183 Merge change 4739 into donut
* changes:
  Add PPTP, L2TP/IPSec preshared key and other fixes.
2009-06-25 12:26:02 -07:00
Grace Kloba
6c451b766d 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 12:25:30 -07:00
Amith Yamasani
add868ceba Skip spaces and tabs in readProcLines()
This is to fix a problem in the parsing of /proc/pid/status file.
2009-06-25 12:24:56 -07:00
Android (Google) Code Review
9c71fc972e 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
a7251991ff 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
e0ef37b8e5 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
Dan Egnor
6f21128d1f Switch the default transport to GOOGLE. 2009-06-25 12:07:58 -07:00
Android (Google) Code Review
6800050876 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
0bcfc537e8 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
Romain Guy
b8f8de8516 Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is
targeted.
2009-06-25 12:03:56 -07:00
Hung-ying Tyan
d3aba7f7b6 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
Charles Chen
aaf842edbf Updating the TextToSpeech.java with skeleton methods. 2009-06-25 11:59:29 -07:00
Android (Google) Code Review
7e89f8eb86 Merge change 5383
* changes:
  Oops, need to hide the new api.
2009-06-25 11:57:14 -07:00
Grace Kloba
9994127562 Oops, need to hide the new api. 2009-06-25 11:55:08 -07:00
Suchi Amalapurapu
c984329d30 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 11:43:53 -07:00
Grace Kloba
d1ebf538a9 resolved conflicts for merge of 0d8b77c2 to master 2009-06-25 11:42:46 -07:00
Grace Kloba
0d8b77c245 Add ZoomDensity so that we can change the desired default scale.
Fix a bug where we didn't adjust the viewport scale according to our density.
2009-06-25 11:20:51 -07:00
Android (Google) Code Review
c889f13ec0 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
23f584438c 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
d4eac5f384 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
Mike Lockwood
1a645058a8 WifiService: Update all scan result values in our scan result cache.
Previously only the level was being updated, resulting in out of date values
being left in the cache.
Patch was provided by Motorola.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-06-25 13:01:12 -04:00
Wei Huang
8ad2246edd add Gservices setting for data messaging app token url. 2009-06-25 10:00:15 -07:00
Grace Kloba
e64c5567de Fix for the new webkit. Now "expires" takes the string instead of int.
We have to upadte our cache database. Good thing is Gears can avoid the expensive date conversion.
2009-06-25 09:48:39 -07:00
Android (Google) Code Review
7822de554a Merge change 5348
* changes:
  Add missing filename remap to RenamingDelegatingContext
2009-06-25 09:24:08 -07:00