summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Camera2: only override power keyScott Mertz2016-05-311-2/+2
| | | | | | | Partial revert "Camera2: Use new window manager flag for prevent system keys." CYNGNOS-2958 Change-Id: I3dc95f8b150e673bc9cada437e121ec3ceb46b84
* Camera2: Use new window manager flag for prevent system keys.Adnan Begovic2016-05-201-2/+2
| | | | | Change-Id: I8c47a20db36af25516fb7a17031d451d9b46a48d TICKET: FEIJ-522
* CameraSettingsActivity: Handle NPE when storage preference is already removedLuK13372016-01-031-5/+7
| | | | | | Fixes: http://pastebin.com/zv1sPid2 Change-Id: I05951f93b37759f4d8c9f2fde10c84eb388c4830
* Add Storage preference (1/2)dcalandria2015-12-3110-21/+190
| | | | | | | | | This patch allows the user to change the default storage path. As in CM11, when the path is changed it sends an intent to the Gallery to set the default camera folder. Change-Id: I319decc3fdceca61050cf64f7e59afb06fedbf80
* Fix crash if Exif-Tag buffer-length and component-count are both 0tobigun2015-12-031-1/+1
| | | | Change-Id: Iad9b60d135b4f682c08c3bfc9698cdd10e1086ab
* Camera2: Fix Undo button behaviourNBruderman2015-12-031-1/+2
| | | | | | | | | | | | | | The undo behaviour depends on if the camera present secure settings or not. If secure, it should have 1 placeholder. 0 in other cases. Repro (for non secure cameras): 1. Leave only 3 pictures on the album. 2. Delete one picture, it will work fine. 3. Leave only 2 pictures on the album. 4. Try to delete, and you will go straight to the camera, without the undo pannel showing up. Change-Id: I360076381867a74628ffa492065ccf2ca53c72d6
* Introduce a 'device plugin' concept.Danny Baumann2015-12-032-0/+42
| | | | | | | It allows device specific code to work with the camera while it's active. Change-Id: Iec78bf4d632c71f02e830eb2ac05504370bba660
* Camera2: Remove google help preferenceMichael Bestas2015-12-031-11/+0
| | | | Change-Id: Ieae3a79b1e7b470b9237f76808d7a038fcaee101
* Camera2: Add option to set max screen brightnessMichael Bestas2015-12-033-1/+50
| | | | | | * Set maximum screen brightness while the user is inside the camera app Change-Id: I8b16ba47a933bc7d6b0c1cd62bfd6ca54875ce1e
* Camera: Powerkey shutter (2/2)Danesh M2015-12-014-167/+66
| | | | Change-Id: I70c5cd4dad547e2a9a96541b3104d52af5b5dd5c
* Camera: Disable Camera Launcher when both Front and Back sensors are not ↵Rajaram Gudivada2015-11-301-1/+1
| | | | | | | | | | detected Instead of checking only back sensor, this change checks both Front and Back sensors at the time of first time boot up and then if no sensors are present, disable all camera activities/CameraLauncher. Change-Id: Ic9ebd3140caa8df079fe01553d62e96207f2e159
* Camera2: Stop using GPS when going to backgroundnadlabak2015-11-301-0/+1
| | | | Change-Id: Iacc46d3934c4a9fea7f01666334aaec213bb902b
* Camera2: Remove settings preferences only onceKonsta2015-11-301-2/+4
| | | | | | | | Browsing through camera settings crashes on devices with only a back- or a front facing camera. Fix NPE on removing preferences that are already removed. Change-Id: I00b4549e18ea44975bf795da9384892d8ef2ee16
* Camera2: fix video recording for older driversPawit Pornkitprasan2015-11-301-1/+1
| | | | | | | | Older drivers need the preview size to be the same as the video size. This check is done in getDesiredPreviewSize but was broken because CameraCapabilities return an empty list instead of null. Change-Id: If4d570923bd4809c8e651831a061414836e01a36
* Don't attempt to convert degree to orientation enum twiceEthan Chen2015-11-171-2/+1
| | | | | | | | * Exif.getOrientation already calls getRotationForOrientationValues, which returns a degree value. Don't attempt to convert that degree value back into degrees, that makes no sense. Change-Id: Ie35a0683e2d36801a9130ec19e1b3aa1f48b92c2
* Camera2: Only autofocus before a snap if we are actually in "auto" mode.Steve Kondik2015-10-131-3/+1
| | | | | | Original commit by cyanogen 7daaa72d35c1f8820117768e4b129acd030bcefb Change-Id: I51853913f6459b599176910f7f486f59972eaf36
* am c8594ddf: Check for zero length array returnsAlan Newberger2015-07-311-4/+8
|\ | | | | | | | | * commit 'c8594ddf504109dc3c17baf9c2448469b28973e9': Check for zero length array returns
| * Check for zero length array returnsAlan Newberger2015-07-311-4/+8
| | | | | | | | | | | | | | | | permissions API may return zero length arrays, check before access. Bug: 22871531 Change-Id: I0ebd5feecb24f03fda0350a9ab42efa25127b3dc
* | Change MNC codename to just M.Dianne Hackborn2015-07-291-1/+1
| | | | | | | | Change-Id: I1a6d7b269e5b7a1630d29e9f406684175d5bdf7d
* | am 4df3011e: Protect against destroying uncreated valuesAlan Newberger2015-07-241-5/+15
|\| | | | | | | | | * commit '4df3011e2f3680a80ecc89c817ba528b2a578f0f': Protect against destroying uncreated values
| * Protect against destroying uncreated valuesAlan Newberger2015-07-241-5/+15
| | | | | | | | | | | | | | | | | | | | Though we attempt to minimize lifecycle impact by exiting onCreate early due to inadequate permissions, we need to protect against touching fields in onDestroy that we did not initialize in onCreate. BUG=22718094 Change-Id: I49adcbbed005c4efa785458aa398e61488cfceb0
* | am ae474d0b: [Haleakala] Change JPEG compression thread priority to ↵Sascha Haeberling2015-07-232-14/+44
|\| | | | | | | | | | | | | BACKGROUND - 1. * commit 'ae474d0b2967b3995a4e1e334d6689b0cd9a38c9': [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.
| * [Haleakala] Change JPEG compression thread priority to BACKGROUND - 1.Sascha Haeberling2015-07-222-14/+44
| | | | | | | | | | | | Bug: 22670310 Change-Id: Ic2ee7e2de141d7df2a316733b465daa354b2d517
* | am ac0e2425: Fixes to M permissions.zafir2015-07-182-16/+13
|\| | | | | | | | | * commit 'ac0e2425e77a9b69e76d2f31876798825ea44584': Fixes to M permissions.
| * Fixes to M permissions.zafir2015-07-172-16/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I82e9125a46581db44aa61d4ee94aec5a820e9df0
* | am dd334be9: Camera M permissions: lockscreen improvementszafir2015-07-171-8/+70
|\| | | | | | | | | * commit 'dd334be92c5513a06c809ee3ea25e411dfad0589': Camera M permissions: lockscreen improvements
| * Camera M permissions: lockscreen improvementszafir2015-07-171-8/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL now just provides some improvements for lockscreen independent of any onCreate/onResume lifecycle adjustments. Fixes include: * add a black content view to Permissions Activity -- noticed screen junk opening from lockscreen due to unpainted regions, the whole activity needs to paint the screen not just the dialog. * use FLAG_SHOW_WHEN_LOCKED to show permissions screen over lockscreen, per bug discussion in this case force failure, don't prompt for permission grants. * fun double onResumes induce flicker jank in the dialog UI. Inherit QuickActivity to automatically pick up the workarounds for double onResumes from lockscreens, no more flicker in the permission dialog. * also borrow from CameraActivity, broadcast receives to shut down the permissions dialog when screen goes off or user hits home on top of lockscreen. Actually apply this more broadly so that even below lockscreen, we finish this activity on screen off, IMO it is jarring to go in through lockscreen and see our permission dialog again without context of having just opened camera. * tweak permission dialog to not be cancelable, and to finish activity on back button press. * excludeFromRecents on the activity to prevent dual recents for Camera to show up when opening both via SecureCameraActivity and CameraActivity. Bug: 22502696 Change-Id: Ib545d3baa2d83b52604eec5517047b0c6278cd92
* | am 2fc4970c: am 00720781: Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
|\| | | | | | | | | * commit '2fc4970c2631ec5593c4566a72d4524014b49a29': Null check when evaluating valid resolution size
| * am 00720781: Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
| |\ | | | | | | | | | | | | * commit '00720781f6703de532ddbc05238db5bf5fd7cd2d': Null check when evaluating valid resolution size
| | * Null check when evaluating valid resolution sizeAlan Newberger2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Guard against nonexistent size so that logic to reset size preference can proceed BUG=22396405 Change-Id: Id508713ef91f632867366934e72fe939a839e228
* | | am 148d0b8e: Launch PermissionsActivity if CameraActivity resume is called ↵zafir2015-07-092-10/+9
|\| | | | | | | | | | | | | | | | | | | | without critical permissions. * commit '148d0b8e3fd412fa6a666e75484fe6b7e0465f5a': Launch PermissionsActivity if CameraActivity resume is called without critical permissions.
| * | Launch PermissionsActivity if CameraActivity resume is called without ↵zafir2015-07-082-10/+9
| | | | | | | | | | | | | | | | | | | | | critical permissions. Bug: 22358833 Change-Id: I5c189d4976b9355d531e028ecc163bb67bae6987
* | | am 5c8c7d3c: Clear permissions check after successful PermissionsActivityAlan Newberger2015-07-081-0/+2
|\| | | | | | | | | | | | | | * commit '5c8c7d3c86a866fc955d2cf2e6c3ed5e49d1d233': Clear permissions check after successful PermissionsActivity
| * | Clear permissions check after successful PermissionsActivityAlan Newberger2015-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the permissions activity indicates the user was successful, mark mHasCriticalPermissions true to allow the app to resume normally. BUG=22347017 Change-Id: I6b9bdd02382d071530529a08e8f8fe7faf02fe3b
* | | am c2d5d078: Restrict permission checks to M devicesAlan Newberger2015-07-082-0/+10
|\| | | | | | | | | | | | | | * commit 'c2d5d078821ca5e8de0c0d03b6603bf7c505c53f': Restrict permission checks to M devices
| * | Restrict permission checks to M devicesAlan Newberger2015-07-082-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ApiHelper check and only call checkSelfPermission if we are on M and the methods exist. BUG=22345681 Change-Id: Icda8d40057b5492502858ced731a749a2f66abf8
* | | am ad44cda8: Minimum viable Android M runtime permissions handling for H.zafir2015-07-073-50/+283
|\| | | | | | | | | | | | | | * commit 'ad44cda82fe6ec5ee090115129223c6314f9e1bb': Minimum viable Android M runtime permissions handling for H.
| * | Minimum viable Android M runtime permissions handling for H.zafir2015-07-063-50/+283
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I603acfb3057ba26b9cfa7935eb4cb24b5d547cb5
* | am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" ↵Alan Newberger2015-06-293-6/+12
|\| | | | | | | | | | | | | into ub-camera-haleakala * commit 'fd6f316adc5abfa071534642688bdf46f47a3925': Ensure CaptureModule/API2 works without front camera
| * Merge "Ensure CaptureModule/API2 works without front camera" into ↵Alan Newberger2015-06-293-6/+12
| |\ | | | | | | | | | ub-camera-haleakala
| | * Ensure CaptureModule/API2 works without front cameraAlan Newberger2015-06-253-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check in both first run dialogs, and the generated HardwareSpec, so that front cameras are only used if detected. BUG=21781461 Change-Id: I6844655b2fd3df90b649f5dfd6a006ef68dbf1da
* | | am 62240e14: Merge "Update filmstrip item on metadata update" into ↵Alan Newberger2015-06-291-1/+1
|\| | | | | | | | | | | | | | | | | | | | ub-camera-haleakala * commit '62240e14e310aa06601b4d069f30c0190e7b5ef3': Update filmstrip item on metadata update
| * | Merge "Update filmstrip item on metadata update" into ub-camera-haleakalaAlan Newberger2015-06-291-1/+1
| |\ \
| | * | Update filmstrip item on metadata updateAlan Newberger2015-06-251-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to async metadata loading, when viewing an image progress bar, after progress completion the main handler hiding progress bar would also hide filmstrip buttons if in secure mode, but the async metadata handler was calling a restricted handler that would only update the controls, not hiding for secure, or updating overflow menu. This change ensures all UI aspects of the item update are processed upon metadata loading. BUG=21499182 Change-Id: I92f22667d836d6ece6aa8427d967ec8e038b1e77
* | | am 04a9f8b6: Merge "Fix transform issue in CaptureIntent." into ↵Senpo Hu2015-06-273-4/+39
|\| | | | | | | | | | | | | | | | | | | | ub-camera-haleakala * commit '04a9f8b68dfc636e5d2194af18cc2022e6b8354f': Fix transform issue in CaptureIntent.
| * | Fix transform issue in CaptureIntent.Senpo Hu2015-06-253-4/+39
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | On M, EventOnTextureViewLayoutChanged comes earlier during app initialization in StateForeground which doesn't handle it. So here in StateReadyForCapture, we pull the current preview layout size and inform ResourceSurfaceTexture to allow it to calculate transform. Noted that we also need to bring this fix to Ivvavik. Bug: 21786937 Bug: 20173626 Change-Id: I417aef2f09247e77059fc5b066cbf10602ce5cf1
* / AOSP Camera source should run camera2 API on MAlan Newberger2015-06-191-4/+2
|/ | | | | | | | | | In all cases has Camera2 app run in CaptureModule, using capability levels to configure in either LEGACY or LIMITED JPEG, or full ZSL mode. BUG=21490086 Change-Id: I75842e9afc8d6ef387dd6611a5251394e8318caa
* Fix for invalidated resolutions via upgradeI-Jong Lin2015-06-102-12/+50
| | | | | | | | | | | | | | | | | | | Bug: 21758681 There was a upgrade bug where an valid resolution of the previous version of the Camera App could then be invalidated the subsequent version of the Camera App. If there were no other valid resolutions of the same aspect ratio available to the app, the current Camera App would choose (0,0) as its default size and then write this value into the saved settings. This fix allows the current Camera App to consider other resolutions not of aspect ratio as a fallback resolution setting. Also, if an invalid resolution valid has been saved to the settings, it also ignores it and then resaves a valid resolution value to the settings. Change-Id: I08f19d1ee6491619e92697897b73e4fd33a19a00
* Refresh required for full-screen undo in filmstripI-Jong Lin2015-06-081-0/+7
| | | | | | | | | | | Bug: 21666018 A Glacier regression bug: when filmstrip is in full-screen mode, and an deletion is undone, a blank screen is shown. With the fix, the undo forces the filmstrip into its "filmstrip" mode and forces a refresh with the un-deleted image. Change-Id: Id99be5d4d06e220e8698821badff32dba9b43997
* Use Google Feedback CrashBuilder API to make reports easier to consume.Sascha Haeberling2015-05-292-14/+20
| | | | | | | | | | | | | | | | Manual Cherry-Pick Part 1 of http://ag/699672 Currently, Feedback reports don't include a stacktrace. You have to download a system log file to find it. This tweak allows us to see the stacktrace on the Report page itself. Example old report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517267704 Example new report: https://feedback.corp.google.com/product/102042/crash?lView=rd&lCategory=8590053278&lRSort=1&lROrder=2&lRFilter=1&lReport=5517601160 Change-Id: If5f0ed6c69e96fe5f3661af913ae1525f8594b75
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 06:12:17 +0000