OSDN Git Service
-b master [Tue, 7 Jul 2009 00:44:41 +0000 (17:44 -0700)]
resolved conflicts for merge of
b7195159 to master
Android (Google) Code Review [Tue, 7 Jul 2009 00:32:09 +0000 (17:32 -0700)]
Merge change 6287 into donut
* changes:
Restore GPS state and ringer/vibrate toggles.
Amith Yamasani [Mon, 6 Jul 2009 21:53:25 +0000 (14:53 -0700)]
Restore GPS state and ringer/vibrate toggles.
Inform backup manager when sync flags change. Set ringer/vibrate mode.
Romain Guy [Tue, 7 Jul 2009 00:10:41 +0000 (17:10 -0700)]
am
870e09fc: Fixes #
1963229. Introduces Context#isRestricted().
Merge commit '
870e09fcd2dfdc12ac318962efd28b0420c562bb'
* commit '
870e09fcd2dfdc12ac318962efd28b0420c562bb':
Fixes #
1963229. Introduces Context#isRestricted().
Romain Guy [Mon, 6 Jul 2009 23:35:25 +0000 (16:35 -0700)]
Fixes #
1963229. Introduces Context#isRestricted().
A restricted Context is a special type of Context that prevents specific features
from being used. For instance, android:onClick, used by View, can be dangerous when
used from within apps widgets. By using a restricted Context to inflate apps widgets,
widgets providers are prevented from using android:onClick.
Android (Google) Code Review [Mon, 6 Jul 2009 23:29:05 +0000 (16:29 -0700)]
am
453dd50e: Merge change 6307 into donut
Merge commit '
453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'
* commit '
453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
Fixes a compatibility issue with users that have the old TTS
Android (Google) Code Review [Mon, 6 Jul 2009 23:28:03 +0000 (16:28 -0700)]
Merge change 6307 into donut
* changes:
Fixes a compatibility issue with users that have the old TTS installed already.
Charles Chen [Mon, 6 Jul 2009 23:10:32 +0000 (16:10 -0700)]
Fixes a compatibility issue with users that have the old TTS
installed already.
Android (Google) Code Review [Mon, 6 Jul 2009 23:00:27 +0000 (16:00 -0700)]
am
8d07c068: Merge change 6305 into donut
Merge commit '
8d07c0684619b6c30f525d25d92835254a7220a9'
* commit '
8d07c0684619b6c30f525d25d92835254a7220a9':
Fix up permissions for 'dumpsys backup'
Android (Google) Code Review [Mon, 6 Jul 2009 22:54:49 +0000 (15:54 -0700)]
Merge change 6256
* changes:
Refactoring of VideoView.java class
Android (Google) Code Review [Mon, 6 Jul 2009 22:49:26 +0000 (15:49 -0700)]
Merge change 6305 into donut
* changes:
Fix up permissions for 'dumpsys backup'
Christopher Tate [Mon, 6 Jul 2009 22:44:54 +0000 (15:44 -0700)]
Fix up permissions for 'dumpsys backup'
James Dong [Mon, 6 Jul 2009 19:37:45 +0000 (12:37 -0700)]
Refactoring of VideoView.java class
Mathias Agopian [Mon, 6 Jul 2009 21:52:04 +0000 (14:52 -0700)]
Merge commit 'goog/master_gl' into merge_master_gl
Android (Google) Code Review [Mon, 6 Jul 2009 21:48:43 +0000 (14:48 -0700)]
Merge change 6285
* changes:
Make backup agent run in the system process as well.
Amith Yamasani [Thu, 2 Jul 2009 21:25:21 +0000 (14:25 -0700)]
Make backup agent run in the system process as well.
Android (Google) Code Review [Mon, 6 Jul 2009 21:45:20 +0000 (14:45 -0700)]
am
da93c26a: Merge change 6271 into donut
Merge commit '
da93c26a3d2ee0b7d51561b786bde63b7b238c50'
* commit '
da93c26a3d2ee0b7d51561b786bde63b7b238c50':
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:45:16 +0000 (14:45 -0700)]
am
21509240: Merge change 6283 into donut
Merge commit '
21509240b0ba00675ffc69038f20726bf8666c57'
* commit '
21509240b0ba00675ffc69038f20726bf8666c57':
Fix a bug where clicking the "more results" suggestion with the trackball
Android (Google) Code Review [Mon, 6 Jul 2009 21:38:39 +0000 (14:38 -0700)]
Merge change 6271 into donut
* changes:
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:37:54 +0000 (14:37 -0700)]
Merge change 6283 into donut
* changes:
Fix a bug where clicking the "more results" suggestion with the trackball did not seem to expand to show the corpus selectors. (http://b/
1906643)
Android (Google) Code Review [Mon, 6 Jul 2009 21:33:58 +0000 (14:33 -0700)]
am
d2882fa1: Merge change 6282 into donut
Merge commit '
d2882fa1790a976d939f29a5e39e5e7d1bc677f2'
* commit '
d2882fa1790a976d939f29a5e39e5e7d1bc677f2':
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Android (Google) Code Review [Mon, 6 Jul 2009 21:32:18 +0000 (14:32 -0700)]
Merge change 6282 into donut
* changes:
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Romain Guy [Mon, 6 Jul 2009 21:31:39 +0000 (14:31 -0700)]
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Mike LeBeau [Mon, 6 Jul 2009 21:29:25 +0000 (14:29 -0700)]
Fix a bug where clicking the "more results" suggestion with the trackball
did not seem to expand to show the corpus selectors. (http://b/
1906643)
It turns out that when the trackball was used to select this item, onItemClick
was getting called on the listener twice in AutoCompleteTextView#onKeyUp:
once when we call onKeyUp on the DropDownListView, and once a little further
down when we call performCompletion(). In our case, performCompletion() is
useless since it was intended for normal AutoCompleteTextViews which populate
text into the TextView when an item in the list is clicked, but we do not
rely on this. So the easiest fix is just to make performCompletion() do nothing
in our SearchAutoComplete subclass.
Amith Yamasani [Thu, 2 Jul 2009 19:05:32 +0000 (12:05 -0700)]
Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
Mathias Agopian [Mon, 6 Jul 2009 21:16:55 +0000 (14:16 -0700)]
Merge commit 'goog/master' into merge_master
Charles Chen [Mon, 6 Jul 2009 21:12:36 +0000 (14:12 -0700)]
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:14:21 +0000 (14:14 -0700)]
Merge change 6269
* changes:
Revert "hand rolled out
220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
Android (Google) Code Review [Mon, 6 Jul 2009 21:10:36 +0000 (14:10 -0700)]
am
991eec03: Merge change 6252 into donut
Merge commit '
991eec03a73f8803d0f8c80b418480ea25293cfb'
* commit '
991eec03a73f8803d0f8c80b418480ea25293cfb':
Don't re-parse the framework resources all the time.
Android (Google) Code Review [Mon, 6 Jul 2009 21:09:16 +0000 (14:09 -0700)]
Merge change 6252 into donut
* changes:
Don't re-parse the framework resources all the time.
-b master [Mon, 6 Jul 2009 20:53:11 +0000 (13:53 -0700)]
Revert "hand rolled out
220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
This reverts commit
f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
Android (Google) Code Review [Mon, 6 Jul 2009 20:12:36 +0000 (13:12 -0700)]
am
79ec07b3: Merge change 6241 into donut
Merge commit '
79ec07b333f8982ee83de8eeb0b1927a6cb112ed'
* commit '
79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
Fixes #
1444844. Set a maximum fling velocity in scrollable views.
Android (Google) Code Review [Mon, 6 Jul 2009 20:10:50 +0000 (13:10 -0700)]
Merge change 6241 into donut
* changes:
Fixes #
1444844. Set a maximum fling velocity in scrollable views.
Android (Google) Code Review [Mon, 6 Jul 2009 19:58:00 +0000 (12:58 -0700)]
am
56fbd8d8: Merge change 6258 into donut
Merge commit '
56fbd8d86a1ea60ae42185349cf8809df24d262a'
* commit '
56fbd8d86a1ea60ae42185349cf8809df24d262a':
Fix the comment -- "charged" not "sharted." Also, the other
Android (Google) Code Review [Mon, 6 Jul 2009 19:56:32 +0000 (12:56 -0700)]
Merge change 6258 into donut
* changes:
Fix the comment -- "charged" not "sharted." Also, the other strings on that screen seem to have periods. I think that's wrong, but it's better to be consistent that right.
Joe Onorato [Mon, 6 Jul 2009 19:49:04 +0000 (15:49 -0400)]
Fix the comment -- "charged" not "sharted." Also, the other
strings on that screen seem to have periods. I think that's
wrong, but it's better to be consistent that right.
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:36 +0000 (12:43 -0700)]
am
57f2cba2: Merge change 6255 into donut
Merge commit '
57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'
* commit '
57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
Fix the comments for the string resources for the charge status.
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:32 +0000 (12:43 -0700)]
am
6eb987ac: Merge change 6246 into donut
Merge commit '
6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2'
* commit '
6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2':
Fix bugs
1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:28 +0000 (12:43 -0700)]
am
0d725f7d: Merge change 6162 into donut
Merge commit '
0d725f7d5a7efd9dc63f6ddb67a619d659bb4428'
* commit '
0d725f7d5a7efd9dc63f6ddb67a619d659bb4428':
Hold a wakelock during backup/restore/clear operations
Android (Google) Code Review [Mon, 6 Jul 2009 19:39:28 +0000 (12:39 -0700)]
Merge change 6255 into donut
* changes:
Fix the comments for the string resources for the charge status.
Joe Onorato [Mon, 6 Jul 2009 19:38:30 +0000 (15:38 -0400)]
Fix the comments for the string resources for the charge status.
Android (Google) Code Review [Mon, 6 Jul 2009 19:09:34 +0000 (12:09 -0700)]
Merge change 6246 into donut
* changes:
Fix bugs
1317754 - "Idle screen displays "Charging (100%)" even when fully charged." and
1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:23 +0000 (12:00 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:20 +0000 (12:00 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:17 +0000 (12:00 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:12 +0000 (12:00 -0700)]
am
ef1f21b3: Merge change 6231 into donut
Merge commit '
ef1f21b34f5624adb7436d3da927660ed16c97c7'
* commit '
ef1f21b34f5624adb7436d3da927660ed16c97c7':
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Android (Google) Code Review [Mon, 6 Jul 2009 19:00:08 +0000 (12:00 -0700)]
am
8ad422ad: Merge change 6221 into donut
Merge commit '
8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab'
* commit '
8ad422adaf2eb5d36e0391fcc2cd30a226cf87ab':
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 19:00:02 +0000 (12:00 -0700)]
am
899725b0: Make sure ringtones are sorted correctly.
Merge commit '
899725b05dd5c8c51f9f802d4f0a7190532ce0a5'
* commit '
899725b05dd5c8c51f9f802d4f0a7190532ce0a5':
Make sure ringtones are sorted correctly.
Joe Onorato [Mon, 6 Jul 2009 18:56:53 +0000 (14:56 -0400)]
Fix bugs
1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
and
1885870 - "Shorten 'Clear notification' button to 'Clear' to match latest design"
Android (Google) Code Review [Mon, 6 Jul 2009 18:54:34 +0000 (11:54 -0700)]
Merge change 6162 into donut
* changes:
Hold a wakelock during backup/restore/clear operations
Marco Nelissen [Mon, 6 Jul 2009 18:54:24 +0000 (11:54 -0700)]
am
816cf52a: Fix the DEFAULT_SORT_ORDER value for media files. Changing this is OK, because existing app will have the old value compiled in as a literal, and so will continue to (not) work in the same way as before. Add code to media key generator to give a leading a
Merge commit '
816cf52abd8f45770f0ac922bbb819184ed4b90f'
* commit '
816cf52abd8f45770f0ac922bbb819184ed4b90f':
Fix the DEFAULT_SORT_ORDER value for media files. Changing this
Christopher Tate [Fri, 3 Jul 2009 00:40:45 +0000 (17:40 -0700)]
Hold a wakelock during backup/restore/clear operations
We need to make sure we stay alive for the duration of a backup or (especially)
restore operation. The existing Handler-based timing system was simply not
properly functional, so it's been retooled to use a repeating alarm delivering a
broastcast PendingIntent to our registered receiver.
We acquire a partial wake lock in the broadcast receiver [i.e. while the Alarm
Manager is holding one for the duration of broadcast delivery] and pass the
wakelock object to the backup thread, which eventually releases it when it's
finsihed operations. A similar pattern is used for the threads handling restore
and clear.
Romain Guy [Mon, 6 Jul 2009 18:48:52 +0000 (11:48 -0700)]
Fixes #
1444844. Set a maximum fling velocity in scrollable views.
Android (Google) Code Review [Mon, 6 Jul 2009 18:37:13 +0000 (11:37 -0700)]
Merge change 6154 into donut
* changes:
Fix bug (#
1947162)
Android (Google) Code Review [Mon, 6 Jul 2009 18:34:28 +0000 (11:34 -0700)]
Merge change 6237 into donut
* changes:
Add a silent ringtone.
Marco Nelissen [Mon, 6 Jul 2009 18:12:26 +0000 (11:12 -0700)]
Add a silent ringtone.
The Android Open Source Project [Mon, 6 Jul 2009 18:31:10 +0000 (11:31 -0700)]
Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base
James Dong [Thu, 2 Jul 2009 23:26:39 +0000 (16:26 -0700)]
Fix bug (#
1947162)
The bug (
1947162) is caused by the fact that sometimes, surfaceChanged() is called after onCompletion().
In surfaceChanged(), start() is called automatically. The fix is to use a flag is avoid calling start()
when onCompletion() has been called already.
Android (Google) Code Review [Mon, 6 Jul 2009 18:26:15 +0000 (11:26 -0700)]
Merge change 6227 into donut
* changes:
Adding tts result codes.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:51 +0000 (11:22 -0700)]
Merge change 6232
* changes:
frameworks/base: Update mPdu in createFromPdu
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:45 +0000 (11:22 -0700)]
am
46841db4: Add PPTP and L2TP/IPSec PSK service dispatching
Merge commit '
46841db4f2c7360d3b861a816e51f76acca0d677'
* commit '
46841db4f2c7360d3b861a816e51f76acca0d677':
Add PPTP and L2TP/IPSec PSK service dispatching
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:36 +0000 (11:22 -0700)]
am
1f2bb46b: Merge change 6204 into donut
Merge commit '
1f2bb46b9a2762a6f57ca8801d91e9dee002158f'
* commit '
1f2bb46b9a2762a6f57ca8801d91e9dee002158f':
Migrate to new keystore with the CertTool lib.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:25 +0000 (11:22 -0700)]
am
3383df38: Merge change 6198 into donut
Merge commit '
3383df385e208807b1dc5f2956f82a7f75f65fd8'
* commit '
3383df385e208807b1dc5f2956f82a7f75f65fd8':
keystore: Provide a generic getter for native components.
Chung-yih Wang [Mon, 6 Jul 2009 18:22:18 +0000 (11:22 -0700)]
am
699ca3f2: Add password field for WiFi configuration.
Merge commit '
699ca3f2518360ea3250ff5a0e5d39e122c64a91'
* commit '
699ca3f2518360ea3250ff5a0e5d39e122c64a91':
Add password field for WiFi configuration.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:11 +0000 (11:22 -0700)]
am
4492bcb8: Merge change 6081 into donut
Merge commit '
4492bcb851f4ee862a446664eb9045045ebb7b5e'
* commit '
4492bcb851f4ee862a446664eb9045045ebb7b5e':
Migrate to the CertTool library.
Android (Google) Code Review [Mon, 6 Jul 2009 18:22:07 +0000 (11:22 -0700)]
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:59 +0000 (11:21 -0700)]
am
24ad29c6: Merge change 6177 into donut
Merge commit '
24ad29c6dbbf62096bcb41ddb2fa3975720ee625'
* commit '
24ad29c6dbbf62096bcb41ddb2fa3975720ee625':
Two small checks in keymgmt.
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:50 +0000 (11:21 -0700)]
am
7b8f782e: Merge change 6183 into donut
Merge commit '
7b8f782eaaef392154fe3acd3ffb48c0a81024e9'
* commit '
7b8f782eaaef392154fe3acd3ffb48c0a81024e9':
Fix null data handling in ServiceCommand.writeCommand()
Android (Google) Code Review [Mon, 6 Jul 2009 18:21:45 +0000 (11:21 -0700)]
am
2f97e984: (-s ours) Merge change 6130 into donut
Merge commit '
2f97e984b52b243a5433596c8c291f35778d6b38'
* commit '
2f97e984b52b243a5433596c8c291f35778d6b38':
Make backup agent run in the system process as well.
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:56 +0000 (11:17 -0700)]
am
922f1b85: Merge change 6146 into donut
Merge commit '
922f1b85b9096d9056f1b9e2d777098d1e4ed8b1'
* commit '
922f1b85b9096d9056f1b9e2d777098d1e4ed8b1':
Fixing
1949086 Sholes telephony crash after waking from sleep.
Charles Chen [Mon, 6 Jul 2009 18:17:45 +0000 (11:17 -0700)]
am
4bca97ec: Removing IPA - IPA is already handled by the phoneme tag.
Merge commit '
4bca97ecaf04c50d5ed49920d119f9ffa6c29402'
* commit '
4bca97ecaf04c50d5ed49920d119f9ffa6c29402':
Removing IPA - IPA is already handled by the phoneme tag.
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:34 +0000 (11:17 -0700)]
am
b29f8283: Merge change 6155 into donut
Merge commit '
b29f8283d06c2ab4eb54c991d7ffb5181d91af15'
* commit '
b29f8283d06c2ab4eb54c991d7ffb5181d91af15':
Unhide android.speech.tts.TextToSpeech
Android (Google) Code Review [Mon, 6 Jul 2009 18:17:12 +0000 (11:17 -0700)]
Christopher Tate [Mon, 6 Jul 2009 18:17:02 +0000 (11:17 -0700)]
am
d23d7f2d: Add a \'wipe\' operation to Bmgr
Merge commit '
d23d7f2d12c20314e1e8ff206fafc8f21745ca2d'
* commit '
d23d7f2d12c20314e1e8ff206fafc8f21745ca2d':
Add a 'wipe' operation to Bmgr
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:58 +0000 (11:16 -0700)]
am
e15df401: Merge change 6132 into donut
Merge commit '
e15df4017c3625de700e9f9953073f38898bbc89'
* commit '
e15df4017c3625de700e9f9953073f38898bbc89':
If we can't get the restore set's metadata, don't continue
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:48 +0000 (11:16 -0700)]
am
fe11ea5e: Merge change 6126 into donut
Merge commit '
fe11ea5e2df4a4414aa266e93179c3098b03a795'
* commit '
fe11ea5e2df4a4414aa266e93179c3098b03a795':
Use 'LOCAL_PATH' instead of 'local_path', so it's easier to see a diff of the two .mk files.
Android (Google) Code Review [Mon, 6 Jul 2009 18:16:34 +0000 (11:16 -0700)]
am
0d81f636: (-s ours) Merge change 6102 into donut
Merge commit '
0d81f6368708b1faa42a3bb6413210e01fea9222'
* commit '
0d81f6368708b1faa42a3bb6413210e01fea9222':
Backup Wifi supplicant data.
Dianne Hackborn [Mon, 6 Jul 2009 18:07:40 +0000 (11:07 -0700)]
Don't re-parse the framework resources all the time.
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager. Instead, you can now
construct a ResTable from a previously created one... of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
Android (Google) Code Review [Mon, 6 Jul 2009 18:09:20 +0000 (11:09 -0700)]
Merge change 6231 into donut
* changes:
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Patrick Scott [Thu, 2 Jul 2009 12:56:10 +0000 (08:56 -0400)]
Basic changes to get embedded video working.
Add the ViewManager class to handle child views within a WebView. This class
attaches and removes the views in the UI thread. It also scales the layout
params based on the scale of the WebView.
Marco Nelissen [Mon, 6 Jul 2009 18:07:27 +0000 (11:07 -0700)]
Don't trim() in the mediascanner, as that would remove the special "sort first" character.
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:59 +0000 (11:02 -0700)]
am
9701b3d5: Merge change 5979 into donut
Merge commit '
9701b3d594868bd6750d5887af560c6295ea091b'
* commit '
9701b3d594868bd6750d5887af560c6295ea091b':
Remove the constraint to assign new uid when code path changes for system packages
Christopher Tate [Mon, 6 Jul 2009 18:02:55 +0000 (11:02 -0700)]
am
4e3e50cf: Clean up the last two literal permission string usages
Merge commit '
4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14'
* commit '
4e3e50cfa7cf02270ed0dd454d5c51bf7065bd14':
Clean up the last two literal permission string usages
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:50 +0000 (11:02 -0700)]
am
7c5ae202: Merge change 6104 into donut
Merge commit '
7c5ae202c53be1ab4881a6811aa5bd091c3aef10'
* commit '
7c5ae202c53be1ab4881a6811aa5bd091c3aef10':
Add a "clear backed-up data" method to the backup mechanism
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:40 +0000 (11:02 -0700)]
am
a642e313: Merge change 6090 into donut
Merge commit '
a642e313988ec7f9e732ead00edbded8b57d7452'
* commit '
a642e313988ec7f9e732ead00edbded8b57d7452':
Adding strings for data root and data files - these are needed
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:33 +0000 (11:02 -0700)]
am
c7396025: Merge change 6084 into donut
Merge commit '
c7396025e59524e7ef639fd86fc23123939ee91c'
* commit '
c7396025e59524e7ef639fd86fc23123939ee91c':
Return CAMERA_ERROR_SERVER_DIED to camera app when camera service dies (bug
1956726)
Android (Google) Code Review [Mon, 6 Jul 2009 18:02:25 +0000 (11:02 -0700)]
am
d3de90f3: Merge change 5995 into donut
Merge commit '
d3de90f38d779d28a724e89297c83e6ba1a66fa7'
* commit '
d3de90f38d779d28a724e89297c83e6ba1a66fa7':
Turn off kerning when testing TextUtils.ellipsize().
Android (Google) Code Review [Mon, 6 Jul 2009 18:01:43 +0000 (11:01 -0700)]
Merge change 6221 into donut
* changes:
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 17:57:01 +0000 (10:57 -0700)]
Make sure ringtones are sorted correctly.
Charles Chen [Mon, 6 Jul 2009 17:51:48 +0000 (10:51 -0700)]
Adding tts result codes.
Android (Google) Code Review [Mon, 6 Jul 2009 17:29:41 +0000 (10:29 -0700)]
Merge change 6159
* changes:
Add the code to detect how long the WebViewCore thread is idle in the real time.
Android (Google) Code Review [Mon, 6 Jul 2009 17:29:08 +0000 (10:29 -0700)]
Merge change 6144
* changes:
Fix the performance collection in the http thread. A connection can be reused. Change the thread time collection based on per request.
Katarina Stenstedt [Mon, 6 Jul 2009 17:10:19 +0000 (10:10 -0700)]
Remove links to wikipedia; fix typo; remove .vsd file (bug
1918247).
Marco Nelissen [Mon, 6 Jul 2009 16:19:10 +0000 (09:19 -0700)]
Fix the DEFAULT_SORT_ORDER value for media files. Changing this
is OK, because existing app will have the old value compiled in
as a literal, and so will continue to (not) work in the same
way as before. Add code to media key generator to give a leading
ascii \001 the special meaning of "sort first".
Satish Roddom [Wed, 24 Jun 2009 10:10:24 +0000 (05:10 -0500)]
frameworks/base: Update mPdu in createFromPdu
Inside createFromPdu(), the passed-in parameter 'pdu' is assigned
to msg.mPdu, so that we can call getPdu() to get it back.
Android (Google) Code Review [Mon, 6 Jul 2009 16:12:56 +0000 (09:12 -0700)]
am
3bc64a2c: Merge change 6088 into donut
Merge commit '
3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc'
* commit '
3bc64a2cb97da7bf7dc203416ad6c7d86c5925fc':
WifiManager: Limit the number of WifiLocks that can be active simultaneously.
Android (Google) Code Review [Mon, 6 Jul 2009 15:49:19 +0000 (08:49 -0700)]
Merge change 6071
* changes:
In WebTextView, check the focus before sending a key.
Hung-ying Tyan [Mon, 6 Jul 2009 15:31:33 +0000 (23:31 +0800)]
Add PPTP and L2TP/IPSec PSK service dispatching
Leon Scroggins [Thu, 2 Jul 2009 14:37:10 +0000 (10:37 -0400)]
In WebTextView, check the focus before sending a key.
This fixes a bug where the DOM has moved the focus, but the WebTextView
is still sending keys to the old focus. Requires a change in
external/webkit.
Patrick Scott [Thu, 2 Jul 2009 15:31:12 +0000 (11:31 -0400)]
Improve the Vibrator service by keeping track of multiple vibration requests.
There are 2 types of vibrations: simple and repeated. Simple vibrations run for
a given length of time while repeated patterns run until canceled or the calling
process dies.
If a vibration is currently running and another request is issued, the newer
request always takes precedence unless the current vibration is a simple one and
the time left is longer than the new request.
If a repeating vibration is running and a new request overrides that vibration,
the current vibration is pushed onto a stack. Once the new vibration completes,
the previous vibration resumes. IBinder tokens are used to identify Vibration
requests which means that multiple calls to Vibrator.vibrate with the same
Vibrator object will override previous vibrations on that object.