| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I1a69682fa0e1beb393d3e6d64812bab0bf7b68ad
|
|
|
|
|
|
| |
- Add menu for noise reduction modes
Change-Id: Ie5cd6590e08938fb8fbb668ac1b48aac5fe801c3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Creates new activity for permissions handling: both checking
for permissions and handling error condition when critical
permissions are not present. The reason for creating a
new activity is so the app does not attempt to continue
executing OnCreate, OnResume etc, which opens
the camera while the dialogs are showing. This should
not slow the app down because the permissions activity
will only run when a) the first time the app has
insufficient permissions and b) when a critical
permission is missing and the app needs to shut down.
Bug: 21273463
CRs-Fixed: 1019847
Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
(cherry picked from commit ad44cda82fe6ec5ee090115129223c6314f9e1bb)
Fixes to M permissions.
Previously, we called PermissionsActivity with startActivityForResult().
However, this creates race conditions as we check for permissions
and the CameraActivity continues to operate. Now, we end CameraActivity
and launch a new instance upon successful permissions resolution.
We can also put the preload filmstrip logic back in its original
place in onCreate. The checks for permissions happen in both
onCreate and onResume.
Bug: 22442745, 22478144, 22497152
CRs-Fixed: 1019847
Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0
(cherry picked from commit ac0e2425e77a9b69e76d2f31876798825ea44584)
SnapdragonCamera: Fixed M permission issue
- Resolved NPE while sending permission request
- Made change to request non-critical permissions once only,
but the critical permssions all th time.
- Removed unused contant defines
CRs-Fixed: 1019847
Change-Id: Ib997244cbcc041d86c094c7ee7a902bff56e92ad
snap: Remove platform signature
* We are using runtime permissions now.
Change-Id: I3386214dbbc0915251941ef490e7cbaf27e6ed45
|
|
|
|
| |
Change-Id: I19f2f857afc848502fded5cc0632e94cf3a65152
|
|
|
|
|
|
| |
add scene mode for optizoom and preference entry for chromaflash
Change-Id: I859a42e3273d340a7dda7e24c6cb2e08ddb0f7bf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If seeMore is enabled, send a disable command to HAL
to disable the CDS and TNR features.
Change-Id: I91bac0a01c58cb13ba32296739b47f74dc296003
SnapdragonCamera: Enable SeeMore option for 4k.
Currently SeeMore option for 4k recording is disabled.
As per requirements, enabling the same.
Change-Id: I69e84e0c20c199d80fc819f8aa6be62605bfbd79
SnapdragonCamera: Turning off CDS and TNR while SeeMore is on.
Ensuring turning off of CDS and TNR while see more feature is on.
Change-Id: I74c76f8b07046b8dca9db2be162b7ef20ba2d96d
CRs-Fixed: 937242
Camera2: Add StillMore option in Camera app menu
Add menu item for StillMore feature under the Advanced
Features item during camera preview.
Change-Id: I89ae260339896878ff4f1c5099885c6f3b05a18b
SnapdragonCamera: Changes to enable TNR processing by default.
TNR was disabled by default from UI. Change configures TNR
for camera stream to improve image quality. CDS is disabled
as TNR is enabled by default from now.
Change-Id: I7c1bf9533c52b8642fb15f79625cec57cc85b6cf
Crs-fixed: 890243
SnapdragonCamera: Checking whether SeeMore is available
Checking if the preference is available.
Change-Id: Ie885b9312f2fe054e272d15b9a38e2cedf756632
CRs-Fixed: 957117
|
|
|
|
|
|
|
|
|
| |
* Set untranslatables
* Move all resolution strings in one place & improve them
* TODO: Automatically calculate MP from picture size
and get rid of the resolutions array
Change-Id: I579d6ba7378849d891d7ed64a6b8c70e2b62ca3c
|
|
|
|
|
|
|
|
|
|
|
| |
* Remove tons of unused strings
* Make some strings shorter to fit better in the settings popup
* 'Off' should be always the first option, else the app behaves unexpectedly
* Use consistent strings for all on/off options
* Replace string references to entryvalues for all qcom options with the actual parameters
* Group arrays & strings based on the option
Change-Id: I092ce765013e7a80a2928df8e7d1b7e7bfd67905
|
|
|
|
| |
Change-Id: I255d73b6e221655f9592047ccf848460d985c3b3
|
|
|
|
|
|
|
| |
If the video resoultion is 4K, disable SeeMore and
show a toast message
Change-Id: Ieb947f889d92fb8f9af5bf52c865555dce7eb1c4
|
|
|
|
| |
Change-Id: I3d589945ea31f40890a94b43555268b6b3060e37
|
|
|
|
|
|
|
|
|
|
|
| |
SnapdragonCamera's default video quality value was set to highest
supported video resolution whitch was "720P"
Add the default video quality value string "pref_video_quality_default"
and overlay it to "VGA"
CRs-Fixed: 815638
Change-Id: I5013880a42028e0663a3d22ffa3cddf87990146b
|
|
|
|
|
|
|
| |
Instead of defaulting to CIF, set the highest supported video
resolution as the default video profile.
Change-Id: I6cb1eab905d193cbc03f528d0fbc81f5af49ab89
|
|
|
|
|
|
|
|
| |
Add a scene mode for refocus. If the latest photo is taken with
refocus, user can click on the preview thumbnail, then refocus it
by tapping on the photo.
Change-Id: I2fd69439467f5a1e33d23d8d239aa3472d88b585
|
|
|
|
|
|
|
| |
Prompt to user an estimation of how many more pictures can be taken,
calculated based on available storage.
Change-Id: Iabc8268d548d3f6d86a6d065b511641b837a1de5
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Adding 16MP and 20MP picture resolution
support.
Change-Id: Icaacd5d378e0361d5699d087ccbb17007c82cd3e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. Remove openLegacy call to open camera.
2. Use generic camcorder profile query mechanism instead of
hardcoding profile enums in app.
3. Fix NPE during startpreview if mParameters is null.
Change-Id: I7bfc00f68f512c3029ca8ba75863583f1b376094
|
|/
|
|
|
|
| |
Updating icons and settings menus for SnapdragonCamera UI
Change-Id: Id7db7d624a517f76f5bd5941ed113e8d13d6aca1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add UI support to take inputs from user for the
following 3A paramters
1. Manual focus :
a. Scale mode 0-100
b. Diopter mode 0-10
2.White balance:
a. CCT
b. RGB gains
3. Exposure control
a. ISO
b. exposure time
Change-Id: I92ea3719fa2224e02943bb2191987c7654aaf9ea
|
|
|
|
|
|
|
| |
- IS is disabled when 4k video quality is enabled
CRs-Fixed: 733839
Change-Id: Iaaaa779bab0fbd7f9e5e5be08c6ada1c67ceb17a
|
|
|
|
|
|
| |
- Continuous shot needs to be disabled for continuous capture
Change-Id: Id83431cff69da778df8cf815731688e73505b0c3
|
|
|
|
|
|
| |
Adding menu items for video rotation.
Change-Id: Ic684dd279f6c2f867e607ba6fbe3919db67b96f8
|
|
|
|
|
|
|
| |
Adding resolution corresponding to 1:1 aspect ratio in picture
sizes.
Change-Id: I8b86918b3777d47e54fa4517080b356d4bc327cc
|
|
|
|
|
|
|
|
| |
On redfox 4kuhd was replaced by 2160p,
so we need to add 2160p resolution to
enable 4kuhd in UI
Change-Id: Ib0b7acea65d60bd2e98b3aefc146e873ac351508
|
|
|
|
|
|
|
|
| |
Rename package from com.android.camera2 to org.codeaurora.snapcam,
module name from Camera2 to SnapdragonCamera and app name from
"Camera" to "Snapdragon Camera"
Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Android 4.4.3 release 1
* tag 'android-4.4.3_r1':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Remove TRIM support
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix samsung video recording
Fix WB indicator override
Revert fixed focus area in CAF mode
Add another HTC picture resolution
Always set focus mode first before applying scene mode
Reduce logging of flattened Preferences
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Conflicts:
res/values/arrays.xml
src/com/android/camera/FocusOverlayManager.java
src/com/android/camera/PhotoModule.java
src/com/android/camera/VideoModule.java
Change-Id: I4be00366e24933c6504639776c711e1a874d1f2e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
patching into Carlsbad branch from Bryce
Bug: 9370319
Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc
Conflicts:
res/values/strings.xml
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The HDR function can not existed with the Continuous Shot
function,so change code to achieve the function like that
when we open HDR function ,make the Continuous Shot off,
and we close HDR,make the Continuous Shot on.
CRs-fixed: 667319
Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add a feature to choose use SDcard or phone to store picture
and video captured by camera and camcorder.
Some of the changes are taken from:
I987a691c93edc4250fe0366d0623c85ea0152117
CRs-Fixed: 619806
Change-Id: I009df4c70f0a1b49b20750f806c799f025bb6197
|
|\ \ |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence.
Import translations. DO NOT MERGE
gcam: Clean up placeholders, and add deletion robustness.
Fix issue of focus indicator staying on without being hidden
Ensure view size gets updated after phone decors change.
Show the 100% state of the progress at least one frame.
Add parameters and deduplicate parameter changes
Revert parallel opening camera in photo mode.
Differentiate the InProgressData from the normal PhotoData.
Close mode menus if another control is touched
Start gcam module directly when handling capture intent.
Import translations. DO NOT MERGE
Add a null check to fix NPE
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add logging to various actions
Ensure mOpenCameraThread has been setup before dereferencing.
Add GCam progress indicator.
hide preview cover on arrival of new preview data if hidden
Fix photo mode is getting stuck in a single CameraState.
...
Conflicts:
res/layout/photo_module.xml
res/values/arrays.xml
src/com/android/camera/CameraActivity.java
src/com/android/camera/PhotoUI.java
src/com/android/camera/Storage.java
src/com/android/camera/WideAnglePanoramaModule.java
src/com/android/camera/ui/FilmStripView.java
Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This string can be used for in progess screen indicators.
Bug: 11505806
Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
To better align HDR/HDR+ menu options with other menu options,
shortening the description and making it all caps.
Bug: 11481286
Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | | |
Bug: 11462711
Bug: 9275928
Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
Adding support for 4kx2k resolution for camcorder
in the app.
Change-Id: Ib186c3464fe4d90f0c085a8a40ee5dd860034503
CRs-fixed: 578625
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Enhance the camera picture size table by adding more number of
supported resolutions.
- Enhance the camcorder menu by adding support for additional video
and audio codecs.
- Also provide option to select the duration of the recording clip.
(cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e)
Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5
(cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17)
(cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec)
(cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
|
|\
| |
| |
| |
| | |
* commit 'c13cc22ba17591111be3fae732ae0396e889820a':
Add strings to better describe HDR mode menus
|
| |
| |
| |
| |
| |
| |
| |
| | |
Instead of one word, these strings will describe the button action i.e. 'Turn HDR on'.
Leaving existing strings to pipeline translations before implementing the migration to these strings.
Bug: 11185194
Change-Id: Ie9aca0b328b19c610af740127e1683a8d87f93d8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ag/369626/ added a cannot_load_image string which was translated in ag/370960/
However, this translation resulted in a duplicate string since this string
already existed in translated versions of filtershow_strings.xml which was
deleted in ag/339346 but the translated versions weren't deleted. Deleting all
the translated versions of that file caused a problem because ag/362583/ added
source code that depended on a setting_wallpaper string which only existed in
the translated string files.
This change deletes the translated filtershow_strings.xml and adds the
untranslated setting_wallpaper string.
Change-Id: I1b8ac8c854c6f06abde9a71db2105c4d2dd44934
(cherry picked from commit 73a18da0f6181d882d04d648ddcbcc82047f5d71)
|
|\|
| |
| |
| |
| | |
* commit '94f5f216821c1090bd8a0660483935456dc13df1':
Increase character limit.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Bug: 10999205
Bug: 10558260
Bug: 10554875
Change-Id: Ib2add1a1b32a4a1a677d30a4bd11b0de5f6f126b
|
|/
|
|
|
|
| |
Bug: 11116778
Change-Id: I459e0b1db241a38866a3b06be5b316dc3b300c56
|
|
|
|
|
|
| |
Bug: 11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
|
|
|
|
|
|
| |
Bug: 11047147
Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
|
|
|
|
|
|
| |
Bug: 11021907
Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
|
|\
| |
| |
| | |
gb-ub-photos-carlsbad
|
| |
| |
| |
| |
| |
| | |
Bug: 10962439
Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e
|
|/
|
|
|
|
| |
Bug: 10916138
Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652
|