38016 Commits

Author SHA1 Message Date
Mike Lockwood
5bd7d9347b Merge "MediaScanner: No longer delete playlist files that have no valid entries" 2010-12-13 12:39:28 -08:00
Jean-Baptiste Queru
4b94c451d2 Merge "Added dropbox broadcast notification" 2010-12-13 12:34:48 -08:00
Martijn Coenen
87212c1979 am 6c247164: am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit '6c2471649b5b1d1d9c19305a43676161823b623a':
  Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 12:31:46 -08:00
Jeff Hamilton
152cce2199 am 80c78a89: am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '80c78a896f32461513b9750fc2869cd6b2795888':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-13 12:31:38 -08:00
Martijn Coenen
c26ba7dd27 am 41e74b99: am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit '41e74b991bc50bfa16ba920e998c76a88aa8ae69':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-13 12:31:29 -08:00
Martijn Coenen
4e656372bd am 2019f533: am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit '2019f53396f5b45a307cc4b24123eb19b9a5246f':
  Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-13 12:31:23 -08:00
Martijn Coenen
8efdf6459e am 25556f66: am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '25556f666934c72ca53ad0f309078e3d4bd29ca9':
  Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-13 12:31:10 -08:00
Kenny Root
33bc175841 Merge "Introduce NDK API for 64-bit assets" 2010-12-13 12:29:06 -08:00
Nick Pelly
907ecb1dd5 Merge "resolved conflicts for merge of 1d0d1188 to master" 2010-12-13 12:25:22 -08:00
Nick Pelly
d250746716 resolved conflicts for merge of 1d0d1188 to master
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
2010-12-13 12:22:34 -08:00
Mike Lockwood
eb46d0601e MediaScanner: No longer delete playlist files that have no valid entries
When copying files from MTP we must keep the file in the database, even
if we cannot find any of the playlist entries (or even if it is not a valid playlist file)

BUG: 3260341

Change-Id: I4b39027ee25ffae6778224cf74830a4b1ca3fecb
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-13 12:10:45 -08:00
Kenny Root
06ea4d65e8 Introduce NDK API for 64-bit assets
Assets were switched to using 64-bit all through the system, so switch
the NDK to using this new API as well.

Change-Id: I2817b11369db3a4dd504b839ef1a3a9780b83533
2010-12-13 12:02:19 -08:00
Jaikumar Ganesh
84690c88f3 Add direct calls to Bluez to add SDP records.
This helps Settings app to enable just the Headset service.

Change-Id: Ia9c39467df1e83d665e377313e16e6c54991f6d6
2010-12-13 11:37:41 -08:00
Xavier Ducrohet
666a5ed981 Merge "LayoutLib: parsed resources were always set as platform res." 2010-12-13 11:35:42 -08:00
Brandon Keely
0fe197ee95 Massaging system transitions.
Change-Id: Ic6233f33ef1ee011274631119022b7adc6432ca2
2010-12-13 11:33:00 -08:00
Adam Powell
14b0a6bc0e Merge "Update bg drawable properly on ActionBars based on earlier changes" 2010-12-13 10:52:04 -08:00
Adam Powell
e8c1e5c02d Update bg drawable properly on ActionBars based on earlier changes
Change-Id: I5e24ffb030d2c29620948114b9015c0c028a133e
2010-12-13 10:49:32 -08:00
Adam Powell
e0893a8555 Merge "Smooth out gesture zooming in WebViews." 2010-12-13 10:47:07 -08:00
James Dong
fc8b7c9ccf Yield the omx threads so that file writer threads have a chance to retrieve the output buffers once they become ready
bug - 3252228

Change-Id: Iab7cf1c9a87cce7b814c63b42b21fcd6a7314b36
2010-12-13 10:34:17 -08:00
James Dong
d1e0396820 Merge "Revert "Allows the authoring engine to skip frame."" 2010-12-13 10:33:33 -08:00
Kristian Monsen
7400be47b7 Cleanup of private browsing files are now done in webkit
Bug 3243891

Change-Id: I51e63a96bf1c95cd8e675a3d94a4aa210418e216
2010-12-13 17:51:20 +00:00
Patrick Scott
d2f44b7a32 Merge "Suppress scrollbars during layer fling." 2010-12-13 09:30:27 -08:00
Jean-Michel Trivi
b6a0dfb0f1 Merge "Fix bug 3275151 Request and abandon audio focus with audio mode changes" 2010-12-13 09:01:34 -08:00
Chet Haase
ad3ec1b9cb Merge "Add ability to reuse bitmaps when decoding PNG content" 2010-12-13 08:15:57 -08:00
Martijn Coenen
6c2471649b am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
* commit 'e3f6336bcffc250da90ec864bccfa73ad1d016b9':
  Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 08:14:01 -08:00
Martijn Coenen
e3f6336bcf Fixed API for active NDEF reading and NDEF formatting.
- Added getNdefCached() to return the message read at discovery time.
- Fixed format() to check ndef before doing the write:
  libnfc actually requires a checkNdef to be done before writing.

Change-Id: I9b3108299c05539bdef92dd74f62f911fb5a16bf
2010-12-13 09:58:58 -06:00
Iain Merrick
0f868ca036 Disable CacheManager when using the Chrome HTTP stack.
Currently, cacheDisabled() reports false, but no files are ever
added to the cache. This CL makes the framework more honest and
reports that the cache is disabled.

BUG=3270236

Change-Id: I13c0291ac295d965f71f1e70dbdebc74b95ddce0
2010-12-13 14:28:56 +00:00
Iain Merrick
d1281286f2 Merge "Move useChromiumHttpStack() from CookieManager to JniUtil." 2010-12-13 06:22:49 -08:00
Patrick Scott
5b87e296c5 Suppress scrollbars during layer fling.
Change-Id: Ia6bc1f48e464212d5b9cebef27e4527b0bc93713
2010-12-13 09:20:32 -05:00
Leon Scroggins
c5ab8b331d Merge "Use drawLines to draw the outline of the WebTextView." 2010-12-13 05:56:54 -08:00
Mike Lockwood
4e47e716d6 Merge "MTP: Add support for reserve storage setting to avoid low storage situations." 2010-12-12 12:22:57 -08:00
Mike Lockwood
7f36b19b6b MTP: Add support for reserve storage setting to avoid low storage situations.
Set resource config_mtpReserveSpaceMegabytes to number of megabytes to reserve.
If MTP has dedicated storage this value should be zero, but if MTP is
sharing storage with the rest of the system, set this to a positive value
to ensure that MTP activity does not result in the storage being
too close to full.

BUG: 3250924

Change-Id: I881c87240da268bad1ea1b99ad03673ab85ffdbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-12 12:17:43 -08:00
Jeff Hamilton
80c78a896f am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
* commit '641dd62155fd2eeddd93b2036154b13c05b70ba2':
  First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-11 20:58:38 -08:00
Jason Sams
3ccc75fa51 Merge "Add multitouch support to physics test. Fix context state overwrite calling invoke." 2010-12-11 18:52:37 -08:00
Jason Sams
4859f5233c Add multitouch support to physics test.
Fix context state overwrite calling invoke.

Change-Id: I7a71237bcf36abb31f98eb6d872501fdfb007d81
2010-12-11 17:42:30 -08:00
Adam Powell
63814df667 Smooth out gesture zooming in WebViews.
Change-Id: I42c1182f82af3ed16cd23efc056d7c9c34e32940
2010-12-11 16:49:05 -08:00
Adam Powell
45f1e08c34 Fix bug 3259354 - Handle ActionBar backgrounds better for interacting
with action modes.

Tweak ActionBar/mode transition animation to look better with a
variety of action bar styles.

Fix bug 3273773 - ActionBar disappearing while displaying
popupwindow. Some SurfaceFlinger optimizations require a relayout to
recalculate the bounds of overlaid views.

Fix bug 3266010 - Cancel animations properly when switching between
modes.

Change-Id: Ic431176b11115a2211bd0a46d09c8998aefe58d6
2010-12-11 16:25:13 -08:00
Jean-Michel Trivi
2ade576148 Fix bug 3275151 Request and abandon audio focus with audio mode changes
Before the introduction of the MODE_IN_COMMUNICATION audio mode,
 "calls" were only made through telephony and the PhoneStateListener
 was used to request and abandon audio focus as calls where started
 and ended. VoIP applications do not cause phone state events to
 be broadcast, and set the audio mode to MODE_IN_COMMUNICATION
 directly. This change monitors mode changes to automatically
 grab and abandon audio focus.

Change-Id: Ie9a4193e35ba8447764fac66a988959a93c4909f
2010-12-11 13:55:58 -08:00
Mike Lockwood
2711e494ca MTP: Check for null string before calling GetStringUTFChars() in MtpDatabase JNI
BUG: 3274649

Change-Id: I5a3c8fcebf71ed453a121ca5a1345e39895d3bf3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-11 11:29:31 -08:00
James Dong
2144f6316d Revert "Allows the authoring engine to skip frame."
o Skipping frames could lead to a lot of issues such as I frames is lost etc.
  It is not being used anyway.

This reverts commit 53d4e0d58e2d5c18f6e026c705af833b9bdd7aba.

Conflicts:

	media/libstagefright/AudioSource.cpp
	media/libstagefright/CameraSource.cpp

Change-Id: I3abba1647de48db25bdc369066eb2a7ae4dedec2
2010-12-11 10:57:03 -08:00
Wink Saville
086c0611d3 Fix build.
This change, I80dbccebea11544595935077463ad7737c3392e9, broke the build
I undeprecated two old OverScroller constructors and hid the new one.

Change-Id: I257ebbc6bb432c6487d63ff03725146dd225a8e2
2010-12-11 09:01:31 -08:00
Jeff Hamilton
641dd62155 First pass at advanced NFC tag dispatching APIs and other cleanup.
Change-Id: I022fcd481274a2f68d93218026e77551cfae8cae
2010-12-10 22:48:16 -06:00
Martijn Coenen
41e74b991b am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
* commit 'b79173f6602359d00a1a89f4d6505a44d461d796':
  Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-10 20:40:40 -08:00
Martijn Coenen
2019f53396 am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
* commit 'fc5a3b6cfb85679e82a39730c7154b55b0711a0c':
  Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-10 20:40:34 -08:00
Martijn Coenen
25556f6669 am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
* commit '3300e4c3ea2f2317532ded6f9e79d6ad9e038679':
  Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-10 20:40:26 -08:00
Martijn Coenen
b79173f660 Changed technology close() to reconnect to the tag instead of physical disconnect.
Change-Id: I8935e4aae452adeec472c0b3ff3c77f1400a264e
2010-12-10 22:07:46 -06:00
Martijn Coenen
fc5a3b6cfb Changed transceive on all technologies to "raw", except for Mifare classes.
Change-Id: I3d680e37fec0ab84cdbb70d9fb6fff9527dd76a2
2010-12-10 22:06:35 -06:00
Martijn Coenen
3300e4c3ea Implemented isWritable() to indicate NDEF capability container r/w state.
Change-Id: Ie8bdf490c955e620f5e5029346fbe2e188ea4748
2010-12-10 22:02:09 -06:00
Jim Miller
169a211f6b Fix 3253629: Improve Recents panel animation performance.
This change improves animation by enabling hardware acceleration
and reducing the size of the blue glow.

Change-Id: Ie8b7668b9b1f1ae91211875c2fa11b305a317d64
2010-12-10 18:37:35 -08:00
James Dong
314b2ef5a6 Merge "Fixed a failure from timelapse video recording because of accidental use of metadata buffers" 2010-12-10 17:34:52 -08:00