Dianne Hackborn
7e269644fc
Don't retain global ref to last inflated context.
...
Also rework URI permission granting to support upcoming
clipboard use.
Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
2010-08-25 21:50:54 -07:00
Jim Miller
e6ad1a8ba2
Fix 2797185: Integrate 3D RecentApps View into system.
...
This adds 3D recents to the platform. Enabling it is a
matter of setting 'config_enableRecentApps3D' on devices
capable of supporting it (those with OGLES2.0 at the moment).
Change-Id: Ife7bfe8ca02e7657821b68f915e31b0dab50cd2c
2010-08-25 20:43:00 -07:00
Chia-chi Yeh
89bf83a87d
am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
...
Merge commit '91fe746437e1709b83b4eb4d113e5f435d7c6412'
* commit '91fe746437e1709b83b4eb4d113e5f435d7c6412':
Revert "RTP: integrate the echo canceller from speex."
2010-08-25 20:02:04 -07:00
Hung-ying Tyan
4d1b114b5f
am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
...
Merge commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1'
* commit 'd06e641dbfbba672f17026c4a204c396f32a1ae1':
CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
2010-08-25 20:02:00 -07:00
Chia-chi Yeh
91fe746437
am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
...
Merge commit '14e00621c81da6a0391da47afce77945b27c7231' into gingerbread-plus-aosp
* commit '14e00621c81da6a0391da47afce77945b27c7231':
Revert "RTP: integrate the echo canceller from speex."
2010-08-25 19:46:04 -07:00
Chia-chi Yeh
14e00621c8
Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread
2010-08-25 19:43:58 -07:00
Chia-chi Yeh
7fa7ee11f6
Revert "RTP: integrate the echo canceller from speex."
...
This reverts commit 4ae6ec428f3570b9020b35ada6a62f94af66d888.
2010-08-26 10:33:09 +08:00
Hung-ying Tyan
d06e641dbf
am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
...
Merge commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf' into gingerbread-plus-aosp
* commit '108a06c9fc0e4ac8c713fa38c490475d30a3cdcf':
CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()
2010-08-25 19:30:03 -07:00
Chung-yih Wang
6d92e3c9ad
am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
...
Merge commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a'
* commit '5e0d833710aaba2562f39eb8021a4289bc3bcc5a':
Add dynamic uid info for tracking the sip service usage.
2010-08-25 19:28:45 -07:00
Hung-ying Tyan
108a06c9fc
Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread
2010-08-25 19:27:50 -07:00
Chung-yih Wang
5e0d833710
am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
...
Merge commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe' into gingerbread-plus-aosp
* commit 'ea52d35e5685094f4d2cca5012239bde66f2c4fe':
Add dynamic uid info for tracking the sip service usage.
2010-08-25 19:26:31 -07:00
Chung-yih Wang
ea52d35e56
Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread
2010-08-25 19:25:02 -07:00
Gilles Debunne
df4ee43062
Fix for NPE in TextView.
...
Bug http://b/issue?id=2941549
Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
2010-08-25 19:15:10 -07:00
Chung-yih Wang
5424c8dcac
Add dynamic uid info for tracking the sip service usage.
...
Change-Id: Ibc340401b63799326b08aee6eba602a3e753b13f
2010-08-26 10:12:05 +08:00
Irfan Sheriff
c3bee43620
Merge "fix connectNetwork corner cases"
2010-08-25 18:23:47 -07:00
Daniel Sandler
525c664fbe
Merge "System bar improvements."
2010-08-25 18:22:35 -07:00
Guang Zhu
b5c4caa078
add mouse up/down/click support in DumpRenderTree
...
use touchStart/End when mouseDown/Up is called in current
EventSender implmentation.
Change-Id: Iff3e7f45b6a7170d9be1c7ec9b12a74a74737732
2010-08-25 17:54:43 -07:00
Robert Greenwalt
b21b62327c
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
...
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
261d509270
am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
...
Merge commit '5a54e98022d640900f94102c077d8dff447f3c76'
* commit '5a54e98022d640900f94102c077d8dff447f3c76':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
2010-08-25 17:41:02 -07:00
Chet Haase
ebe083efad
Merge "Fix for end events from Sequencer objects"
2010-08-25 17:40:30 -07:00
Konstantin Lopyrev
5a54e98022
am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
...
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942
Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
2010-08-25 17:35:50 -07:00
Chet Haase
673e42fafd
Fix for end events from Sequencer objects
...
Change-Id: I8947d8b016b880f9f54f2bf6ab22b4e188cdb29a
2010-08-25 17:32:27 -07:00
Romain Guy
06b9a14c45
am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
...
Merge commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa'
* commit 'd72c1172f669d0a50a5164672c354ec7fb4ac9aa':
reserve android.opengl.GLWallpaperService name for future use
2010-08-25 17:32:00 -07:00
Romain Guy
d72c1172f6
am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
...
Merge commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb' into gingerbread-plus-aosp
* commit '0c490839b2d25fec99f1ae86dcebc5f21a2df8bb':
reserve android.opengl.GLWallpaperService name for future use
2010-08-25 17:28:50 -07:00
Romain Guy
0c490839b2
Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread
2010-08-25 17:26:20 -07:00
Kenny Root
dc05980466
am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
...
Merge commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a'
* commit 'eb0e0f465155bc9ec2c79741890fb65bd403e33a':
Add LFH offset to verbose list of APK
2010-08-25 17:25:15 -07:00
Kenny Root
eb0e0f4651
am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread
...
Merge commit '2e7427f39ec15dcb43cc1247372b53980be11d38' into gingerbread-plus-aosp
* commit '2e7427f39ec15dcb43cc1247372b53980be11d38':
Add LFH offset to verbose list of APK
2010-08-25 17:22:01 -07:00
Kenny Root
2e7427f39e
Merge "Add LFH offset to verbose list of APK" into gingerbread
2010-08-25 17:20:29 -07:00
Mathias Agopian
f45b674d48
reserve android.opengl.GLWallpaperService name for future use
...
Change-Id: I7a217593a1ca39214dda26ddb3af3ddc30a8a95a
2010-08-25 16:57:02 -07:00
Jason Sams
d8cb3cadb5
Merge "Add matrix component types. Fix potental overflow in script -> java messages."
2010-08-25 16:54:56 -07:00
Dianne Hackborn
917d88213e
am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
...
Merge commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c'
* commit 'fde7fdd38d45e6bdb12cba9917a23d18e9f3457c':
Fix a fun bug with multiple service bindings from an activity.
2010-08-25 16:40:55 -07:00
Mathias Agopian
dcde3a8abe
am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread
...
Merge commit 'a62dfe9e49ea785c4be2173479e4472767771ce5'
* commit 'a62dfe9e49ea785c4be2173479e4472767771ce5':
Improve Sensors documentation a bit
2010-08-25 16:40:40 -07:00
Andreas Huber
05643cc0d8
am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
...
Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'
* commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
2010-08-25 16:40:33 -07:00
Mathias Agopian
1c25dcc924
am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
...
Merge commit '6d4346ce35a521d67f45d7c9658c450c0fc461d2'
* commit '6d4346ce35a521d67f45d7c9658c450c0fc461d2':
fix [2946787] Screen flicker on low resolution setting in camcorder.
2010-08-25 16:40:28 -07:00
Brad Fitzpatrick
4cbc4f1067
am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
...
Merge commit '49209cbcef37c4b20c9d0649ba284a51144b3930'
* commit '49209cbcef37c4b20c9d0649ba284a51144b3930':
Start of SharedPreferences$Editor.startCommit()
2010-08-25 16:40:06 -07:00
Dianne Hackborn
fde7fdd38d
am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
...
Merge commit '50395e80718e77d27ec5e2d474b255e05de68d82' into gingerbread-plus-aosp
* commit '50395e80718e77d27ec5e2d474b255e05de68d82':
Fix a fun bug with multiple service bindings from an activity.
2010-08-25 16:33:57 -07:00
Dianne Hackborn
50395e8071
Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread
2010-08-25 16:31:34 -07:00
Mike Lockwood
53b8f17376
MTP: Fix build break due to integer constant too large
...
Change-Id: Ia03ebe171d68bdfb04913abafc11dcb9c9071595
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-25 19:10:24 -04:00
Mathias Agopian
a62dfe9e49
am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread
...
Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp
* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
Improve Sensors documentation a bit
2010-08-25 16:07:25 -07:00
Mathias Agopian
94e939e879
Merge "Improve Sensors documentation a bit" into gingerbread
2010-08-25 16:03:58 -07:00
Mike Lockwood
48114f72fd
Merge "MTP: work in progress on expanded property support"
2010-08-25 15:44:03 -07:00
Andreas Huber
e58cd37d66
am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
...
Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp
* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
Fix support for per-frame unsynchronization in ID3V2.4 tags.
2010-08-25 15:43:20 -07:00
Mike Lockwood
828d19dd96
MTP: work in progress on expanded property support
...
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-25 18:42:22 -04:00
Mathias Agopian
6d4346ce35
am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
...
Merge commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4' into gingerbread-plus-aosp
* commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4':
fix [2946787] Screen flicker on low resolution setting in camcorder.
2010-08-25 15:40:44 -07:00
Andreas Huber
8ac0983eda
Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread
2010-08-25 15:35:53 -07:00
Mathias Agopian
4cffbb47a2
Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
2010-08-25 15:25:32 -07:00
Brad Fitzpatrick
49209cbcef
am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
...
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp
* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
Start of SharedPreferences$Editor.startCommit()
2010-08-25 15:19:57 -07:00
Eric Laurent
ec95d93254
am 8ca5df27: am c14f9ca6: Merge "Added preset reverb." into gingerbread
...
Merge commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1'
* commit '8ca5df27df8a2b6435486f9b5a163bf222f8fed1':
Added preset reverb.
2010-08-25 15:16:00 -07:00
Brad Fitzpatrick
d0e6598b4a
Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread
2010-08-25 15:15:30 -07:00