Commit Graph

31976 Commits

Author SHA1 Message Date
Mike Lockwood
2c2d06da2a Merge changes I75c4c7dc,Ie9f3dea3
* changes:
  MTP: List all the formats we support in addition to FORMAT_UNDEFINED
  MTP: Fix problems with signed ints in MtpCursor.cpp
2010-09-23 19:11:21 -07:00
Mike Lockwood
12b8a99fc1 MTP: List all the formats we support in addition to FORMAT_UNDEFINED
Fixes Windows Media Player support

BUG: 3003770

Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:08:24 -04:00
Mike Lockwood
ba7655432c MTP: Fix problems with signed ints in MtpCursor.cpp
BUG: 2978335

Change-Id: Ie9f3dea3b88b00a555e1ca3232f196e83ee7a6da
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:08:16 -04:00
Mathias Agopian
fea28c9367 Merge "dump HWC state in dumpsys" 2010-09-23 18:19:46 -07:00
Mathias Agopian
90da4dd2a2 dump HWC state in dumpsys
Change-Id: Ifbb38ca1ac9685776250e01c8d02021b35af72cf
2010-09-23 18:13:21 -07:00
Joe Onorato
dd92b611ad Merge "Merge commit '00cb6417' into master. Doesn't turn on the debugging." 2010-09-23 17:22:43 -07:00
Jim Miller
3060421045 Add new WaveView widget to framework and integrate into LockScreen.
This adds a new "Energy Wave" widget to the internal widgets and
integrates it into LockScreen.

ValueAnimator needed a slight modification since it expects to
be run inside of Activities with a Looper. Additionally, this adds
an API, removeAllUpdateListeners(), which is needed to properly
recycle ValueAnimator objects.

Some minor code cleanup and UI tweaks after review.

Changed delay timeout from 1.3s to 0.5s.

Change-Id: Ibcf015e61fa8ba79d62f2019f1b29ace7caa00c8
2010-09-23 17:14:48 -07:00
Joe Onorato
1578f21dad Merge commit '00cb6417' into master. Doesn't turn on the debugging.
Change-Id: I1d4db9c5256ba45a44e50e8229b895e2e5330690
2010-09-23 17:05:09 -07:00
Stephen Hines
4f5388df7f Merge "Add RsList implementation to RSTest." 2010-09-23 16:43:36 -07:00
Romain Guy
1abe452515 Merge "Add drawing profiling to the HardwareRenderer." 2010-09-23 16:34:05 -07:00
Romain Guy
9a40babc62 Add drawing profiling to the HardwareRenderer.
Change-Id: Idf410f1764f3e73590b587d0d76a8d10c021f056
2010-09-23 16:32:47 -07:00
Romain Guy
d1fbcbb3cc Merge "Don't clip alpha layers if the flag is not set." 2010-09-23 16:18:32 -07:00
Bill Napier
297bb68d7c Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." 2010-09-23 16:17:11 -07:00
Romain Guy
fd880425e0 Don't clip alpha layers if the flag is not set.
Change-Id: I820fa66bc3699357677f37a769de52fd176d9416
2010-09-23 16:16:04 -07:00
Amith Yamasani
b723ff009e Merge "Fix for Ringtones not being saved when using Preference fragments." 2010-09-23 16:07:20 -07:00
Joe Onorato
00cb6417dc am f9ec03c0: Make the logging a little more targeted for the status bar multiple icon problem.
Merge commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be' into gingerbread-plus-aosp

* commit 'f9ec03c0f5fc2c6eba5bbead24c4eb314c0205be':
  Make the logging a little more targeted for the status bar multiple icon problem.
2010-09-23 15:41:28 -07:00
Stephen Hines
ff4d70872a Add RsList implementation to RSTest.
Run subtests in their own thread / RS context.
Created UnitTest framework using message passing for RS.
Add color status reporting to device output.
Fix some typos in RsList.

Change-Id: I251d632b9550a1c117d677f011741a796b561e59
2010-09-23 15:37:57 -07:00
Amith Yamasani
82e7bc1134 Fix for Ringtones not being saved when using Preference fragments.
Bug: 2988732

RingtonePreference was calling startActivityForResult on Activity instead
of on Fragment, so the result was not being delivered to the fragment.

Setting a fragment owner on the PreferenceManager instance so that it can
be used instead of getActivity() for launching the intent.

Not exposing any new public APIs at this time.
2010-09-23 15:14:59 -07:00
Joe Onorato
f9ec03c0f5 Make the logging a little more targeted for the status bar multiple icon problem.
Change-Id: I726eef29281dce2a1b900c28ad55bf82cb50449a
2010-09-23 15:11:04 -07:00
Dirk Dougherty
8cb9e9c5c7 am 85662b8e: am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread
Merge commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5'

* commit '85662b8e4f69b0e6d9a04084d4e2354fb8eecad5':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 15:04:43 -07:00
Dirk Dougherty
85662b8e4f am f356c4bb: Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread
Merge commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b' into gingerbread-plus-aosp

* commit 'f356c4bb3b19786555ceed8a1dbc824aac742d1b':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 15:00:59 -07:00
Dirk Dougherty
f356c4bb3b Merge "Doc change: ADT 0.9.9 version notes, size/sum update." into gingerbread 2010-09-23 14:58:41 -07:00
Jeff Brown
5bd069fe1e am 27917946: am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit '279179461edccaa4217fe752a9abf6fcc2efa5a1'

* commit '279179461edccaa4217fe752a9abf6fcc2efa5a1':
  Enforce serial ordering of MotionEvents.
2010-09-23 14:57:14 -07:00
Jeff Brown
279179461e am de04fb0a: Merge "Enforce serial ordering of MotionEvents." into gingerbread
Merge commit 'de04fb0a0366057028369eb3b3efcb75367f74db' into gingerbread-plus-aosp

* commit 'de04fb0a0366057028369eb3b3efcb75367f74db':
  Enforce serial ordering of MotionEvents.
2010-09-23 14:53:52 -07:00
Jeff Brown
de04fb0a03 Merge "Enforce serial ordering of MotionEvents." into gingerbread 2010-09-23 14:51:52 -07:00
Kenny Root
43480d7b4d am 2b1ffce1: am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '2b1ffce18301ae051a70a85254133c29b9381593'

* commit '2b1ffce18301ae051a70a85254133c29b9381593':
  Better errors in PackageManagerTests
2010-09-23 14:34:55 -07:00
Kenny Root
2b1ffce183 am 7f459df9: Merge "Better errors in PackageManagerTests" into gingerbread
Merge commit '7f459df9f94bc52e53d42894dea4702394fbad5c' into gingerbread-plus-aosp

* commit '7f459df9f94bc52e53d42894dea4702394fbad5c':
  Better errors in PackageManagerTests
2010-09-23 14:31:06 -07:00
Kenny Root
7f459df9f9 Merge "Better errors in PackageManagerTests" into gingerbread 2010-09-23 14:27:00 -07:00
Andreas Huber
b9354fdf72 am 13770dcc: am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread
Merge commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33'

* commit '13770dcce2cc1b4268ba092b59bc5a4c049f3a33':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
2010-09-23 14:25:28 -07:00
Dianne Hackborn
eecb5b9873 am 2983e038: am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '2983e038d189a257f1e5abb9c120bd1feb253773'

* commit '2983e038d189a257f1e5abb9c120bd1feb253773':
  Fix a deadlock I ran into.
2010-09-23 14:20:48 -07:00
Andreas Huber
13770dcce2 am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread
Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp

* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
2010-09-23 14:20:08 -07:00
Dianne Hackborn
2983e038d1 am 045398e6: Merge "Fix a deadlock I ran into." into gingerbread
Merge commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70' into gingerbread-plus-aosp

* commit '045398e6243fa4e83fb6435df4e8ffc6a7487a70':
  Fix a deadlock I ran into.
2010-09-23 14:17:54 -07:00
Andreas Huber
7b2ed5d7d6 Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly." into gingerbread 2010-09-23 14:16:48 -07:00
Dianne Hackborn
045398e624 Merge "Fix a deadlock I ran into." into gingerbread 2010-09-23 14:15:45 -07:00
Andreas Huber
e7635933b6 Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.
Change-Id: I1423923fafbcac6911218277e2bbfa068e49dcc6
2010-09-23 14:08:32 -07:00
Jeff Brown
93ed4e3052 Enforce serial ordering of MotionEvents.
This change modifies ViewRoot to wait until the MotionEvent has been
delivered before telling the input dispatcher that it is finished.
The serial ordering guarantee will be required by new features that
may need to transfer touch focus from one window to another.

Change-Id: I0a64d1f0c8bc3f08846f213d6e28ce48b1d48e58
2010-09-23 13:56:30 -07:00
Eric Fischer
6f27ab8bd4 am 9c708358: am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7'

* commit '9c70835896b6c078ac4c8b2e30cb6cfba70bb9d7':
  Add an aapt option to allow string variations for different devices.
2010-09-23 13:52:00 -07:00
Eric Fischer
9c70835896 am 37cedce1: Merge "Add an aapt option to allow string variations for different devices." into gingerbread
Merge commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed' into gingerbread-plus-aosp

* commit '37cedce14bc0e68e8bf27c2cecb181728226e6ed':
  Add an aapt option to allow string variations for different devices.
2010-09-23 13:49:44 -07:00
Gil Dobjanschi
7eb805707f Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation" 2010-09-23 13:48:33 -07:00
Eric Fischer
39b41d9280 Merge "Remove translations of date formats not needed since cupcake." 2010-09-23 13:47:53 -07:00
Eric Fischer
37cedce14b Merge "Add an aapt option to allow string variations for different devices." into gingerbread 2010-09-23 13:47:06 -07:00
Mathias Agopian
ecc875e22c am 9c4d7d67: am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound.
Merge commit '9c4d7d677097981a349c718902e29050dad3d59f'

* commit '9c4d7d677097981a349c718902e29050dad3d59f':
  fix [3028370] GL get error should return a valid error if no context is bound.
2010-09-23 13:28:47 -07:00
Mathias Agopian
9c4d7d6770 am 5c6c5c7a: fix [3028370] GL get error should return a valid error if no context is bound.
Merge commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c' into gingerbread-plus-aosp

* commit '5c6c5c7a43d44316395f5c35ab713372124b8b4c':
  fix [3028370] GL get error should return a valid error if no context is bound.
2010-09-23 13:24:11 -07:00
Mathias Agopian
5c6c5c7a43 fix [3028370] GL get error should return a valid error if no context is bound.
glGetError() will now always return GL_INVALID_OPERATION if called from a thread
with no GL context bound.

Change-Id: I28ba458871db051bb4f5a26668a1fa123526869c
2010-09-23 13:19:02 -07:00
Steve Howard
9c7bec2538 am 1fd11292: am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3'

* commit '1fd1129264ef4379633aa4fcd8a9ecaeeb9797f3':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:11:19 -07:00
Steve Howard
1c134d5559 am 8449490a: am 4f564cde: Tweaks to download manager API based on API review feedback
Merge commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a'

* commit '8449490a94fb5ab02be2a67d4b57c017d8abd75a':
  Tweaks to download manager API based on API review feedback
2010-09-23 13:10:58 -07:00
Scott Main
35a840c8b1 am a2427797: am 2dc43f3d: am 5b7328f2: Merge "docs: add more info about state list drawable and onclick attribute to Button bug:1062898" into froyo
Merge commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2'

* commit 'a24277977d597b88d3ccfed266e1803d3f7b20a2':
  docs: add more info about state list drawable and onclick attribute to Button
2010-09-23 13:10:22 -07:00
Dirk Dougherty
bc05d73a36 am 1c75552d: am 5ee00e22: am 27de3a24: (-s ours) Doc change: ADT 0.9.9 version notes, size/sum update.
Merge commit '1c75552d5b22573da15726b1309283bee85c3c2f'

* commit '1c75552d5b22573da15726b1309283bee85c3c2f':
  Doc change: ADT 0.9.9 version notes, size/sum update.
2010-09-23 13:10:11 -07:00
Mathias Agopian
c8be9b212f Merge "add a way to toggle the h/w composer at runtime" 2010-09-23 13:09:00 -07:00
Steve Howard
1fd1129264 am bb0d23b5: Have DownloadManager pass file URIs for legacy external downloads
Merge commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8' into gingerbread-plus-aosp

* commit 'bb0d23b5475cb516fa6f61ee3fe4e7b79cd980f8':
  Have DownloadManager pass file URIs for legacy external downloads
2010-09-23 13:02:21 -07:00