summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove elevations from filmstrip" into ub-camera-haleakalaAlan Newberger2015-02-053-16/+1
|\
| * Remove elevations from filmstripAlan Newberger2015-02-043-16/+1
| | | | | | | | | | | | | | | | | | Elevations were not applied to SessionItems causing bad z-order behavior. As the shadows are not really visible, just removing elevation entirely, this also seems to improve performance. Bug: 17742801 Change-Id: I8fedad3b6c083f7cde349e51021f928d719edb40
* | Merge "Implemented Report functionality using GMS Core Feedback API. ↵zafir2015-02-051-0/+5
|\ \ | |/ |/| | | Implemented stubs for Camera2." into ub-camera-haleakala
| * Implemented Report functionality using GMS Core Feedback API. Implemented ↵zafir2015-02-031-0/+5
| | | | | | | | | | | | | | stubs for Camera2. Bug: 18188247 Change-Id: Ic47bf432dca326bb454d0e4408b6b58f645a3fa4
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-043-3/+3
| | | | | | | | | | Change-Id: Id155f7afc4b25a85ef916ca32d52a9d46e5c83ea Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEGeoff Mendal2015-02-0272-45/+6389
| | | | | | | | | | Change-Id: I0ff379f424160a2b4a4b7390f920cc454ef30956 Auto-generated-cl: translation import
* | Fix content description for video intent review playback button.Spike Sprague2015-01-271-2/+3
|/ | | | | bug: 18760510 Change-Id: I59773006d8075e957451082ca0fcc11c3c417f30
* CaptureSession can now be started with an empty placeholder.Sascha Haeberling2015-01-231-1/+1
| | | | | | | | | | | | | | | | | | | Bug: 19014774 Bug: 18853119 Bug: 18979823 Being able to start with an empty placeholder and then updating that placeholder allows us to add a visual entry to the filmstrip early on. This avoid jarring effects where after taking many apid fire shots and going to filmstrip, the entries are appearing one after the other. This was caused by sessions only getting started when the thumbnail was produced, which can take a while when multiple shots are in the encoding pipeline. Also contains changes that make CaptureSession testable. Change-Id: I3d44704099be81524f8e165f3f09de6eebfc147b
* Add Camera cover equivalent to windowBackground to smooth lockscreen startupAlan Newberger2015-01-165-9/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds a windowBackground drawable equivalent to the covers shown by lockscreen and app, to remove the black screen in between. With this CL I mostly see no artifacts when opening camera from lockscreen. Some issues: * to improve memory usage in system UI holding the lockscreen preview, a vector camera blanket was added in ag/587418 to ic_camera_blanket. That works transparently everywhere so far but not in resource drawables that can only handle bitmaps in layer-list items. Split the vector and bitmaps here, which means only the lockscreen uses the vector -- this also surfaced a color mismatch between the vector and our PNG bitmaps, corrected in the new ic_camera_blanket_vector resource. This is a bit fragile as we rely on pixel match of the two resources, would like a cleaner solution but the layer-list limitation is tough -- without this change the app crashes at runtime within BitmapDrawable when the windowBackground is loaded. * likewise both the lockscreen and app covers explicitly size the bitmap, there are no provisions to do so within layer-list. Will follow up with a refactor of in-app cover (ModeTransitionView) to remove explicit sizing and then all will rely on bitmap size (per above will still need vector file size coordinated with bitmap). * current implementation relies upon a black window background, we restore that in onCreate. * Both secure camera and v21 main camera currently use the windowBackground, will submit just for secure then introduce for main camera when we always start into Camera mode. * For L explicitly set android:windowDrawsSystemBarBackgrounds to false to ensure the system preview into the DecorView doesn't take the navigation bar into account when vertically centering the cover bitmap, to make the preview identical to the other covers. Bug: 18369862 Change-Id: Ia481e2d1d94bdc5a5d39b4d35b32c29a75bf99ec
* CaptureModule first run dialog.Senpo Hu2014-12-182-4/+4
| | | | | | | | | | | * Introduce FirstRunDialog. * Add OneCameraCharacteristics so we can query camera properties without opening the camera. * Refactor AspectRatioDialogLayout and LocationDialogLayout to clean up. * Refactor to move away from portability/Size class in Camera2. Bug: 18623223 Change-Id: I05f4eefe3ee2feeaa47b6296f8926f6be8e83051
* Delete unused code.Paul Rohde2014-12-181-34/+0
| | | | Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
* Drop new focus indicator into Camera2.Paul Rohde2014-12-174-2/+6
| | | | | | | * Create a new custom focus view that interacts with physical lens diopter changes. * Replace all occurances of the old focus indicator with the new one. Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
* New capture indicator design for Haleakala.Senpo Hu2014-12-104-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce RoundedThumbnailView and retire PeekView. * Rename BottomBarModeOptionsWrapper to StickyBottomCaptureLayout. * Verified on K and L devices. Thumbnail cropping: * 100% width and vertically centered for portrait. * 100% height and horizontally centered for landscape. General behavior spec: * Hide the capture indicatorby fading out using fast_out_linear_in (150ms): 1) User open filmstrip. 2) User switch module. 3) User switch front/back camera. 4) User close app. Behavior spec for non-photo modules: * Photosphere is stripped of UI so there is no need to show capture indicator. When a photo sphere is taken (and user is in another mode), the preview frame used in filmstrip is used in the capture indicator. * Video: show in viewfinder prior or after capture. Hide during capture. When a video is taken, the preview frame used in filmstrip is used in the capture indicator. * Panorama: Show in viewfinder prior or after capture. Hide during capture. When a panorama is taken, the preview frame used in filmstrip is used in the capture indicator. * Lens blue: Show in viewfinder prior or after capture. Hide during capture. When a lens blur is taken, the preview frame used in filmstrip is used in the capture indicator. Visual spec: A 12dp spacing between mode option overlay and thumbnail. 1. A circular mask that excludes the corners of the preview image. 2. A solid white layer that sits on top of the preview and is also masked by (1). 3. The preview image. 4. A 'ripple' which is just a white circular stroke. Animation spec: (1) only the scale animates, from 50%(24dp) to 114%(54dp) in 200ms then falls back to 100%(48dp) in 200ms. Both steps use the same easing: fast_out_slow_in. (2) opacity, from 50% to 0% over 150ms, easing is exponential. (3) doesn't animate. (4) starts animating after 100ms, when (1) is at its peak radius and all animations take 200ms, using linear_out_slow in. Opacity goes from 40% to 0%, radius goes from 40dp to 70dp, stroke width goes from 5dp to 1dp. Bug: 18317565 Change-Id: Ib8d4f065b98fc3b9b0b627633232ce8cee96eb61
* Merge "Vector version of camera preview graphic." into ub-camera-haleakalaAlan Newberger2014-11-151-0/+27
|\
| * Vector version of camera preview graphic.Dan Sandler2014-11-141-0/+27
| | | | | | | | | | | | | | Even less RAM required to hang onto this in the lockscreen. Bug: 18369196 Change-Id: I7ed5ad098b77c96b40d0b76e4a20a7fea12e362a
* | Trim transparent pixels off camera preview bitmaps.Dan Sandler2014-11-1411-1/+1
|/ | | | | | | | | | | Since SysUI holds these bitmaps in memory for jank-free drawing, these pixels are just wasted RAM. Since the transition code assumes uniform square bitmaps, these are all 64x64dp, which is still a teensy bit wasteful but much better than before (144x144dp). Bug: 18369196 Change-Id: Idf10b2048190ac44eff3e5da467149c460067347
* Add experimental RAW(DNG) support.Sascha Haeberling2014-11-071-29/+0
| | | | | | | | | | | | | | | | Bug: 18272977 This adds RAW writing behind a new debug property: adb shell setprop persist.camera.capture_dng 1 This will switch to the non-ZSL implementation of one Camera. The resulting files are stored in a "DNG" folder under DCIM/Camera. Caveats: - Preview aspect ratio will not match. - No item in filmstrip Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
* consistent style for titles on user education screensSpike Sprague2014-10-275-10/+11
| | | | | bug: 18115448 Change-Id: I9d1caaa0903d6f3c2c47ca3e8457a4f85aad910c
* new colors for GAR contrast complianceSpike Sprague2014-10-2224-5/+16
| | | | Change-Id: I2e1a05b9670c01c9729ed9e7b8b146add95ab88f
* Merge "Native 16x9 viewfinder stream for Gcam to reduce switching jank and ↵Spike Sprague2014-10-131-17/+0
|\ | | | | | | eliminate black bar overlay hack." into ub-camera-glacier
| * Native 16x9 viewfinder stream for Gcam to reduce switching jank and ↵Spike Sprague2014-10-131-17/+0
| | | | | | | | | | | | | | | | | | eliminate black bar overlay hack. companion CL: ag/562183 bug: 17669070 Change-Id: I4d5402df3848423c236108716f7065a87ce95f6d
* | change text color to white for tutorial and onboarding screens.Spike Sprague2014-10-091-1/+1
|/ | | | Change-Id: If431ce0b321991e15f33f850acc3cc6c4474ffb4
* Merge "adjust margin on TextViews and ImageViews in onboarding and tutorial ↵Spike Sprague2014-10-074-10/+16
|\ | | | | | | screens" into ub-camera-glacier
| * adjust margin on TextViews and ImageViews in onboarding and tutorial screensSpike Sprague2014-10-074-10/+16
| | | | | | | | | | bug: 17654418 Change-Id: I10633495ae04fd00ac97c055094a6097f5f7c0a0
* | Merge "disable all user interactions (including mode switching) on SD Card ↵Spike Sprague2014-10-074-4/+2
|\ \ | | | | | | | | | errors" into ub-camera-glacier
| * | disable all user interactions (including mode switching) on SD Card errorsSpike Sprague2014-10-074-4/+2
| |/ | | | | | | | | | | bug: 15841887 Change-Id: I8e7e92a884dda54d9b8385b29d9ef4b7bb7fbd14
* / color changes for modes, onboarding screens, and tutorial screensSpike Sprague2014-10-0753-10/+17
|/ | | | | | bug: 17785834 Change-Id: Idaf26517399a07471f2b6a98fdb9629baf41afcf
* Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so ↵Spike Sprague2014-09-294-36/+60
|\ | | | | | | touch ripples show up right." into ub-camera-glacier
| * for intent capture and pano,Spike Sprague2014-09-244-36/+60
| | | | | | | | | | | | fix the redo/ok/cancel button sizes so touch ripples show up right. bug: 17505149 Change-Id: I29d8222ff0588d0410cf1f8a94bed963b4bf32f6
* | new share iconSpike Sprague2014-09-2912-7/+14
| | | | | | | | | | bug: 17671676 Change-Id: I1b681efdb3129cdd532002d85ad3257cef962d92
* | new sounds for timer ticker and pano / photosphere intermediate capturesSpike Sprague2014-09-236-0/+0
| | | | | | | | | | | | | | | | companions CL: ag/534823 bug: 17281234 Change-Id: I9d98d8e869dcefdbd0f7e0b53dea6b8e024a8e3b
* | Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-09-193-10/+10
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2014-09-163-10/+10
| | | | | | | | | | Change-Id: I6541f685bfc16e910b5689acbe74e15e07c5bd5b Auto-generated-cl: translation import
* | implement new trash icon, plus some asset cleanupSpike Sprague2014-09-1811-2/+2
|/ | | | | bug: 17566685 Change-Id: Ia7b55ad3b6fed939c19abcde12cbf34726ba919c
* Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-09-111-3/+3
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-09-081-3/+3
| | | | | | | | | | Change-Id: I73e4af5066d39bdf6921ef9ac2e6cd1bcb07183c Auto-generated-cl: translation import
* | Merge "back to bigger HDR+ icons" into ub-camera-glacierSpike Sprague2014-09-0930-0/+0
|\ \
| * | back to bigger HDR+ iconsSpike Sprague2014-09-0930-0/+0
| |/ | | | | | | | | bug: 17304734 Change-Id: I9b2b22101003b2d13f386367245622d4e13c0309
* / In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 ↵Andy Huibers2014-09-081-1/+1
|/ | | | | | | | | API. Bug: 17397777 Bug: 17028594 Bug: 17391241 Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
* remove stray bool resource for determining if OS is L or not,Spike Sprague2014-09-041-1/+0
| | | | | | | | | moved to more universal ApiHelper for that. this brings back the fade-in on shutter button touchDown. bug: 17389859 Change-Id: I7c7d24db30bfbb149f84e6f5acf3e211c282c1ec
* Import translations. DO NOT MERGEBaligh Uddin2014-09-041-1/+1
| | | | | Change-Id: I9f25ac4e3c13fcd64389cf61422fd64c831c8d02 Auto-generated-cl: translation import
* Merge "Add countdown timer to CaptureModule." into ub-camera-glacierAndy Huibers2014-09-032-16/+16
|\
| * Add countdown timer to CaptureModule.Andy Huibers2014-09-022-16/+16
| | | | | | | | | | | | | | Bug: 16654225 Bug: 17204673 Change-Id: I914094b204743ddbe786ef1a7621564e864ed834
* | actionbar opactiy tweaksSpike Sprague2014-09-021-18/+0
|/ | | | | | bug: 17319586 Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
* Merge "boatload of new assets" into ub-camera-glacierSpike Sprague2014-08-27453-15/+189
|\
| * boatload of new assetsSpike Sprague2014-08-26453-15/+189
| | | | | | | | | | | | also: bug: 17255612 Change-Id: I8551e3162b8eedee9653a05abb88177e39f12be5
* | Merge "Import translations. DO NOT MERGE" into ub-camera-glacierBaligh Uddin2014-08-2753-113/+61
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2014-08-2653-113/+61
| | | | | | | | | | | | | | | Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043 Auto-generated-cl: translation import
* | | Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, ↵Andy Huibers2014-08-262-2/+5
|\ \ \ | | | | | | | | | | | | AE regions." into ub-camera-glacier
| * | | In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.Andy Huibers2014-08-262-2/+5
| |/ / | | | | | | | | | | | | Bug: 17028594 Change-Id: I9c85178926a68c5e3ce26d04107db65514d84169