Dmitri Plotnikov
693d50e7ae
Moving send-to-voicemail and ringtone-uri up to the aggregate level.
2009-06-25 16:38:06 -07:00
Android (Google) Code Review
8df2770995
Merge change 5234
...
* changes:
Adds precedence information to the CommonDataKinds.Im class.
2009-06-25 16:22:08 -07:00
Christopher Tate
7f94b60c6d
am 5cb400bd: Keep track of backup state independently for each transport
...
Merge commit '5cb400bd72726c22f641f334951b35ce2ddcfeef'
* commit '5cb400bd72726c22f641f334951b35ce2ddcfeef':
Keep track of backup state independently for each transport
2009-06-25 16:15:54 -07:00
Android (Google) Code Review
8bf2f6806d
am 2f437b4c: Merge change 5434 into donut
...
Merge commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370'
* commit '2f437b4c56db1750cc6cb3d1ad549a79049b6370':
Adding splitting to the TTS to guard against extremely long strings.
2009-06-25 16:10:22 -07:00
Christopher Tate
5cb400bd72
Keep track of backup state independently for each transport
...
Backup transports now provide the Backup Manager with a suggested name with
which it can disambiguate any transport-specific bookkeeping that it needs to
maintain. The Manager keeps separate application backup 'state blobs' for each
transport now, preventing things from getting out of step if the device is
switched among multiple transports.
Also, the metadata backup agent is always invoked now on each backup pass. This
is cheap when there is nothing to do, but also strongly ensures that we never
wind up in a situation where a given transport destination has not been given
all of the metadata necessary for the backup set.
2009-06-25 16:09:03 -07:00
Android (Google) Code Review
2f437b4c56
Merge change 5434 into donut
...
* changes:
Adding splitting to the TTS to guard against extremely long strings.
2009-06-25 16:08:14 -07:00
Charles Chen
1aacdcfaa9
Adding splitting to the TTS to guard against extremely long strings.
2009-06-25 16:00:13 -07:00
Android (Google) Code Review
a2071618a0
am 6067d953: Merge change 5428 into donut
...
Merge commit '6067d953d7c6c0216a383fe520222fa6a23926fa'
* commit '6067d953d7c6c0216a383fe520222fa6a23926fa':
Improve handling of FILL_PARENT in RelativeLayout.
2009-06-25 15:30:46 -07:00
Android (Google) Code Review
6067d953d7
Merge change 5428 into donut
...
* changes:
Improve handling of FILL_PARENT in RelativeLayout.
2009-06-25 15:28:10 -07:00
Romain Guy
f782e60efc
Improve handling of FILL_PARENT in RelativeLayout.
...
This was causing trouble with VideoView, in Gallery in particular.
2009-06-25 15:26:49 -07:00
Android (Google) Code Review
1f7300818f
am c44989d6: Merge change 5350 into donut
...
Merge commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e'
* commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e':
move ui/Time.cpp to core/jni, since this is the only place it is used
2009-06-25 15:11:09 -07:00
Android (Google) Code Review
c44989d6c7
Merge change 5350 into donut
...
* changes:
move ui/Time.cpp to core/jni, since this is the only place it is used
2009-06-25 15:09:44 -07:00
Android (Google) Code Review
98c600eb35
am 2450173b: Merge change 5414 into donut
...
Merge commit '2450173b78b27ca744e5d2e58efa35560ce73f8c'
* commit '2450173b78b27ca744e5d2e58efa35560ce73f8c':
Add caching of the speech rate and language in android.speech.tts.TextToSpeech
2009-06-25 14:59:50 -07:00
Android (Google) Code Review
2450173b78
Merge change 5414 into donut
...
* changes:
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:58:51 -07:00
Android (Google) Code Review
5afeaff164
am c4e0ff75: Merge change 5417 into donut
...
Merge commit 'c4e0ff750e98dfec61aff76f22743d819189f802'
* commit 'c4e0ff750e98dfec61aff76f22743d819189f802':
Fixes #1943309 . RelativeLayout was confused by gravities.
2009-06-25 14:52:04 -07:00
Android (Google) Code Review
c4e0ff750e
Merge change 5417 into donut
...
* changes:
Fixes #1943309 . RelativeLayout was confused by gravities.
2009-06-25 14:49:23 -07:00
Romain Guy
f7dabb088a
Fixes #1943309 . RelativeLayout was confused by gravities.
...
RelativeLayout, when measured with AT_MOST, was applying the gravity on its
children way too early. This caused the RL to set its measured size to
a value that was larger than necessary. This fixes the issue by deferring
the positioning of the gravity-dependent children until the dimensions
of the layout are known.
2009-06-25 14:47:14 -07:00
Android (Google) Code Review
d76cd5ebbc
am 15760159: Merge change 5413 into donut
...
Merge commit '157601594fc7139a45ec43a860d36ee0045d0333'
* commit '157601594fc7139a45ec43a860d36ee0045d0333':
Need to write the correct float math.
2009-06-25 14:45:45 -07:00
Android (Google) Code Review
157601594f
Merge change 5413 into donut
...
* changes:
Need to write the correct float math.
2009-06-25 14:44:38 -07:00
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