49442 Commits

Author SHA1 Message Date
Eino-Ville Talvala
3773eef4e3 Add an auto-exposure lock feature to the Camera API.
Adds a new camera parameter for locking auto-exposure to its current
value. Also adds a function for checking if auto-exposure lock is
supported by the current platform.

Hidden for now.

Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
2011-05-02 09:36:06 -07:00
Jason Sams
75e7b005b8 Merge "Add dalvik code for forEach." 2011-04-27 23:00:40 -07:00
Jason Sams
332d66d6c5 Merge "Start implementing control side forEach." 2011-04-27 23:00:25 -07:00
Wu-cheng Li
61773dbda3 Merge "Unhide camera focus area and metering area API." 2011-04-27 21:17:52 -07:00
Dima Zavin
4135f45c87 view: fix a bad merge
Change-Id: Ia309b6aca3d303d5ebc6f3def55b2d807ec8ec4b
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 19:07:14 -07:00
Mathias Agopian
431d5cf7d0 Merge "Fix uninitialized variable in SurfaceTexture" 2011-04-27 19:01:01 -07:00
Mathias Agopian
926340cf56 Fix uninitialized variable in SurfaceTexture
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
2011-04-27 18:58:46 -07:00
Dima Zavin
058520e9ee Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy
2011-04-27 17:13:46 -07:00
Conley Owens
d21e7b5d54 am c4791bd6: Merge commit \'5e3562a5\' into m
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
  onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 17:01:49 -07:00
Conley Owens
c4791bd65c Merge commit '5e3562a5' into m
Conflicts:
	core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
2011-04-27 16:58:24 -07:00
Conley Owens
ca96ed1d0e am eedf20c2: Ignore xml change since file no longer exists
* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
  Remove errant tag terminator
  Normalize output of XMLtree content
2011-04-27 16:54:40 -07:00
Conley Owens
eedf20c2ea Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Jason Sams
6e494d3ab6 Add dalvik code for forEach.
Change-Id: I26533fc553315b99b8f177ab62d9735a177b26b0
2011-04-27 16:33:11 -07:00
Dima Zavin
2986f5bed3 audioflinger: don't do work in constructor, instead do it in onFirstRef
Change-Id: I22d9e01821816c3beb52b014330386c7fd2f0411
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 16:20:22 -07:00
Dima Zavin
31f18889a2 audioflinger: enumerate all the possible audio interfaces
Keep track of the primary interface that handles the master volume,
etc.

Change-Id: Ib0701fccff8d8783a99035a241ab7c8ec75c00ac
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 16:20:22 -07:00
Gilles Debunne
0d846898ba Merge "Support for overlapping spans in TextView's suggestions." 2011-04-27 16:01:30 -07:00
Gilles Debunne
abe4b55f28 Merge "Typo in TextAppearanceSpan documentation" 2011-04-27 16:00:57 -07:00
Andreas Huber
f4188fa83a Merge "Fix omx_tests to no longer refer to test files that are no longer available." 2011-04-27 15:13:42 -07:00
Jason Sams
a08526ac42 Start implementing control side forEach.
Change-Id: I2d77d908cbb64b26071d9d5a3421f0b195342d2c
2011-04-27 15:12:49 -07:00
Andreas Huber
e23a392f70 Fix omx_tests to no longer refer to test files that are no longer available.
Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
2011-04-27 15:01:50 -07:00
Conley Owens
5e3562a5a5 am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
  onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 14:53:15 -07:00
Conley Owens
8279c193d1 am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
  Remove errant tag terminator
  Normalize output of XMLtree content
2011-04-27 14:53:10 -07:00
Gilles Debunne
214a8627c5 Support for overlapping spans in TextView's suggestions.
Implemented the merging of the different spans, highlighting words that actually differ.

Some TODO left in the code.

Change-Id: Iaf01f36b07d01639a4009cced6ea9b055ce9cc1f
2011-04-27 14:34:00 -07:00
Chet Haase
75e3ef048d Merge "Fix various hw-accelerated line/point bugs" 2011-04-27 14:26:40 -07:00
Gilles Debunne
0f9ae274b4 Typo in TextAppearanceSpan documentation
Dim does not exist anymore.

Change-Id: I83268657accfef15561ce313b66108adc108dfc6
2011-04-27 14:25:56 -07:00
Romain Guy
2ef1ce494c Merge "Correctly compute tex coords for rect layers. Bug #4192695" 2011-04-27 14:23:36 -07:00
Chet Haase
8a5cc92a15 Fix various hw-accelerated line/point bugs
All accelerated lines are now rendered as quads. Hairlines used to
be rendered as GL_LINES, but these lines don't render the same as our
non-accelerated lines, so we're using quads for everything. Also, fixed
a bug in the way that we were offsetting quads (and not offseting points)
to ensure that our lines/points actuall start on the same pixels as
Skia's.

Change-Id: I51b923cc08a9858444c430ba07bc8aa0c83cbe6a
2011-04-27 14:23:29 -07:00
Romain Guy
9fc27819d7 Correctly compute tex coords for rect layers.
Bug #4192695

This change also fixes Javadoc links in the framework.

Change-Id: Ia548bcb18baba5d6fe6a4a04a2278e3a3bd465b2
2011-04-27 14:21:41 -07:00
Conley Owens
b4a56f10d8 am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
  Add lock before calling initEglImage
2011-04-27 13:54:08 -07:00
Conley Owens
cfe7b9fcfa am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"
* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
  onDetachedFromWindow is called before onAttachedToWindow
2011-04-27 13:53:37 -07:00
Conley Owens
779fa1515d am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996
* commit '4a4d96e7ee682167861434cba05531f04642bf97':
  Remove errant tag terminator
  Normalize output of XMLtree content
2011-04-27 13:48:45 -07:00
Conley Owens
ba5aebd106 am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
  Add lock before calling initEglImage
2011-04-27 13:41:12 -07:00
Jason Sams
36f873c765 Merge "Cleanup rs.spec file and code generator." 2011-04-27 13:20:39 -07:00
Conley Owens
a538b4a206 Merge "onDetachedFromWindow is called before onAttachedToWindow" 2011-04-27 13:14:57 -07:00
Dima Zavin
24fc2fb1c5 audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 13:10:10 -07:00
Conley Owens
4a4d96e7ee Merge changes I0ab47e2f,Ib8016996
* changes:
  Remove errant tag terminator
  Normalize output of XMLtree content
2011-04-27 13:06:46 -07:00
Conley Owens
ac505b86b4 am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
  Add lock before calling initEglImage
2011-04-27 12:46:09 -07:00
Conley Owens
f0556bb90f am 86d1d747: Merge "Add lock before calling initEglImage"
* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
  Add lock before calling initEglImage
2011-04-27 12:43:19 -07:00
Conley Owens
86d1d74762 Merge "Add lock before calling initEglImage" 2011-04-27 12:28:05 -07:00
Gloria Wang
c7d1d6288e am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
  Add heartbeat error codes into MediaErrors.h
2011-04-27 12:27:05 -07:00
Conley Owens
3064878a02 am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
  Fix for startup NPE.
2011-04-27 12:24:58 -07:00
Gloria Wang
d84df05490 am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit '969749319ca17f6e0c6836303a78cc484df2539b':
  Add heartbeat error codes into MediaErrors.h
2011-04-27 12:24:42 -07:00
Conley Owens
b54bebf47f am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.
* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
  Fix for startup NPE.
2011-04-27 12:21:50 -07:00
Conley Owens
470239a090 am 30d59fa9: Ignore fix for startup NPE as file is deleted.
* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
  Fix for startup NPE.
2011-04-27 12:18:03 -07:00
Gloria Wang
969749319c am 83ddcdf7: Add heartbeat error codes into MediaErrors.h
* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
  Add heartbeat error codes into MediaErrors.h
2011-04-27 12:11:49 -07:00
Svetoslav Ganov
13dfabde84 Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered." 2011-04-27 12:11:01 -07:00
Conley Owens
30d59fa90f Ignore fix for startup NPE as file is deleted.
Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20
2011-04-27 12:09:35 -07:00
Alex Sakhartchouk
998d4570bd Merge "Better workaround for the bitmap invalidation problem." 2011-04-27 12:08:59 -07:00
Svetoslav Ganov
a3e261d506 The accessibility input filter state was not unregistered when
no spoken feedback accessibility services are regitstered.

bug:4343996

Change-Id: Ie709ac24baa084cf3627d6adb6caf1550c399f8b
2011-04-27 12:06:28 -07:00
Conley Owens
44935c2908 Merge "Fix for startup NPE." 2011-04-27 11:40:46 -07:00