Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,485 Commits 3 Branches 0 Tags
f13b44529467995d7608883a65bc4c4e07cc5363
Commit Graph

142 Commits

Author SHA1 Message Date
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
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
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
Mike Lockwood
08bff3b9d4 USB: Add functions for querying if a USB function is supported and enabled. 
Change-Id: I5fc24960e1e01c27e892acc2e76c12ddf8c654cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-31 13:27:05 -04:00
Wu-cheng Li
b8f7f42f70 am 6e46e6f7: am 7ec7b997: Remove camera metering mode API. 
Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5'

* commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5':
  Remove camera metering mode API.
 2010-08-30 14:06:16 -07:00
Wu-cheng Li
7ec7b9970c Remove camera metering mode API. 
Metering mode is not supported yet.

Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
 2010-08-30 13:33:53 -07:00
Wu-cheng Li
769690e9ea am af610b2b: am 1620d118: Fix SDK build error. 
Merge commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048'

* commit 'af610b2b9fbf6a7e5e03d3d8bce2f4e082d21048':
  Fix SDK build error.
 2010-08-27 18:10:17 -07:00
Wu-cheng Li
7fe6d3f13a am 705c2e66: am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread 
Merge commit '705c2e66dcb358c865cf912a5496825088044b79'

* commit '705c2e66dcb358c865cf912a5496825088044b79':
  Unhide camera fps range API and deprecate old ones.
 2010-08-27 18:09:48 -07:00
Wu-cheng Li
1620d118a4 Fix SDK build error. 
Change-Id: I4705c10da850d684caa7067d656aff11bc65acbb
 2010-08-27 15:09:20 -07:00
Wu-cheng Li
5f1e69c76e Unhide camera fps range API and deprecate old ones. 
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
 2010-08-27 14:19:32 -07:00
Mathias Agopian
dcde3a8abe am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread 
Merge commit 'a62dfe9e49ea785c4be2173479e4472767771ce5'

* commit 'a62dfe9e49ea785c4be2173479e4472767771ce5':
  Improve Sensors documentation a bit
 2010-08-25 16:40:40 -07:00
Mathias Agopian
43c87e44fc Improve Sensors documentation a bit 
Change-Id: I6f4f9ebfaf1e7f461a795f717b9913e3a021e9d4
 2010-08-25 14:35:54 -07:00
Jean-Baptiste Queru
0a5699654f am f235a519: am ec58dff0: Fix build - remove dead doc link 
Merge commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f'

* commit 'f235a519398d47db1bbb8eb5e773565314b1fa4f':
  Fix build - remove dead doc link
 2010-08-24 10:25:00 -07:00
Jean-Baptiste Queru
1770b21ab5 am 0460e26a: resolved conflicts for merge of 691be97f to gingerbread-plus-aosp 
Merge commit '0460e26a4c9915f77c915d2cc3540969802b02fa'

* commit '0460e26a4c9915f77c915d2cc3540969802b02fa':
  add new sensor types for handling gyro data and device orientation
 2010-08-24 10:17:03 -07:00
Wu-cheng Li
eee09313c6 am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread 
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'

* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
  Add camera fps range API.
 2010-08-24 09:01:27 -07:00
Kevin Powell
7a0541d6b8 add new sensor types for handling gyro data and device orientation 
more efficiently.

Change-Id: Ifbcf2caae0865eccf1c9b8060342185c22145a30
 2010-08-20 19:24:02 -07:00
Jean-Baptiste Queru
f235a51939 am ec58dff0: Fix build - remove dead doc link 
Merge commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14' into gingerbread-plus-aosp

* commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14':
  Fix build - remove dead doc link
 2010-08-20 17:54:33 -07:00
Jean-Baptiste Queru
ec58dff066 Fix build - remove dead doc link 
Change-Id: I72e05d41819c14bf67d721740e0d48c71eeae397
 2010-08-20 17:44:14 -07:00
Jean-Baptiste Queru
0460e26a4c resolved conflicts for merge of 691be97f to gingerbread-plus-aosp 
Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124
 2010-08-20 17:16:37 -07:00
Wu-cheng Li
454630f237 Add camera fps range API. 
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
 2010-08-20 11:14:17 -07:00
Mathias Agopian
49eda50415 am 4195d097: am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread 
Merge commit '4195d097c535acf9e1c60b323134fcb5609c18b7'

* commit '4195d097c535acf9e1c60b323134fcb5609c18b7':
  Improve documentation of getAltitude
 2010-08-20 06:27:37 -07:00
Kevin Powell
f35fd959fe add new sensor types for handling gyro data and device orientation 
more efficiently.

Change-Id: Ie19992f6599e528a79931f4ae592898dac15412e
 2010-08-19 10:57:21 -07:00
Wu-cheng Li
24844c9a30 am a2527055: am c8696023: Merge "Document that autoFocus must be called in auto and macro mode." into gingerbread 
Merge commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9'

* commit 'a2527055f8e3106fe70feeee10ae0c4ddc6596e9':
  Document that autoFocus must be called in auto and macro mode.
 2010-08-18 14:22:02 -07:00
Mathias Agopian
a6704d39b3 Improve documentation of getAltitude 
Change-Id: Ie6c61fa6018e54143cec6e65978df9abb48854d9
 2010-08-18 12:00:30 -07:00
Wu-cheng Li
f008f3ea82 Document that autoFocus must be called in auto and macro mode. 
Change-Id: Ia52f8bc8a75a7473edff50326a4a0467f4295e6a
 2010-08-17 13:44:35 -07:00
Wu-cheng Li
fd83b2f92e am 77a473fb: am ccaa0028: Merge "Improve camera documentation." into gingerbread 
Merge commit '77a473fbcea0214832255af91e0a65d853757aae'

* commit '77a473fbcea0214832255af91e0a65d853757aae':
  Improve camera documentation.
 2010-08-12 14:07:59 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation. 
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
 2010-08-12 14:00:14 -07:00
Mathias Agopian
fdece4bbbf resolved conflicts for merge of dfce290b to master 
Change-Id: I9caace962cb0a697dd99ed92c5f35e57690fdf91
 2010-07-29 22:22:36 -07:00
Mathias Agopian
ce49d03aa4 resolved conflicts for merge of 02513855 to master 
Change-Id: Ie33d57798d3d5b800edde753dac86de062bc270c
 2010-07-29 22:06:44 -07:00
Mathias Agopian
04d7e83e65 Added SensorManager.getAltitude() 
this is a helper function to calculate the altitude from the
pressure and pressure at sea level.

Change-Id: I3f6f14fee6190388f95afa36a66287e3d59eef9b
 2010-07-29 18:18:01 -07:00
Mathias Agopian
050b56244f Added SensorManager.getMinDelay() 
Exposed the new "min delay" sensor property through native and
java sensor apis. This allows the caller to know what is the
maximum rate at which a sensor can return events, or, if a sensor
works in "update" mode (events returned only when the value changes).

Also augmented SensorManager.regusterSensorEvent() so that it can
accept a value in microsecond in addition to the 4 constants already
defined.

Change-Id: If425e9979892666df8c989d7de3c362230fa19e0
 2010-07-29 18:18:00 -07:00
Mike Lockwood
da39f0e878 Send Intents when PTP compatible devices are connected/disconnected to USB 
Usb.ACTION_USB_CAMERA_ATTACHED and Usb.ACTION_USB_CAMERA_DETACHED are sent
when cameras are connected and disconnected.
The data field of the intent contains a Uri for the camera in the Mtp content provider.

Change-Id: I814221b4f0507b309997c71edb5a041e8efc54f7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-07-27 19:20:15 -04:00
Mathias Agopian
50558b9561 resolved conflicts for merge of bc54e63c to master 
Change-Id: I4245b15b4cda6963d735442c0c6a04a0477ff5e1
 2010-07-21 18:10:22 -07:00