Skip to content

Conversation

@zyr3x
Copy link

@zyr3x zyr3x commented Feb 20, 2013

pawitp and others added 30 commits November 22, 2012 15:26
onSingleTapUp is now triggered through PreviewGestures instead of
ActivityBase, so the check in initializeVideoSnapshot() is no
longer enough to prevent triggering video snapshot on unsupported
devices.

Change-Id: Iab0b4b3d0cd9b0ea7278eceee3ae58419f5df100
…is basicily a negitive value

Change-Id: Ieac03cced0c3312eaaa321964bc30a9c98326a29
The OMAP3 HAL (at least) stops the preview while taking a snapshot,
without generating events to the upper layers, and telling it to
stop again leads to an inconsistent state.
Use "previewStopsDuringSnapshot" to avoid sending a stop while
it is already stopped

Change-Id: I4d4fe501c0dd6dd9aefb7d35f0e9dc6887e15162
    Allows user to take use power key to take pictures/videos

    Patchset 2 : Minor cleanup
    Patchset 3 : Keep string case inline with others

    Change-Id: I4dba67792d64f747174f5346a0a2a75ab632bb48

    Conflicts:

    	AndroidManifest.xml
    	src/com/android/camera/ActivityBase.java
    	src/com/android/camera/Camera.java
    	src/com/android/camera/VideoCamera.java

commit 3d8dca72ded986b51a202f24407593fff8fa52b2
Author: Danesh Mondegarian <daneshm90@gmail.com>
Date:   Sat Oct 27 23:10:07 2012 -0400

    Camera : PowerShutter fixes

    Ignore keyevents in video camera as well when in thumbnail mode
    Remove unecessary /repetitive flag modifications

    Change-Id: Ic0fe782387d2f331b80c68ab8067d8e2020c03ca

Camera : Ignore keyevents when in gallery

When in gallery view, ignore any keyevents.

http://goo.gl/9FEGw

Change-Id: I6d412327d603f204435302c1955b4dcd3bc942fc

Camera : Fix Ignore keyevents

Call super's onKeyUp/onKeyDown instead.

Change-Id: I054a58f1d0758edafdd4505d41401f3f8f53dda0

Change-Id: I7f14bfbba22b25322bf664e9901991ae26555674
This reverts commit 4dfaa4a.

Reason : Doesnt seem to be allowed to access non public api's.
Change-Id: I68e6995a51dffa3b5851eb4b7a3a72e60d201d5b
Needed for some samsung cameras.

Change-Id: Ib87071bdd900aa1a42253bf6e2038b0af51f065b
By default, if a HAL supports touch-to-focus, mode selection is
disabled. Make that an option for devices where manual modes
work better without TTF (Macro, for instance)

Change-Id: Id47fba2a9d156b157440485a0fa516871076d9f9
…rom hal is basicily a negitive value"

This reverts commit 1c49180.

Negative min value is a valid exposure setting. The patch causes
exposure setting to be always detected as unsupported.
Change-Id: Icafae911c0d12493097d31ebc3ffd770fb15a256
Change-Id: Ida35e08e02f51b7ca2b89dfeeb7e550e6e562c25

Conflicts:
	src/com/android/camera/VideoModule.java
 * Preview management for Samsung/Qualcomm cameras
 * Add workaround for broken face detection on front camera

Change-Id: Ib36bd21c9a76b45bced3eee2f25acc35b5d82b30
- add burst mode
- add color effects for photo and video
- add ISO settings
- add JPEG quality settings

Change-Id: I0d6a3cf864e618e3698baa42f8a11c0fa9a908a7
Change-Id: I3890bf92d6a63ed226516a614ef0c085525ddc89
Change-Id: I7124dae03b442676d0461ae74150bd20c234785c
* Updated with new feature (burst mode & co.)

Change-Id: I4e42721b1bde8a78d48ab7dfca51feff66b31a5c
Change-Id: Iabebda0a27454eb3d90bff92498817c2e31752bb
Ported from CM10.

Change-Id: Ia815a19d3d9a2907b77d825bc883833bbc8d2539
Change-Id: I130991b157ee70e148f8d8880d314aa6a43f536a
Change-Id: I90c700f189559501e96c6ccdd79caf67b74ae40c
Signed-off-by: Igor <igor_sorocean@hotmail.com>
Change-Id: Ic6da906fc62a24684ba6e9a6d62c9a8d271da3ae
Change-Id: I4d06a57292edaa28cae68154f32184178b15f2e7
Change-Id: Ie2cd3066010713870c7ba465ad6b57daa2c2573e
Change-Id: I7c2ba9af0c2c46b320b13c075557756aa53dc480
Change-Id: I6642d818787a1f99c5ff5daf4c094936096ac214
Manogna Reddy Alle and others added 30 commits February 3, 2013 19:39
(cherry picked from commit 9fbccbe5bad2249e13a86581ecbd1e68810a0e90)

Change-Id: Id28c90b43ce33702d9c421e9a3b19d4502b77609
…version till now

Change-Id: Ie52bd9b2caeae1a262db06e96538a643d43e3c6b
Change-Id: I52c8f9eba8dd0bb4f46d4dcae6e069250ddb4a55
Change-Id: I817b6fa0ab0b25e5dce59d48f51bfd7b23f77861
Change-Id: Ie08f70d249e7ee0e800fc13d3477a9e2616fdb4e
Change-Id: I82c3d561bbd47fcc6e14c19e62e7a9fd97e78bd1
…form/packages/apps/Camera into 1.1

Android 4.2.2 release 1

Conflicts:
	src/com/android/camera/CameraSettings.java

Change-Id: Id0a6ff0256417b31b697603d55ce7f6d072c4e3c
the mPaused condition is checked wrong

Change-Id: Ibe66dcec5bc6248159a0b914e5f24f2986d8b8fe
Change-Id: I9a40a8a985fe40535b1fb909c4af9884bae4cccf
Partially ported from CM10.

Patch Set 2: Rebased

Change-Id: I2fb61829410fa00b6440e23eee05508b0f447dbd
 * usePreferredPreviewSizeForEffects is needed to fix camcorder effect on
   some MSM8660 devices.
 * Add ignorePreferredPreviewSizeForVideo to use the best size reported
   by the driver instead of the preferred-preview-size-for-video value,
   which may report something really awful.

Adapted for cm-10.1 from similar commits in jellybean.
  CyanogenMod/android_packages_apps_Camera@5ea9058
  CyanogenMod/android_packages_apps_Camera@7310af0

Change-Id: I58d4f81333a26dbd6d1ce35037b9c32fbd7d5b69
Change-Id: Ia1ab57648536b16f1f875cd03aacc90bb081442a
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I6a0c5ea6c46bb16a61d6c654ac147f6eb18446fd
Change-Id: I091a385aff272ec2d8a39a0acc2bc33fa3a08662
Conflicts:
	res/values-zh-rCN/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/com/android/camera/CameraSettings.java
	src/com/android/camera/VideoModule.java
This allows devices without HDR camera (so all phones except Nexus 4
I think...) to actually take HDR pictures. When the mode is enabled,
pressing the shutter button will take 3 shots, one a minimal exposure,
one at 0 exposure, and one at max exposure. The 3 shots are then fed
into a software HDR processor that will merge the 3 images into one
final shot.

There are two algorithms available for merging pictures, one is a
simple average between all pixels, and the second one is based on
Reinhard's algorithm. They all need tweaking, and only the first one
is used for now.
Average algorithm is available in RenderScript form. This beastie
speeds up a lot!

Source shots are removed after HDR is computed

Change-Id: I7a9e52e56258a0c755f4def22db51ac84501ce9a
  * Needed to release the buffers on many cameras when the record size
    changes but the preview size does not. Without releasing the buffers,
    we can run out of ION space and end up with a mangled recording.

Change-Id: I3ebee850b3e20b3920368c8e052a428f6dd9e3e5
Conflicts:
	src/com/android/camera/CameraSettings.java
Conflicts:
	res/values/config.xml
	src/com/android/camera/HdrSoftware.rs
	src/com/android/camera/HdrSoftwareProcessor.java
	src/com/android/camera/HdrSoftwareRS.java
	src/com/android/camera/PhotoModule.java
	src/com/android/camera/Util.java

Change-Id: I3e787025bcd6c6b6a56bee4a46c57008d2353206
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.