OSDN Git Service

android-x86/packages-apps-Camera2.git
10 years agoFix samsung video recording
Michael Kolb [Thu, 30 May 2013 14:45:41 +0000 (07:45 -0700)]
Fix samsung video recording

Patching Bryce CL into Carlsbad

  Bug: 9056573

Change-Id: I81fc31e24fe26bef4179bfc4428def2e8b7d94e9

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

10 years agoFix WB indicator override
Michael Kolb [Mon, 24 Jun 2013 20:22:52 +0000 (13:22 -0700)]
Fix WB indicator override

Patching into Carlsbad from Bryce.

  Bug: 9372794

Change-Id: I4f23f05ca1acaef84a24034237e82001aac09f78

10 years agoRevert fixed focus area in CAF mode
Michael Kolb [Thu, 11 Jul 2013 20:48:15 +0000 (13:48 -0700)]
Revert fixed focus area in CAF mode

  Bug: 9306098

This doesn't set the faces as focus/exp areas yet, but resets the focus area to null
in CAF mode to let the HAL decide focus/exp area.

Cherrypick of Bryce CL into Carlsbad.

Change-Id: I38e31937f64ecdb23d6c79f96040c46652d1d7d0

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

10 years agoMerge "Add another HTC picture resolution" into gb-ub-photos-carlsbad
Alan Newberger [Tue, 3 Dec 2013 17:27:25 +0000 (17:27 +0000)]
Merge "Add another HTC picture resolution" into gb-ub-photos-carlsbad

10 years agoAdd another HTC picture resolution
Michael Kolb [Wed, 12 Jun 2013 18:57:45 +0000 (11:57 -0700)]
Add another HTC picture resolution

patching into Carlsbad branch from Bryce

  Bug: 9370319

Change-Id: I9b2c45b98c7075fda7289707f1e290fcefc084cc

Conflicts:
res/values/strings.xml

10 years agoAlways set focus mode first before applying scene mode
Michael Kolb [Fri, 12 Jul 2013 18:36:47 +0000 (11:36 -0700)]
Always set focus mode first before applying scene mode

cherrypick from Bryce branch

  Bug: 9577903
  Bug: 11777611

Change-Id: I2c300e443a47c7bc0c20f6aaec6f6e4b6c238880

10 years agoReduce logging of flattened Preferences
Seth Raphael [Wed, 27 Nov 2013 22:29:24 +0000 (14:29 -0800)]
Reduce logging of flattened Preferences

Bug: 11901390

Change-Id: I9f2e27e769fd745be01bb2c12a7f07b45aa0b905

10 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Nov 2013 19:53:21 +0000 (11:53 -0800)]
Import translations. DO NOT MERGE

Change-Id: I50cb348cf6e31dcb28145087c649c5106bd563d5
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Nov 2013 00:41:27 +0000 (16:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5bf42de7313c856550b6cc68e0ca5fa30a64c6a1
Auto-generated-cl: translation import

10 years agoDelay onResume tasks to speed up lockscreen
Andy Huibers [Tue, 19 Nov 2013 23:10:04 +0000 (15:10 -0800)]
Delay onResume tasks to speed up lockscreen
onResume->onPause->onResume launch sequence.

Bug: 11773268

Change-Id: Iea7702a0141a390e1e9b50c738f6269c03dabcc3

10 years agogcam: Clean up placeholders, and add deletion robustness.
Ruben Brunk [Fri, 15 Nov 2013 23:30:47 +0000 (15:30 -0800)]
gcam: Clean up placeholders, and add deletion robustness.

Bug: 11708734
Change-Id: I8a017a382f12165be27afbf78e733bcc1fc0ef6f

10 years agoMerge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photo...
Sascha Haeberling [Thu, 14 Nov 2013 03:22:15 +0000 (03:22 +0000)]
Merge "Fix issue of focus indicator staying on without being hidden" into gb-ub-photos-carlsbad

10 years agoFix issue of focus indicator staying on without being hidden
Sascha Haeberling [Thu, 14 Nov 2013 03:04:21 +0000 (19:04 -0800)]
Fix issue of focus indicator staying on without being hidden

  Bug: 11505806

A mix up in the previous 100% CL caused this. This CL here also
makes it more robust by making the 100% extra time time-based instead
of frame-based.

Change-Id: I52c53d4b5816570c2c805e0e8ff193de684f2a64

10 years agoEnsure view size gets updated after phone decors change.
Doris Liu [Thu, 14 Nov 2013 01:59:24 +0000 (17:59 -0800)]
Ensure view size gets updated after phone decors change.

Bug: 11661906
Change-Id: I63234a94b5a0bbd0cc6aa62ccd2642de09208403

10 years agoMerge "Show the 100% state of the progress at least one frame." into gb-ub-photos...
Sascha Haeberling [Wed, 13 Nov 2013 19:31:08 +0000 (19:31 +0000)]
Merge "Show the 100% state of the progress at least one frame." into gb-ub-photos-carlsbad

10 years agoMerge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad
Seth Raphael [Wed, 13 Nov 2013 17:37:43 +0000 (17:37 +0000)]
Merge "Add parameters and deduplicate parameter changes" into gb-ub-photos-carlsbad

10 years agoShow the 100% state of the progress at least one frame.
Sascha Haeberling [Tue, 12 Nov 2013 23:16:08 +0000 (15:16 -0800)]
Show the 100% state of the progress at least one frame.

  Bug: 11505806

Change-Id: I5fe8456ff93cd50da53e022ac2cf2dd9ac633b2f

10 years agoAdd parameters and deduplicate parameter changes
Seth Raphael [Tue, 12 Nov 2013 19:21:17 +0000 (11:21 -0800)]
Add parameters and deduplicate parameter changes

Bug: 11646117
Change-Id: If52182a856d7ee8143a351c7f79a76d13840c61e

10 years agoRevert parallel opening camera in photo mode.
Erin Dahlgren [Tue, 12 Nov 2013 17:39:08 +0000 (09:39 -0800)]
Revert parallel opening camera in photo mode.

Reverts:
* ag/386409
* ag/386206
* ag/385573

Bug: 11598948
Bug: 11625767
Bug: 11627454
Bug: 11255097
Change-Id: Iad28e32dbcbbce42d9ee261c961cdd5a7712ede5

10 years agoMerge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad
Andy Huibers [Tue, 12 Nov 2013 19:10:38 +0000 (19:10 +0000)]
Merge "Close mode menus if another control is touched" into gb-ub-photos-carlsbad

10 years agoMerge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos...
ztenghui [Tue, 12 Nov 2013 18:12:34 +0000 (18:12 +0000)]
Merge "Differentiate the InProgressData from the normal PhotoData." into gb-ub-photos-carlsbad

10 years agoDifferentiate the InProgressData from the normal PhotoData.
ztenghui [Tue, 12 Nov 2013 17:57:14 +0000 (09:57 -0800)]
Differentiate the InProgressData from the normal PhotoData.

When we load from MediaStore, we should differentiate the data still in
progress, e.g. HDR+, which should show the progress bar and hide the action bar
items.

bug:11634500
bug:11598186
Change-Id: I8179d39747218c8768977d5b3ce71eadbdfb8b58

10 years agoClose mode menus if another control is touched
Andy Huibers [Tue, 12 Nov 2013 06:30:49 +0000 (22:30 -0800)]
Close mode menus if another control is touched

Bug: 11598901
Bug: 11635865
Change-Id: I9c6237bacef9a28de1fa238e1e7378a57abfc573

10 years agoStart gcam module directly when handling capture intent.
Ruben Brunk [Mon, 11 Nov 2013 22:13:59 +0000 (14:13 -0800)]
Start gcam module directly when handling capture intent.

Bug: 11609971

- Prior behavior for capture intents when in HDR+ mode was
  to resume into the PhotoModule and switch to the GcamModule.
  Following this change, we resume directly into the GcamModule.

- Fixes the bad lockscreen behavior caused by the sequence:
  onResume->switch to GcamModule(queue GcamModule onPause and onResume)->
  onPause->onResume, where handler queuing order could get in a
  state where the GcamModule onResume is called twice in a row,
  resulting in duplicate requests being queued for each capture.

Change-Id: Ibd632d74836224288270f5342e45e523e25ca429

10 years agoAdd a null check to fix NPE
ztenghui [Sat, 9 Nov 2013 01:17:52 +0000 (17:17 -0800)]
Add a null check to fix NPE

bug: 11594111
Change-Id: Ica2ffe315c4e4eaa818aa609d9600d5e67e54b3b

10 years agoAdd logging to various actions
Seth Raphael [Tue, 5 Nov 2013 18:12:36 +0000 (10:12 -0800)]
Add logging to various actions

Bug: 11514148

Change-Id: Ib31a74a6badc4dcdeaa316e032f4aef17edd06b2

10 years agoMerge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub...
Ruben Brunk [Fri, 8 Nov 2013 02:31:54 +0000 (02:31 +0000)]
Merge "Ensure mOpenCameraThread has been setup before dereferencing." into gb-ub-photos-carlsbad

10 years agoEnsure mOpenCameraThread has been setup before dereferencing.
Ruben Brunk [Fri, 8 Nov 2013 02:12:41 +0000 (18:12 -0800)]
Ensure mOpenCameraThread has been setup before dereferencing.

Bug: 11579062
Change-Id: Iabccdbfd3468eaa47115de1dbcafa7f9e456603b

10 years agoMerge "Add GCam progress indicator." into gb-ub-photos-carlsbad
Sascha Haeberling [Thu, 7 Nov 2013 23:26:15 +0000 (23:26 +0000)]
Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad

10 years agoAdd GCam progress indicator.
Sascha Haeberling [Thu, 7 Nov 2013 21:43:33 +0000 (13:43 -0800)]
Add GCam progress indicator.

  Bug: 11505806

Change-Id: I823c44b3761bb3c6dce56b1ec1b8d667023da820

10 years agohide preview cover on arrival of new preview data if hidden
Andy Huibers [Wed, 6 Nov 2013 22:37:26 +0000 (14:37 -0800)]
hide preview cover on arrival of new preview data if hidden

Bug: 11433257
Change-Id: I7225ebf1d84bbefd2f952cfa524720a7e76e7181

10 years agoMerge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos...
Erin Dahlgren [Thu, 7 Nov 2013 21:24:34 +0000 (21:24 +0000)]
Merge "Fix photo mode is getting stuck in a single CameraState." into gb-ub-photos-carlsbad

10 years agoFix photo mode is getting stuck in a single CameraState.
Erin Dahlgren [Thu, 7 Nov 2013 19:55:49 +0000 (11:55 -0800)]
Fix photo mode is getting stuck in a single CameraState.

Bug: 11574716
Change-Id: Ieb3622103798077071bb9350773851b7acbff756

10 years agoShow chooser on EDIT intents that have no activity for action.
Erin Dahlgren [Thu, 7 Nov 2013 19:35:10 +0000 (11:35 -0800)]
Show chooser on EDIT intents that have no activity for action.

Bug: 11571947
Change-Id: I40ef0f9ae6b4567557064d91b9c3942cd524a60b

10 years agoMerge "Parallelize opening the camera with view handling in photo mode." into gb...
Erin Dahlgren [Thu, 7 Nov 2013 18:09:44 +0000 (18:09 +0000)]
Merge "Parallelize opening the camera with view handling in photo mode." into gb-ub-photos-carlsbad

10 years agoParallelize opening the camera with view handling in photo mode.
Erin Dahlgren [Wed, 6 Nov 2013 19:57:51 +0000 (11:57 -0800)]
Parallelize opening the camera with view handling in photo mode.

Bug: 11255097
Change-Id: I8da16a97ee46555267ae8cfee0e7940d3f53f98f

10 years agoMerge "Decouple the visibility check for system UI from action bar" into gb-ub-photos...
ztenghui [Thu, 7 Nov 2013 17:53:54 +0000 (17:53 +0000)]
Merge "Decouple the visibility check for system UI from action bar" into gb-ub-photos-carlsbad

10 years agoDecouple the visibility check for system UI from action bar
ztenghui [Wed, 6 Nov 2013 22:20:31 +0000 (14:20 -0800)]
Decouple the visibility check for system UI from action bar

And make sure we toggle system UI when reload.

bug:11539377

Change-Id: I4d251557c1d68a173cabb652e0beaa3ee89cb6f0

10 years agoDon't crash Photo Sphere on back button press in filmstrip.
Sascha Haeberling [Wed, 6 Nov 2013 22:03:17 +0000 (14:03 -0800)]
Don't crash Photo Sphere on back button press in filmstrip.

  Bug: 11554580

Change-Id: I983713eecbd6f13bd90f94b24a0fa1ecc26e1c56

10 years agoMerge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbad
ztenghui [Wed, 6 Nov 2013 18:32:33 +0000 (18:32 +0000)]
Merge "Fix the RTL layout in the app's manifest." into gb-ub-photos-carlsbad

10 years agoMerge "Make image editor intent general." into gb-ub-photos-carlsbad
Erin Dahlgren [Wed, 6 Nov 2013 17:54:41 +0000 (17:54 +0000)]
Merge "Make image editor intent general." into gb-ub-photos-carlsbad

10 years agoadd 'capturing' string for in process indicators
Alan Newberger [Wed, 6 Nov 2013 04:15:01 +0000 (20:15 -0800)]
add 'capturing' string for in process indicators

This string can be used for in progess screen indicators.

Bug: 11505806
Change-Id: I3b0e3809b8389cfea2059b239d09a3e0766a77c6

10 years agoMerge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos...
Ruben Brunk [Wed, 6 Nov 2013 02:43:16 +0000 (02:43 +0000)]
Merge "camera: Ensure camera release for lockscreen transition." into gb-ub-photos-carlsbad

10 years agoMerge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad
Doris Liu [Wed, 6 Nov 2013 02:04:37 +0000 (02:04 +0000)]
Merge "Make sure preview aspect ratio is updated" into gb-ub-photos-carlsbad

10 years agoMake image editor intent general.
Erin Dahlgren [Wed, 6 Nov 2013 00:07:10 +0000 (16:07 -0800)]
Make image editor intent general.

Bug: 11372979
Change-Id: I7649eb995fbd78f9b29c76da777aca83777c49fc

10 years agocamera: Ensure camera release for lockscreen transition.
Ruben Brunk [Tue, 5 Nov 2013 23:53:28 +0000 (15:53 -0800)]
camera: Ensure camera release for lockscreen transition.

Bug: 11063890
Change-Id: Iec7fb672571166ee5a560a8245b56affa627e88b

10 years agoFix the RTL layout in the app's manifest.
ztenghui [Tue, 5 Nov 2013 23:23:12 +0000 (15:23 -0800)]
Fix the RTL layout in the app's manifest.

At the same time, make sure the bottom controls are following RTL rules.
bug:11481090

Change-Id: I52262aece7c16c194b6419150c1d4c13abff4f2d

10 years agoMake sure preview aspect ratio is updated
Doris Liu [Tue, 5 Nov 2013 23:25:26 +0000 (15:25 -0800)]
Make sure preview aspect ratio is updated

Bug: 11509233
Change-Id: Ide6f5bbe0abe7ed45e56b3f34c19204c1294afc7

10 years agoMerge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad
Alan Newberger [Mon, 4 Nov 2013 22:55:20 +0000 (22:55 +0000)]
Merge "adjust keyguard camera layout to make buttons match" into gb-ub-photos-carlsbad

10 years agoMerge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad
Doris Liu [Mon, 4 Nov 2013 22:22:44 +0000 (22:22 +0000)]
Merge "Preserve high resolution image on touch during zoom" into gb-ub-photos-carlsbad

10 years agoMerge "Adjust HDR options menu details" into gb-ub-photos-carlsbad
Alan Newberger [Mon, 4 Nov 2013 22:19:48 +0000 (22:19 +0000)]
Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad

10 years agoAdjust HDR options menu details
Alan Newberger [Mon, 4 Nov 2013 22:12:26 +0000 (14:12 -0800)]
Adjust HDR options menu details

To better align HDR/HDR+ menu options with other menu options,
shortening the description and making it all caps.

Bug: 11481286
Change-Id: I05ddb3594d1680b11259f128cc1e4aa7954892f8

10 years agoPreserve high resolution image on touch during zoom
Doris Liu [Mon, 4 Nov 2013 22:03:28 +0000 (14:03 -0800)]
Preserve high resolution image on touch during zoom

Bug: 11477449
Change-Id: I08b33cee258de1f90e5fa60e6483834dd5197bd2

10 years agoCheck for media service being present before capture.
Sascha Haeberling [Mon, 4 Nov 2013 20:11:34 +0000 (12:11 -0800)]
Check for media service being present before capture.

  Bug: 11508325

Change-Id: I0997f9bff63b1cdb3c33272acc8617b30c07424a

10 years agoMerge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad
Alan Newberger [Fri, 1 Nov 2013 20:37:16 +0000 (20:37 +0000)]
Merge "Add Samsung front camera resolutions" into gb-ub-photos-carlsbad

10 years agoAdd Samsung front camera resolutions
Michael Kolb [Tue, 4 Jun 2013 18:40:20 +0000 (11:40 -0700)]
Add Samsung front camera resolutions

  Bug: 11462711
  Bug: 9275928

Change-Id: Ibe6bc8af214eab1fc5f4119823d32ef7876288f5

10 years agoAdd new notification icon.
Sascha Haeberling [Fri, 1 Nov 2013 16:47:58 +0000 (09:47 -0700)]
Add new notification icon.

  Bug: 11417480

Change-Id: I072a1348d515b2cd435748e2db2824e98a604413

10 years agoMerge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad
Ruben Brunk [Thu, 31 Oct 2013 20:40:45 +0000 (20:40 +0000)]
Merge "gcam: Add generic preview fps range selection." into gb-ub-photos-carlsbad

10 years agoRemove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon
Alan Newberger [Wed, 30 Oct 2013 19:51:21 +0000 (12:51 -0700)]
Remove CameraUtil.launchGallery, ensure SecureCamera uses Gallery up icon

CameraUtil.launchGallery incorrectly describes a mechanism to call an APP_GALLERY
category intent. Since we're using Gallery icon we should go direct to Gallery,
which IntentHelper already does. Simply removed the util class and call the
helper direct from the activity. Also noticed during testing that the SecureCamera
was not correctly showing the Gallery icon, though its behavior would take user
to Gallery. Finally, removing restriction that the video player intent should
go to Gallery, instead it should route to system preferred intent.

Bug: 11065256
Change-Id: I941f9469de169919c4bac6c91dde7e577921f737

10 years agogcam: Add generic preview fps range selection.
Ruben Brunk [Wed, 30 Oct 2013 01:28:32 +0000 (18:28 -0700)]
gcam: Add generic preview fps range selection.

Bug: 11433097
Change-Id: Ice0f7ad3cd0684183298ce03bab3038a41316cf6

10 years agoFix rotation bug for animated thumbnail shown after capture.
Andy Huibers [Tue, 29 Oct 2013 23:03:58 +0000 (16:03 -0700)]
Fix rotation bug for animated thumbnail shown after capture.

Bug: 11420737

Change-Id: I55b90137b362d0b3b98aba34114537e0f6107b8c

10 years agoMerge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad
Doris Liu [Tue, 29 Oct 2013 00:27:08 +0000 (00:27 +0000)]
Merge "Fix the mapping between preview UI and camera sensor" into gb-ub-photos-carlsbad

10 years agoMerge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 22:57:00 +0000 (22:57 +0000)]
Merge "Fix crash when trying to reopen the camera." into gb-ub-photos-carlsbad

10 years agoFix crash when trying to reopen the camera.
ztenghui [Mon, 28 Oct 2013 22:27:02 +0000 (15:27 -0700)]
Fix crash when trying to reopen the camera.

In this case, another app is using the Camera, such that the camera.open will
hit an exception. We should show an dialog here.

bug:11258139

Change-Id: I0bd2d05fe4d4d9c5e4b87b39f3ef48910cfb7111

10 years agoFix the mapping between preview UI and camera sensor
Doris Liu [Mon, 28 Oct 2013 21:44:24 +0000 (14:44 -0700)]
Fix the mapping between preview UI and camera sensor

Bug: 11409659
Change-Id: I46ae3d7797590d59befbdc394d5304f14a212a80

10 years agoMerge "gcam: Add placeholder image." into gb-ub-photos-carlsbad
Ruben Brunk [Mon, 28 Oct 2013 18:44:08 +0000 (18:44 +0000)]
Merge "gcam: Add placeholder image." into gb-ub-photos-carlsbad

10 years agogcam: Add placeholder image.
Ruben Brunk [Thu, 17 Oct 2013 22:41:44 +0000 (15:41 -0700)]
gcam: Add placeholder image.

Bug: 11050749

Change-Id: I374c5919d6da0609fccd21c09775fa91894d5a24

10 years agoMerge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad
ztenghui [Mon, 28 Oct 2013 18:09:51 +0000 (18:09 +0000)]
Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad

10 years agoFix memory leak due to inner class for handler.
ztenghui [Fri, 25 Oct 2013 21:56:32 +0000 (14:56 -0700)]
Fix memory leak due to inner class for handler.

To keep the existing interface, we just overwrite the handler here.

bug:11336965

Change-Id: I77b2f577279244439ee9f81344f47bf5773e527b

10 years agoUpdate aspect ratio when preview aspect ratio changes
Doris Liu [Sat, 26 Oct 2013 03:20:43 +0000 (20:20 -0700)]
Update aspect ratio when preview aspect ratio changes

Bug: 11250125
Change-Id: If4047860f056cd81bf7d74045a68f5c0b85ad067

10 years agoFix skipped hide review layout calls
Doris Liu [Fri, 25 Oct 2013 20:38:54 +0000 (13:38 -0700)]
Fix skipped hide review layout calls

Bug: 11338381

Change-Id: I39c9541638f3e8c2a2f96ae4b1be7692a6db0e1c

10 years agoMerge "Bump version number for MR1" into gb-ub-photos-carlsbad
Sascha Haeberling [Mon, 21 Oct 2013 20:50:13 +0000 (20:50 +0000)]
Merge "Bump version number for MR1" into gb-ub-photos-carlsbad

10 years agoBump version number for MR1
Sascha Haeberling [Mon, 21 Oct 2013 20:33:28 +0000 (13:33 -0700)]
Bump version number for MR1

 Bug: 11240056

Change-Id: Ia3ad9f86516eed5ca60e8707d53139d54e3ee562

10 years agoMerge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad
Erin Dahlgren [Mon, 21 Oct 2013 20:47:33 +0000 (20:47 +0000)]
Merge "Update preview controls on deleting all items." into gb-ub-photos-carlsbad

10 years agoUpdate preview controls on deleting all items.
Erin Dahlgren [Mon, 21 Oct 2013 17:08:54 +0000 (10:08 -0700)]
Update preview controls on deleting all items.

Bug: 11219537
Change-Id: I897b65bd7c594b904aa29462e056a10d0e9c52a2

10 years agoThe initial focus value should be true.
ztenghui [Mon, 21 Oct 2013 17:33:40 +0000 (10:33 -0700)]
The initial focus value should be true.

Every time when we enter the wide angel (SRI) module, the preview should be
in focus.

bug:11234723
Change-Id: I218573946609f1e0e4415621a71b96a20775237d

10 years agoDon't call onCurrentDataChanged for CameraPreview when reloading.
ztenghui [Tue, 15 Oct 2013 22:31:00 +0000 (15:31 -0700)]
Don't call onCurrentDataChanged for CameraPreview when reloading.

In this case, camera preview didn't change, so there is no need to call
onCurrentDataChanged.

bug:11237255
Change-Id: I788a2ee4e7337721d0bbd6aa75e7da6d382bf282

10 years agoMerge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad
Doris Liu [Sat, 19 Oct 2013 00:39:54 +0000 (00:39 +0000)]
Merge "Fix SRI orientation on manta" into gb-ub-photos-carlsbad

10 years agoFix SRI orientation on manta
Doris Liu [Sat, 19 Oct 2013 00:15:30 +0000 (17:15 -0700)]
Fix SRI orientation on manta

Bug: 11292213
Change-Id: I7977de4c5bb906eec5431e706e28118837a682e7

10 years agoDon't crash when preview surface could not be set.
Sascha Haeberling [Thu, 17 Oct 2013 22:29:38 +0000 (15:29 -0700)]
Don't crash when preview surface could not be set.

  Bug: 11021188

Change-Id: Idfc1cf5c50ac1f3f46956079c3231cbdda32e1a4

10 years agoUpdate HDR/HDR+ arc menu hover messages.
Sascha Haeberling [Thu, 17 Oct 2013 20:51:23 +0000 (13:51 -0700)]
Update HDR/HDR+ arc menu hover messages.

  Bug : 11185194

Change-Id: Ie26e9a225dffa0a8ccd9e99fff3d7264b079ac62

10 years agoMerge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad
Doris Liu [Thu, 17 Oct 2013 17:46:48 +0000 (17:46 +0000)]
Merge "Show a preview cover until real preview is ready" into gb-ub-photos-carlsbad

10 years agoMerge "Don't allow swipe into the film strip view when swipe is disabled" into gb...
ztenghui [Thu, 17 Oct 2013 17:40:20 +0000 (17:40 +0000)]
Merge "Don't allow swipe into the film strip view when swipe is disabled" into gb-ub-photos-carlsbad

10 years agoMerge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad
Baligh Uddin [Thu, 17 Oct 2013 17:16:59 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Oct 2013 07:27:38 +0000 (00:27 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie510117ceb7dacad642d2fb87c81aa3aa0ff3e89
Auto-generated-cl: translation import

10 years agoMerge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad
ztenghui [Wed, 16 Oct 2013 23:10:39 +0000 (23:10 +0000)]
Merge "Send an message to decouple the gcam module change." into gb-ub-photos-carlsbad

10 years agoSend an message to decouple the gcam module change.
ztenghui [Wed, 16 Oct 2013 21:43:26 +0000 (14:43 -0700)]
Send an message to decouple the gcam module change.

In this particular case, we try to enter GCam module directly which cause the
mCameraDevice to become null for photo module.
Therefore we post a message to switch into GCam to make sure current mode
switch complete first.

bug:11252237

Change-Id: Ibd33815e7bee74425faa758247e1dec85a2f17cb

10 years agoMerge "update camera launcher icon" into gb-ub-photos-carlsbad
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 22:11:27 +0000 (22:11 +0000)]
Merge "update camera launcher icon" into gb-ub-photos-carlsbad

10 years agoMerge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad
Doris Liu [Wed, 16 Oct 2013 21:57:32 +0000 (21:57 +0000)]
Merge "Fix shutter covering pie menu" into gb-ub-photos-carlsbad

10 years agoFix shutter covering pie menu
Doris Liu [Wed, 16 Oct 2013 19:51:02 +0000 (12:51 -0700)]
Fix shutter covering pie menu

Bug: 11247988
Change-Id: I2018075a0b8adf7cacb302774ed64df92fc2fa7c

10 years agoupdate camera launcher icon
Ari Sachter-Zeltzer [Wed, 16 Oct 2013 17:34:29 +0000 (10:34 -0700)]
update camera launcher icon

fixed b/11252230

Change-Id: I78ef2c748246d7c30849ece2b029150096bc1227

10 years agoShow a preview cover until real preview is ready
Doris Liu [Wed, 16 Oct 2013 02:10:28 +0000 (19:10 -0700)]
Show a preview cover until real preview is ready

Bug: 11211650
Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39

10 years agoMerge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos...
Igor Murashkin [Tue, 15 Oct 2013 21:51:39 +0000 (21:51 +0000)]
Merge "gcam: Fix AF spinner not to reset when changing position" into gb-ub-photos-carlsbad

10 years agoadjust keyguard camera layout to make buttons match
Alan Newberger [Tue, 15 Oct 2013 21:29:24 +0000 (14:29 -0700)]
adjust keyguard camera layout to make buttons match

by trial and error adjusted the bottom margins of the controls to make
transition to real camera layout seamless on the HH and N4.

Bug: 11236276
Change-Id: I707a5b0b94ac466c07b19c84473e444250cecf28

10 years agoDon't allow swipe into the film strip view when swipe is disabled
ztenghui [Tue, 15 Oct 2013 21:13:26 +0000 (14:13 -0700)]
Don't allow swipe into the film strip view when swipe is disabled

The swipe is supposed to be intercepted by FilmStripView, however, when the
children is not handling the scroll / fling gestures, FilmStripView will still
has to handle it.
In this case, we need to detect whether or not the swipe has been disabled.

bug:11234333
bug:11221594

Change-Id: I1d0fbac65050aef225fb880a41df735e98bf48db

10 years agogcam: Fix AF spinner not to reset when changing position
Igor Murashkin [Tue, 15 Oct 2013 20:43:31 +0000 (13:43 -0700)]
gcam: Fix AF spinner not to reset when changing position

Bug: 10936156
Change-Id: If9b73415e95684e2acbcbc15457e865bd133f366

10 years agoMerge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad
Doris Liu [Tue, 15 Oct 2013 19:58:43 +0000 (19:58 +0000)]
Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad

10 years agoMerge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad
Igor Murashkin [Tue, 15 Oct 2013 19:55:18 +0000 (19:55 +0000)]
Merge "CameraUtil: add float clamp function" into gb-ub-photos-carlsbad

10 years agoDismiss switcher popup when shutter button is clicked
Doris Liu [Tue, 15 Oct 2013 19:51:47 +0000 (12:51 -0700)]
Dismiss switcher popup when shutter button is clicked

Bug: 11224722
Change-Id: Id9813c83e22e951f06cb7a885fdb34820f62b545

10 years agoMerge "Do not show any bottom controls in secure camera to prevent launching out...
Erin Dahlgren [Tue, 15 Oct 2013 19:35:10 +0000 (19:35 +0000)]
Merge "Do not show any bottom controls in secure camera to prevent launching out of app behavior." into gb-ub-photos-carlsbad