Commit Graph

12045 Commits

Author SHA1 Message Date
Wu-cheng Li
88eeff5270 Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency.
bug:2375986
2010-01-25 15:20:23 +08:00
Chih-Chung Chang
703111327e Merge "Add support for 180/270 degrees rotation." 2010-01-22 18:08:23 -08:00
Kenny Root
18b0997a7b Merge "Add extra resources field for ApplicationInfo" 2010-01-22 17:14:49 -08:00
Robert Greenwalt
70ab9f8824 am d2c21c15: am 8c166512: Merge "Cleanup of process-specific DNS." into eclair
Merge commit 'd2c21c1518631edd798367cf20cbc5434321d266'

* commit 'd2c21c1518631edd798367cf20cbc5434321d266':
  Cleanup of process-specific DNS.
2010-01-22 17:05:05 -08:00
Mike Lockwood
031c419c67 am 47d302a0: am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair
Merge commit '47d302a001c71f90bee8dc31d868b463a47f2d51'

* commit '47d302a001c71f90bee8dc31d868b463a47f2d51':
  Be tolerant of GPS session and engine on status messages arriving out of order.
2010-01-22 17:04:47 -08:00
Kenny Root
3634fd740c Merge "Unhide resource-related API calls in Context" 2010-01-22 16:57:57 -08:00
Chih-Chung Chang
5994a330ac Add support for 180/270 degrees rotation. 2010-01-22 16:30:39 -08:00
Kenny Root
830bf2e81a Merge "Multiple asset adding in one shot for AssetManager" 2010-01-22 15:54:11 -08:00
Romain Guy
d498f8a714 Merge "Make dialogs look better when their content is small." 2010-01-22 15:33:07 -08:00
Dan Egnor
45119fd323 Merge "As requested, expand ANR event log entry (and crash/WTF too) to include process flags (including FLAG_SYSTEM, etc)." 2010-01-22 15:24:17 -08:00
San Mehat
c58e431e36 Merge "NetworkManagementService: Introduce API methods for configuring interfaces" 2010-01-22 15:20:18 -08:00
San Mehat
a8f8795825 Merge "android.net: Introduce @hidden parcelable InterfaceConfiguration class" 2010-01-22 15:20:10 -08:00
Andreas Huber
8186a026d5 Merge "Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash." 2010-01-22 14:51:28 -08:00
Doug Zongker
70567adcee Merge "remove GoogleLoginService unit test" 2010-01-22 14:30:02 -08:00
Xavier Ducrohet
4fd54a2d65 am 3bd6dc65: am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair
Merge commit '3bd6dc653521281db25df77f055b3ec0b4659454'

* commit '3bd6dc653521281db25df77f055b3ec0b4659454':
  ADT/Layoutlib: implement sweep gradient.
2010-01-22 12:36:26 -08:00
Scott Main
e05066b879 am 382f924c: am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file
Merge commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4'

* commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4':
  docs: a lot of revision and expansion of the hello view tutorials
2010-01-22 12:00:42 -08:00
Adam Powell
eac3a68b17 am 97b10853: am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair
Merge commit '97b108532f04f72af035e372be7b827f77888650'

* commit '97b108532f04f72af035e372be7b827f77888650':
  Edge of screen slop detection for ScaleGestureDetector.
2010-01-22 12:00:24 -08:00
Scott Main
d18ccd6a01 am 5ed68156: am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair
Merge commit '5ed681561c5904eb55a275387f1df8cec401361c'

* commit '5ed681561c5904eb55a275387f1df8cec401361c':
  docs: add a section about debugging web pages with the Console APIs;
2010-01-22 12:00:00 -08:00
Dianne Hackborn
8aa68dc935 am 5f641285: am b1c4a2a3: Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Merge commit '5f64128568d815f91dcd37db43d4e26a0566b41c'

* commit '5f64128568d815f91dcd37db43d4e26a0566b41c':
  Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
2010-01-22 11:59:41 -08:00
Mathias Agopian
519f29f5d8 Merge "return an error when Surface::lock() is called while the surface is already locked." 2010-01-22 11:52:08 -08:00
Mathias Agopian
9014726d89 return an error when Surface::lock() is called while the surface is already locked. 2010-01-22 11:47:55 -08:00
Andy McFadden
3983e26292 Merge "Move VM feature strings (used by DDMS) into VM." 2010-01-22 11:32:52 -08:00
Ken Shirriff
9ecddd62a2 Merge "Remove unused providers" 2010-01-22 11:14:43 -08:00
Romain Guy
74f561d0d8 Merge "Bring back buttons in dialogs. Bug #2390537" 2010-01-22 11:01:42 -08:00
Xavier Ducrohet
d6d3f143a9 am 60e3c09e: am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair
Merge commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7'

* commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7':
  ADT/Layoutlib: implement radial gradient.
2010-01-22 09:45:49 -08:00
Ying Wang
e1612fa894 am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair
Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
  Add instrumentation as a source tag for proguard keep options.
2010-01-22 09:45:31 -08:00
Guang Zhu
a4122d95f7 am e0aed796: am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair
Merge commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0'

* commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0':
  Prevent orientation change from triggering activity recreation.
2010-01-22 09:44:34 -08:00
Amith Yamasani
d2dd0e25aa am 658dc0d4: am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair
Merge commit '658dc0d4b03015eb4a692968b82b664e24aa605a'

* commit '658dc0d4b03015eb4a692968b82b664e24aa605a':
  Security fix in accessibility - don't read out password. # 2371557
2010-01-22 09:44:16 -08:00
Scott Main
aa354255d5 am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'

* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
  docs: some spelling typos
2010-01-22 09:43:56 -08:00
Marco Nelissen
32f6863e21 Merge "Make the media scanner disregard database entries that do not have absolute path names. This allows us to store other things (perhaps with http or content URIs) in the database, without the media scanner removing them again." 2010-01-22 07:53:12 -08:00
Chih-Chung Chang
52e7200b6e Add an orientation parameter for overlay, so we can do camera preview in portrait mode. 2010-01-21 20:20:08 -08:00
Romain Guy
d28d5be75b Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138" 2010-01-21 19:11:20 -08:00
Grace Kloba
59b4cfc4b3 am 76c29e63: (-s ours) am f167c4bf: DO NOT MERGE
Merge commit '76c29e633fd924e0f98f34768999abb991753394'

* commit '76c29e633fd924e0f98f34768999abb991753394':
  DO NOT MERGE
2010-01-21 17:57:51 -08:00
Grace Kloba
9dd486267f am b869c594: (-s ours) am 17b14bd3: DO NOT MERGE
Merge commit 'b869c594465d29e96fb841b48c638ddee232bbd7'

* commit 'b869c594465d29e96fb841b48c638ddee232bbd7':
  DO NOT MERGE
2010-01-21 17:57:29 -08:00
Grace Kloba
90713bcfdb am 55d791e7: (-s ours) am 5a0bf1f0: DO NOT MERGE
Merge commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a'

* commit '55d791e74eaa8c80b965075d6debc1cfd7bde99a':
  DO NOT MERGE
2010-01-21 17:57:07 -08:00
Grace Kloba
a24ffc2854 am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2'

* commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2':
  If ZoomButttonsController detects more than one pointer,
2010-01-21 17:56:46 -08:00
Grace Kloba
d0a6dc225d am 3648f949: (-s ours) am f080a5ad: Merge "DO NOT MERGE" into eclair
Merge commit '3648f949ef100668500c9f21d0e8b53d310a393e'

* commit '3648f949ef100668500c9f21d0e8b53d310a393e':
  DO NOT MERGE
2010-01-21 17:56:25 -08:00
Jim Miller
27be597fcb am 84928fa9: am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair
Merge commit '84928fa93c3be222b77794de9922d299f4971ea4'

* commit '84928fa93c3be222b77794de9922d299f4971ea4':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
2010-01-21 17:56:03 -08:00
Xavier Ducrohet
35e0ee0dac am da84d6a1: am 908a8111: Merge "ADT/Layoutlib: Add dash support to stroke." into eclair
Merge commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6'

* commit 'da84d6a1b1c37376d48f92ae59b76f1c891772f6':
  ADT/Layoutlib: Add dash support to stroke.
2010-01-21 17:55:40 -08:00
Xavier Ducrohet
9920a48c57 am c0ea805c: am 2b30a4a5: Merge "ADT/Layoutlib: properly handle stroke information." into eclair
Merge commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3'

* commit 'c0ea805c649666b55d4dde09eb72dcccfa8bccc3':
  ADT/Layoutlib: properly handle stroke information.
2010-01-21 17:55:17 -08:00
Paul Westbrook
938c3d8509 Merge "Bug 2330111" 2010-01-21 17:14:06 -08:00
Paul Westbrook
7d9549172a Bug 2330111
Make NumberPicker public

Made setCurrent() more robust, as the value needs to be within the range
specified earlier. setCurrent() will now throw an exception
if the specified doesn't fall in the range
2010-01-21 16:56:57 -08:00
Wink Saville
34b7c1753e Merge "Fix build, incorrect link/see tags." 2010-01-21 16:46:42 -08:00
Dianne Hackborn
3bdbaaa18f Merge "Don't crash when there is no admin." 2010-01-21 16:44:53 -08:00
Mathias Agopian
35e973f696 Merge changes I2d41cb94,Ia1a17985
* changes:
  fix [2324665] texture leak in surfaceflinger when using camera
  fix a texture leak introduced recently.
2010-01-21 16:37:48 -08:00
Mathias Agopian
edfd97c0f2 fix [2324665] texture leak in surfaceflinger when using camera 2010-01-21 16:29:34 -08:00
Mathias Agopian
8c3b597aa7 fix a texture leak introduced recently.
create the texture name once and for all for a given BufferSource
and make sure to recreate it when we're forced to delete the texture.
2010-01-21 16:27:30 -08:00
Doug Zongker
a2fe2f39d9 Merge "relocate GoogleLoginService" 2010-01-21 16:10:58 -08:00
Wink Saville
0693d08bd4 Merge "Fix build, GsmServiceStateTracker was using old EventLog API." 2010-01-21 15:00:12 -08:00
Grace Kloba
834081811a am 88196464: (-s ours) am 4d69ac66: Merge "DO NOT MERGE" into eclair
Merge commit '88196464e91dd533f2dd28a02f55b7e4801eead0'

* commit '88196464e91dd533f2dd28a02f55b7e4801eead0':
  DO NOT MERGE
2010-01-21 14:32:01 -08:00