James Dong
337885be6e
Merge "First step towards renabling Timelapse video recording"
2010-12-09 20:27:59 -08:00
Dianne Hackborn
a64f506941
Merge "Fix issue #3272051 : Use backward transition when going backwards."
2010-12-09 19:25:17 -08:00
Dianne Hackborn
7da6ac33a9
Fix issue #3272051 : Use backward transition when going backwards.
...
Also know as:
Issue #3272051 Contacts edit view: Tapping the in-app back button
results in a forward transition
Yeah more complexity in deciding which animation to use.
Also reduce complexity in deciding which app's animation set to use,
to balance things out (and make it have less stupid behavior).
Change-Id: I78c6c5c5249a96206f7e03ce587c1dcb9a7dc14f
2010-12-09 19:22:04 -08:00
Xia Wang
93ca011c60
Make Wi-Fi stress tests output log consistent.
...
Fix: record average at the beginning of each iteration
Change-Id: Ia129348dbf79ecf7efc7169b8bbfac3755ccce63
2010-12-09 19:07:59 -08:00
Jeff Brown
6f7f877cc0
Merge "Fix race condition in fallback key processing."
2010-12-09 18:54:35 -08:00
Mike Lockwood
b58d883683
Merge "MTP host: Handle receiving a response packet instead of data packet."
2010-12-09 18:42:13 -08:00
Mike Lockwood
bfd1d72a1a
MTP host: Handle receiving a response packet instead of data packet.
...
This will happen if the device needs to report an error rather than returning the data.
Change-Id: I477512b3676c2f0518a85a4135832ed4475fbc2d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 18:34:18 -08:00
Jeff Brown
00045a7e6f
Fix race condition in fallback key processing.
...
Need to ensure that the channel is still valid before proceeding.
Bug: 3271482
Change-Id: Ia6863cbedd9b53cbc5c9c8815e9ea90bef3d2218
2010-12-09 18:14:23 -08:00
Romain Guy
af636ebf5f
Don't set the invisible flag when saving an empty layer.
...
Bug #3270371
Change-Id: I65e85671c2fb70d74553c91213e5e759e0ac64ee
2010-12-09 17:47:21 -08:00
Romain Guy
865cd3a20d
Merge "Don't set the invisible flag when saving an empty layer. Bug #3270371 "
2010-12-09 17:47:09 -08:00
John Wang
4ad628f8ad
Merge "Add config_sms_capable."
2010-12-09 17:31:36 -08:00
Eric Fischer
a7a44f1894
Import revised translations.
...
Change-Id: I207197a388a65827b1c336cde6c5aa27c126e25c
2010-12-09 17:04:40 -08:00
Eric Fischer
767926bbe9
Import revised translations. DO NOT MERGE
...
Bug 3272618
Change-Id: I165a5964e62e3d3df59c26cf6595898ea3f84996
2010-12-09 16:54:24 -08:00
Costin Manolache
5d275bba42
Fix bug in permission grant system.
...
Change-Id: Ic7d712e5a672c3eded16fee83235db01ab3c74fa
2010-12-09 16:53:33 -08:00
Fred Quintana
957d85ec04
revert an API change that conflicted witha previous SDK version
...
Change-Id: I71ef6bd135296846021c0e7ee465cac9181b5473
2010-12-09 16:26:18 -08:00
John Wang
f7a55fca64
Add config_sms_capable.
...
For bug 3250029.
Change-Id: I299a9ab81dd9533f7687593ace0d70dc711bff75
2010-12-09 16:02:08 -08:00
James Dong
08800f3fdc
First step towards renabling Timelapse video recording
...
Change-Id: I93836b066fb69d5152d3774546a9935057a1f12f
2010-12-09 15:37:04 -08:00
Chet Haase
37f74cad46
Add ability to reuse bitmaps when loading new content
...
Change-Id: Ic5f5f40ee39787403977fb372b335dc21cf07243
2010-12-09 15:07:39 -08:00
Svetoslav Ganov
792be60c86
Merge "3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method)"
2010-12-09 14:47:22 -08:00
Fred Quintana
0c4d04ac2e
allow sync adapter authors to control more policies
...
- let the SyncManager know that the SyncAdapter can handle
parallel syncs even within sync adapter types
- allow indicating that the sync adapter should be auto
initialized without requiring the sync adapter to run first.
When this setting is used then setIsSyncable(1) is automatically
called for the sync adapter.
Change-Id: Ib40eba95c2556eaee4bb0fe715f379af1b72b84a
2010-12-09 14:24:34 -08:00
Alon Albert
6a843d03c7
Merge "Listen for SyncAdapter death to cancel a sync"
2010-12-09 14:08:27 -08:00
Wink Saville
41cb9d10de
am a7404130: am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit 'a740413022baca3d2bc365ade40f73a1fee46654':
Fix for phone app crash in Icc Card.
2010-12-09 14:06:35 -08:00
Alon Albert
eca7511f61
Listen for SyncAdapter death to cancel a sync
...
Change-Id: Icbb439c56b89fea1726723d7061c347867834dc8
2010-12-09 14:06:04 -08:00
Wink Saville
a740413022
am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
2010-12-09 14:02:09 -08:00
Wink Saville
d0ffef4b43
am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
2010-12-09 13:58:26 -08:00
Wink Saville
19b23afadf
Merge "Fix for phone app crash in Icc Card."
2010-12-09 13:50:28 -08:00
Mike Lockwood
ed6f095a83
Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
2010-12-09 13:45:34 -08:00
Eric Laurent
2308fef4b2
Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode"
2010-12-09 13:30:07 -08:00
Justin Ho
9ff63ce58f
Merge "Adding updated HDPI chat stat_notify icon"
2010-12-09 13:29:16 -08:00
Dianne Hackborn
bca1c4ffad
Merge "Fix issue #3271486 : SetupWizward NullPointerException in"
2010-12-09 13:16:49 -08:00
Dianne Hackborn
fb3806d68d
Fix issue #3271486 : SetupWizward NullPointerException in
...
andriod.app.ActivityThread.performStopActivityInner
Change-Id: Ifce73b7fc48fedb4767d759f70c98fcdee510f36
2010-12-09 13:14:12 -08:00
Christopher Tate
a58fd15a5b
Merge "Add a couple of transport-descriptive methods to IBackupManager"
2010-12-09 13:06:46 -08:00
Christopher Tate
f5e1c29637
Add a couple of transport-descriptive methods to IBackupManager
...
Privileged callers can now ask the transport for a string describing
its current state, and for an Intent that can be passed to startActivity()
in order to bring up its exported configuration UI. These will be used
in Settings in order to e.g. show the user the currently active account
being used for backup, and allow the user to choose an account.
The data being funnelled through IBackupManager here are the ones
already exposed by the transports in their implementation of the
IBackupTransport interface.
Bug: 2753632
Change-Id: I2227a2b111d8d0ddf221d63020e20c1316fff55b
2010-12-09 12:58:24 -08:00
John Wang
488a0d5ece
Merge "Add iDEN to getNetworkTypeName."
2010-12-09 12:53:01 -08:00
Jason Sams
3eb3106137
Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."
2010-12-09 12:21:19 -08:00
Jason Sams
546f01b6d5
Fix a severe cleanup bug where teardown of the GL
...
driver could occur on the wrong thread.
Change-Id: Icd56182ccbd1371124a247695bf3ebd3085df450
2010-12-09 12:19:46 -08:00
Ben Murdoch
0fa484ac37
Add a "Web Search" option to the WebView select text ActionBar
...
This change allows selected text in a web view to be used as a search
query.
Bug: 3132422
Change-Id: I9ed2a5913641b37732586f8d8aa8a80c3486b606
2010-12-09 20:02:44 +00:00
James Wylder
d285415e8a
libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode
...
Speeds up the decoding leaving more time for cpuidle (lp2),
thus lowering overall current drain.
Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31
Signed-off-by: James Wylder <james.wylder@motorola.com>
2010-12-09 12:00:58 -08:00
Ben Murdoch
e627f55bf8
Merge "Make audio tag cope with live streams"
2010-12-09 11:54:24 -08:00
Svetoslav Ganov
383742c16d
3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method)
...
Change-Id: I72ab33da2f5cc0bbaa89f3b996ff4ac48deadf73
2010-12-09 11:52:47 -08:00
Mike Lockwood
485059de22
CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP
...
Change-Id: Ic5c7810ff4b7e25ba5f49a1107f5121391943108
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 11:45:44 -08:00
Amith Yamasani
d4de05eae3
Merge "Remove the OnItemClick listener when the fragment is destroyed."
2010-12-09 11:45:32 -08:00
Megha Joshi
cc0c9daa91
Integrating webinar hosting with developer.android.com
...
Change-Id: I320378560bbb09efade14f583dbcf2d66f34a9d8
2010-12-09 11:42:12 -08:00
Amith Yamasani
74402cfe4e
Remove the OnItemClick listener when the fragment is destroyed.
...
Bug: 3228510
This probably fixes a lot of other monkey bugs in Settings.
2010-12-09 11:22:15 -08:00
Leon Scroggins
6b82c26607
Merge "Dismiss IME when pressing Next or Previous."
2010-12-09 11:04:06 -08:00
Mindy Pereira
596913ba04
Merge "Make sure bottom overscroll feedback takes scrollY into account."
2010-12-09 10:55:39 -08:00
Leon Scroggins
261f42d64d
Dismiss IME when pressing Next or Previous.
...
Bug:3267230
Change-Id: If4ea2f589c42f7346685a7ce754298dd8e5a00b5
2010-12-09 13:50:00 -05:00
Jean-Baptiste Queru
6a9e0360d8
am 1bec55bd: am d9c17cc1: merge from gingerbread
...
* commit '1bec55bd244f72c65fa254118a72ad3ed10aa845':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:48:54 -08:00
Jean-Baptiste Queru
1bec55bd24
am d9c17cc1: merge from gingerbread
...
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:45:29 -08:00
Mindy Pereira
e1be66cdbc
Make sure bottom overscroll feedback takes scrollY into account.
...
This fixes an issue where the overscroll feedback was rendering
several pixels above the bottom of the list on a flick.
Change-Id: I66160d1b72c04f0273f063910eff995e2b2569f0
2010-12-09 10:23:59 -08:00