Commit Graph

172 Commits

Author SHA1 Message Date
Scott Main
f4f05b8f24 Update package descriptions with editorial revisions.
Notably, this removes exessive info about resources
from the content package, because it's not a good location
and the info is avilable in the dev guide, but also
added some of the info to the Resources class description.

Change-Id: Ie78af26c9cec66314deb98e53078f48e16c08e70
2011-01-26 14:58:19 -08:00
Jamie Gennis
fd6f39e147 Enable camera preview to a SurfaceTexture.
This change adds a public Java API to use a SurfaceTexture as the
destination of camera preview frames.

Change-Id: If537fed2df12c5c181e2af5f817985c1bda853fb
2011-01-07 17:40:24 -08:00
Mike Lockwood
264f6cd0b9 Temporarily remove UsbManager support for USB host.
A new USB host API will be added in an upcoming commit

Change-Id: I5816c10c7acd236d31ab8ae255fc83c77121eea0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-06 11:48:19 -05:00
Brad Fitzpatrick
70588bf864 resolved conflicts for merge of 3a2c6bf0 to master
Change-Id: I1963d8fc391bb84de1054f2b20ce4e082d764cbe
2011-01-05 14:04:06 -08:00
Brad Fitzpatrick
69ea4e15e5 Documentation fixes found over vacation hacking.
Change-Id: I28900026465d66d950cf4f05f0c202b46c3c2d43
2011-01-05 13:07:34 -08:00
Mike Lockwood
d07c9d5d92 UsbManager: Add methods to convert between USB device names and IDs
Change-Id: I199a47805b629cc7b1714191d6af2fd70c2bda6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:44:54 -05:00
Mike Lockwood
b92df0f669 Clean up USB notifications:
Add support for separate USB connected and configuration events

Include both USB connected/disconnected and configuration state
in USB_STATE Intent

Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents
Now we just have the sticky USB_STATE broadcast

Move USB disconnnect rebouncing from Tethering to UsbService

Change-Id: Id13eb0c5d51152d2a538985d680ba1db7d2241dc
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 18:32:59 -08:00
Mike Lockwood
770126a678 Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService
In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-09 22:52:05 -08:00
Dirk Dougherty
6fa74a5434 am 0d49a4e8: am 0871ee0c: Doc change: fix href to axis_globe_inverted orientation diagram.
* commit '0d49a4e838769252a313738e30fe78557f769a59':
  Doc change: fix href to axis_globe_inverted orientation diagram.
2010-12-06 23:36:18 -08:00
Dirk Dougherty
0871ee0c6f Doc change: fix href to axis_globe_inverted orientation diagram. 2010-12-06 19:40:21 -08:00
James Dong
dd0b16c268 Add two methods to Camera.java
o getSupportedVideoSizes() allows us to retrieve the list of the supported
  video sizes from the camera

o getPreferredPreviewSizeForVideoRecording() allows us to retrieve the
  preferred/recommended preview size for camcorder applications

bug - 3237021

Change-Id: I52fc9938d389bb411406320b0309775b6f44f4dc
2010-12-01 15:38:06 -08:00
Mathias Agopian
33962f8c7d am be0ece6f: am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
* commit 'be0ece6f855ee2ab52309b6633def90ddeab38ee':
  allow rotation-vector to have 4 components
2010-12-01 09:21:04 -08:00
Mathias Agopian
7badd2c402 allow rotation-vector to have 4 components
- upadte documentation for rotation vector
- update method dealing with rotation vector to deal with 4 components
- virtual rotation-vector sensor reports all four components
- improve SensorManager documentation layout

Whent he 4-th component of the rotation-vector is present, we can save
a square-root when computing the quaternion or rotation matrix from it.

Change-Id: Ia84d278dd5f0909fab1c5ba050f8df2679e2c7c8
2010-11-30 14:07:09 -08:00
Wu-cheng Li
4e911849ca am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbread
* commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6':
  Improve camera documentation.
2010-11-19 19:20:59 -08:00
Wu-cheng Li
589e838116 Merge "Improve camera documentation." into gingerbread 2010-11-19 18:14:43 -08:00
Mathias Agopian
b4673f757f am d3b5510b: am 927e7410: Merge "Fix SensorManager.getOrientation() documentation." into gingerbread
* commit 'd3b5510b8505c6c653469193a40f6431272085f3':
  Fix SensorManager.getOrientation() documentation.
2010-11-19 17:23:13 -08:00
Mathias Agopian
f71384cd61 Fix SensorManager.getOrientation() documentation.
This function doesn't use the same reference coordinate system used
for the rotation matrix, unlike what the documentation previously
stated.

Change-Id: I38abeb74540d33b67f72993b54d7a00a73588dde
2010-11-19 16:25:11 -08:00
Wu-cheng Li
99a3f3e4e0 Improve camera documentation.
bug:3212606
Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
2010-11-19 16:20:04 +08:00
Mathias Agopian
90d6b69426 am 0e438287: am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread
* commit '0e438287995698aacdda715713300fc01a6d1585':
  Improve gyro and accelerometer java doc
2010-11-09 17:43:16 -08:00
Mathias Agopian
fa33565714 Improve gyro and accelerometer java doc
Change-Id: If055512cb51d6e3b9f2094a730bf373ca963d97d
2010-11-09 13:53:25 -08:00
Wu-cheng Li
0a514792ed am 2ee0af48: am a48b70fa: Camera.open() should only return back-facing camera.
* commit '2ee0af48a3ebb4ac1bbf5e867850519b424e5a06':
  Camera.open() should only return back-facing camera.
2010-11-08 19:23:33 -08:00
Wu-cheng Li
0bae616364 am 6025ecec: am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing camera."
* commit '6025ecec2a0c37cdd0b25c85f6ffc54e35b42426':
  Revert "android.hardware.Camera.open only returns back-facing camera."
2010-11-08 19:23:15 -08:00
Wu-cheng Li
f90a0e84fe am 28345ef6: am 07b88fef: android.hardware.Camera.open only returns back-facing camera.
* commit '28345ef6e1171bf5da792bb743c1a986a539ee4b':
  android.hardware.Camera.open only returns back-facing camera.
2010-11-08 19:22:53 -08:00
Wu-cheng Li
a48b70fa8f Camera.open() should only return back-facing camera.
Also update current.xml and 9.xml. setRotationHint was also
missing from 9.xml.
bug:3173302

Change-Id: Idd3f7417a4d35c65910e9b08a1bfd157b91e1baa
2010-11-09 02:20:02 +08:00
Wu-cheng Li
17ae359721 Revert "android.hardware.Camera.open only returns back-facing camera."
This reverts commit 07b88fefd4.
2010-11-09 01:34:05 +08:00
Wu-cheng Li
07b88fefd4 android.hardware.Camera.open only returns back-facing camera.
bug:3173302
Change-Id: I813e41b36c776246f151b66ef289cdf13a05dc2c
2010-11-08 12:38:48 +08:00
Mathias Agopian
49686be71e am b20c2e7c: am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R." into gingerbread
* commit 'b20c2e7ca03f5ef2694b20ff9a7a10a7249eb936':
  [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
2010-11-04 10:29:09 -07:00
Kevin Powell
34884b409e [3163098] Fix bug in angleChange funtion which caused the returned angle change to be zeroall the time. The fix is to use PrevR instead of computing the difference between R and R.
Change-Id: I59cacab4c7108cfb4a17fd1021de7473e6faa74f
2010-11-03 16:35:02 -07:00
Wu-cheng Li
d55f7e56b9 Mirror the camera preview if the camera is front-facing.
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
2010-10-25 15:02:44 +08:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
Dirk Dougherty
4ef36afa32 am 18cbc0e5: am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Merge commit '18cbc0e58a0e68411dff655f116a7010c3f464a2'

* commit '18cbc0e58a0e68411dff655f116a7010c3f464a2':
  Doc change: escape angle brackets in javadoc comment.
2010-10-21 10:55:21 -07:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Wu-cheng Li
b982fb4fd3 Mirror the preview for front-facing cameras. do not merge
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.

bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
2010-10-20 18:29:18 +08:00
Wu-cheng Li
4b3370a31c am 9bf511db: am f73d48d7: Merge "Fix some camera orientation javadoc errors." into gingerbread
Merge commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188'

* commit '9bf511db85db8e8eff8833b3ec2c30cef12f9188':
  Fix some camera orientation javadoc errors.
2010-10-19 11:19:15 -07:00
Wu-cheng Li
2fe6fcaff4 Fix some camera orientation javadoc errors.
bug:3105659
Change-Id: I0e54f6dd3aa8aeb2494f2596130a5aeb9e1449ba
2010-10-19 19:14:04 +08:00
Dirk Dougherty
75ceb8d9db Doc change: escape angle brackets in javadoc comment.
Change-Id: Iad525e3575bc8e8cd65c7127b45a56a6fb56245d
2010-10-18 13:07:55 -07:00
Wu-cheng Li
e1199e382f am 9df14085: am 29332971: Merge "Add javadoc for display orientation." into gingerbread
Merge commit '9df140851375a977ad99390d71edf8b4a8382fd4'

* commit '9df140851375a977ad99390d71edf8b4a8382fd4':
  Add javadoc for display orientation.
2010-10-08 18:28:38 -07:00
Wu-cheng Li
c157e0cd16 Add javadoc for display orientation.
Display orientation should be considered while setting preview size,
picture size, or thumbnail size.

bug:3051937
Change-Id: I3b6bd1b920e4752ffdfc8aec56a0da9d474dd630
2010-10-07 19:41:23 +08:00
Wu-cheng Li
1eb98bdb44 am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation.
Merge commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a'

* commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a':
  Fix the javadoc of Parameters.setRotation.
2010-09-30 13:38:15 -07:00
Wu-cheng Li
2fb818ca7d Fix the javadoc of Parameters.setRotation.
setRotation needs to consider the orientation of cameras.
Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
2010-09-30 10:49:43 -07:00
Wu-cheng Li
d276720edb am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd'

* commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd':
  Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
2010-09-21 10:44:38 -07:00
Wu-cheng Li
d45cb72ac0 Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
This constant is not public yet. Continuous autofocus should
behave differently in still camera and camcorder. In camcorder,
lens movement may be more smooth. And the triggers to start a
new focus search may be different. If there is a need,
FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future.

Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
2010-09-21 08:46:32 -07:00
Mathias Agopian
99ce457320 am 8f476407: am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
Merge commit '8f476407bf4e6283b128532d594d44cc527e8204'

* commit '8f476407bf4e6283b128532d594d44cc527e8204':
  part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
2010-09-16 18:26:13 -07:00
Mathias Agopian
7bb3e78ff3 am 3a35f078: am 079ed615: Merge "fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors" into gingerbread
Merge commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933'

* commit '3a35f078e75cd3f63e57b0fffbac486e12a0a933':
  fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
2010-09-16 18:26:09 -07:00
Mathias Agopian
4d3cb63b9b part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work
- In SensorEventQueue, only bail on errors from Looper::loopOnce
- Improve sensor error logging

Change-Id: Ib3cf8d5d9fdac8513a3d753155827e0feeda1662
2010-09-16 17:33:48 -07:00
Mathias Agopian
ec33b82c42 fix [2931909] SensorManger breaks when using different SensorEventListener w/ the same sensors
- Sensor handle can now be arbitrary instead of being limited to 0-31
- make sure to disable sensors only when no listener uses them anymore

Change-Id: If656c8c24d9827a7db1de3b3aa89961abb7def0c
2010-09-16 17:21:08 -07:00
Wu-cheng Li
16d508acb3 am 4db458b4: am a6f41495: Merge "Update camera API and javadoc for API review comments." into gingerbread
Merge commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548'

* commit '4db458b4f71cd9ccbb98f5bf2c08e1f0eb750548':
  Update camera API and javadoc for API review comments.
2010-09-15 19:03:01 -07:00
Wu-cheng Li
7836660f5e Update camera API and javadoc for API review comments.
bug:3001395
bug:3001399
Change-Id: I7030c4eff94ab11f44b862e8c206fb69a4e5c428
2010-09-15 14:47:37 -07:00
Brad Fitzpatrick
612ff27425 Quell annoying Java ascii/unicode warning.
This fix is already in master, so just cherry-picking it here too.

Change-Id: I28c57171aa3e55933c3e98555575a074b25b2b2a
2010-09-06 19:22:09 -07:00
Mike Lockwood
6ed727e39e Merge "USB: Add functions for querying if a USB function is supported and enabled." 2010-08-31 13:46:35 -07:00