OSDN Git Service

android-x86/packages-apps-Camera2.git
9 years agoam f3e53dc1: am a4258d82: am 2ef0f9dc: Fix unnecessary string cast
Alan Newberger [Thu, 4 Sep 2014 03:22:16 +0000 (03:22 +0000)]
am f3e53dc1: am a4258d82: am 2ef0f9dc: Fix unnecessary string cast

* commit 'f3e53dc11e59e0b0416edd924f0b2e267e484d6b':
  Fix unnecessary string cast

9 years agoam a4258d82: am 2ef0f9dc: Fix unnecessary string cast
Alan Newberger [Thu, 4 Sep 2014 01:32:03 +0000 (01:32 +0000)]
am a4258d82: am 2ef0f9dc: Fix unnecessary string cast

* commit 'a4258d829019884b2b6396b4728765d2cdb79923':
  Fix unnecessary string cast

9 years agoam 2ef0f9dc: Fix unnecessary string cast
Alan Newberger [Thu, 4 Sep 2014 01:21:26 +0000 (01:21 +0000)]
am 2ef0f9dc: Fix unnecessary string cast

* commit '2ef0f9dc95527a354846940bae675741c464e6ae':
  Fix unnecessary string cast

9 years agoFix unnecessary string cast
Alan Newberger [Thu, 4 Sep 2014 01:02:49 +0000 (18:02 -0700)]
Fix unnecessary string cast

Code was taking a setting as a string, which when empty returns null,
then tried to parseInt it. Instead ask for an int, which will default
to zero, and things will work.

Bug: 16827108
Change-Id: I5bbed091ec29fc98257a5eb18948891c43caa29f

9 years agoam 54bc8e44: am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camer...
Alan Newberger [Thu, 4 Sep 2014 00:48:08 +0000 (00:48 +0000)]
am 54bc8e44: am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier

* commit '54bc8e449e5ff47ccbd04b34365411c109a53c05':
  Fixing settings upgrades

9 years agoam 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
Alan Newberger [Thu, 4 Sep 2014 00:31:51 +0000 (00:31 +0000)]
am 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier

* commit '64e4bc9f0dc63a440143f17803f6e86f80139a2c':
  Fixing settings upgrades

9 years agoam 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
Alan Newberger [Thu, 4 Sep 2014 00:20:16 +0000 (00:20 +0000)]
am 2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier

* commit '2b084ec5c7c262003581be3584825300269adae2':
  Fixing settings upgrades

9 years agoMerge "Fixing settings upgrades" into ub-camera-glacier
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier

9 years agoam b87b255a: am fb730076: am 4d6d676c: Refactor default picture size selection in...
Puneet Lall [Wed, 3 Sep 2014 23:47:40 +0000 (23:47 +0000)]
am b87b255a: am fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam.

* commit 'b87b255a53f91b000484e29b3fe56d6a3b367467':
  Refactor default picture size selection in zsl cam.

9 years agoFixing settings upgrades
Alan Newberger [Wed, 3 Sep 2014 01:31:10 +0000 (18:31 -0700)]
Fixing settings upgrades

Did a full audit of upgrade scenarios and performed the following fixes.
* restored pre-existing location upgrade code that handled old upgrades.
preserves location choice from C straight to G.
* added string type format conversion for "old global" values that were
not implemented in the refactor : hdr, hdr+, grid buttons
* moved a "reset" that existed in upgraders that put the user in Camera
mode on upgrade. it should run for everglades upgraders along with size
changes.

Bug: 17317510
Change-Id: I87db511bfa89676525ee727620cb546c180a8ef6

9 years agoam fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam.
Puneet Lall [Wed, 3 Sep 2014 21:34:16 +0000 (21:34 +0000)]
am fb730076: am 4d6d676c: Refactor default picture size selection in zsl cam.

* commit 'fb7300764d996191e4d6610c7e6558ec5d3c89a6':
  Refactor default picture size selection in zsl cam.

9 years agoam 4d6d676c: Refactor default picture size selection in zsl cam.
Puneet Lall [Wed, 3 Sep 2014 21:27:34 +0000 (21:27 +0000)]
am 4d6d676c: Refactor default picture size selection in zsl cam.

* commit '4d6d676c368b70e8c0fcf462e51de1d59fe34028':
  Refactor default picture size selection in zsl cam.

9 years agoRefactor default picture size selection in zsl cam.
Puneet Lall [Wed, 3 Sep 2014 20:22:01 +0000 (13:22 -0700)]
Refactor default picture size selection in zsl cam.

Bug: 17322843
Change-Id: Ib34584937db639f984689042bd8371443a33bb64

9 years agoam 40c0567b: am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size...
Puneet Lall [Wed, 3 Sep 2014 18:29:08 +0000 (18:29 +0000)]
am 40c0567b: am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier

* commit '40c0567bc065234e95a92be455527d9e52e02b97':
  [ZSL Cam] Use largest supported size if no picture size is already set.

9 years agoam f5bd183a: am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability...
Andy Huibers [Wed, 3 Sep 2014 18:19:54 +0000 (18:19 +0000)]
am f5bd183a: am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

* commit 'f5bd183a14cd3045425f6464bcaf90cefe10ae52':
  CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

9 years agoam d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture...
Puneet Lall [Wed, 3 Sep 2014 18:15:53 +0000 (18:15 +0000)]
am d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier

* commit 'd8934fdfc5e9612b284721b6354ca772854bcbbb':
  [ZSL Cam] Use largest supported size if no picture size is already set.

9 years agoam 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is alread...
Puneet Lall [Wed, 3 Sep 2014 18:08:03 +0000 (18:08 +0000)]
am 686c7b55: Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier

* commit '686c7b55a6b0c9c7202383e0589b190e5439ce69':
  [ZSL Cam] Use largest supported size if no picture size is already set.

9 years agoam 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel...
Andy Huibers [Wed, 3 Sep 2014 18:02:45 +0000 (18:02 +0000)]
am 648c05aa: am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

* commit '648c05aa3f96abf8a973a6584e471baff1cfc718':
  CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

9 years agoMerge "[ZSL Cam] Use largest supported size if no picture size is already set." into...
Puneet Lall [Wed, 3 Sep 2014 18:01:21 +0000 (18:01 +0000)]
Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier

9 years agoam 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove prema...
Andy Huibers [Wed, 3 Sep 2014 17:53:50 +0000 (17:53 +0000)]
am 4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

* commit '4d7f3be87a92c7efac7cf92bbd4ce7dd61f46e0d':
  CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

9 years ago[ZSL Cam] Use largest supported size if no picture size is already set.
Puneet Lall [Wed, 3 Sep 2014 17:43:35 +0000 (10:43 -0700)]
[ZSL Cam] Use largest supported size if no picture size is already set.

Fixes crash due to null size when zsl is started for the first time on a
fresh device.

Bug: 17322843
Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009

9 years agoam 6836d716: am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule...
Andy Huibers [Wed, 3 Sep 2014 14:34:37 +0000 (14:34 +0000)]
am 6836d716: am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier

* commit '6836d71609c49d0da9fe6d4d7702b8d60cf0d3b0':
  Add countdown timer to CaptureModule.

9 years agoam ca6ca413: am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live...
Sascha Haeberling [Wed, 3 Sep 2014 05:49:54 +0000 (05:49 +0000)]
am ca6ca413: am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier

* commit 'ca6ca4136c77b2c2f7692ab5f954fa0571b7c9e3':
  A few Size clean-ups to support live metering changes.

9 years agoam 8693a3f3: am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camer...
Spike Sprague [Wed, 3 Sep 2014 05:49:16 +0000 (05:49 +0000)]
am 8693a3f3: am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier

* commit '8693a3f347ac6eabea0403030c71dcaec27c7f40':
  actionbar opactiy tweaks

9 years agoam b27bc8ec: am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L)
Spike Sprague [Wed, 3 Sep 2014 05:49:11 +0000 (05:49 +0000)]
am b27bc8ec: am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L)

* commit 'b27bc8eca2ed8b3da9c4ce45ecd32df8d2069a97':
  shutter button color fix (pre-L)

9 years agoCaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPla...
Andy Huibers [Wed, 3 Sep 2014 05:12:09 +0000 (22:12 -0700)]
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.

Bug: 17204673
Change-Id: I438c3d4e7a9aad3f8fc709d255a249399bb05b57

9 years agoam a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camer...
Andy Huibers [Wed, 3 Sep 2014 02:40:08 +0000 (02:40 +0000)]
am a00adf62: am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier

* commit 'a00adf6218dd771f15cbb77eb203999f6dfc2107':
  Add countdown timer to CaptureModule.

9 years agoam d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
Andy Huibers [Wed, 3 Sep 2014 02:29:02 +0000 (02:29 +0000)]
am d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier

* commit 'd568e524029dc538d774d3d7b45586639549c79a':
  Add countdown timer to CaptureModule.

9 years agoMerge "Add countdown timer to CaptureModule." into ub-camera-glacier
Andy Huibers [Wed, 3 Sep 2014 02:16:26 +0000 (02:16 +0000)]
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier

9 years agoAdd countdown timer to CaptureModule.
Andy Huibers [Tue, 2 Sep 2014 18:27:11 +0000 (11:27 -0700)]
Add countdown timer to CaptureModule.

Bug: 16654225
Bug: 17204673

Change-Id: I914094b204743ddbe786ef1a7621564e864ed834

9 years agoam 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering change...
Sascha Haeberling [Tue, 2 Sep 2014 23:22:19 +0000 (23:22 +0000)]
am 13a221a2: am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier

* commit '13a221a28fe6512f132c9929243ffb19ec25ade6':
  A few Size clean-ups to support live metering changes.

9 years agoam 7718b87b: Merge "A few Size clean-ups to support live metering changes." into...
Sascha Haeberling [Tue, 2 Sep 2014 23:15:14 +0000 (23:15 +0000)]
am 7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier

* commit '7718b87b566b20d11dfa2dd97f60018e601ad409':
  A few Size clean-ups to support live metering changes.

9 years agoMerge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
Sascha Haeberling [Tue, 2 Sep 2014 23:06:57 +0000 (23:06 +0000)]
Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier

9 years agoam 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Tue, 2 Sep 2014 22:49:02 +0000 (22:49 +0000)]
am 39b7e060: am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier

* commit '39b7e0608e143811f2cca5bd8eb72936e961130e':
  actionbar opactiy tweaks

9 years agoam b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Tue, 2 Sep 2014 22:41:59 +0000 (22:41 +0000)]
am b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier

* commit 'b9f4b931949dbddeba61b0a6bfcc52d24e01c97c':
  actionbar opactiy tweaks

9 years agoam 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L)
Spike Sprague [Tue, 2 Sep 2014 22:38:19 +0000 (22:38 +0000)]
am 12a615c8: am 9bfd6bdd: shutter button color fix (pre-L)

* commit '12a615c836c71ce44e9480f0819feb663038b0e9':
  shutter button color fix (pre-L)

9 years agoMerge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Tue, 2 Sep 2014 22:33:35 +0000 (22:33 +0000)]
Merge "actionbar opactiy tweaks" into ub-camera-glacier

9 years agoactionbar opactiy tweaks
Spike Sprague [Thu, 28 Aug 2014 22:48:50 +0000 (15:48 -0700)]
actionbar opactiy tweaks

bug: 17319586

Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900

9 years agoam 9bfd6bdd: shutter button color fix (pre-L)
Spike Sprague [Tue, 2 Sep 2014 22:28:44 +0000 (22:28 +0000)]
am 9bfd6bdd: shutter button color fix (pre-L)

* commit '9bfd6bddaa09ccdadabf3b0e7e2b81bc1bcf175d':
  shutter button color fix (pre-L)

9 years agoshutter button color fix (pre-L)
Spike Sprague [Mon, 18 Aug 2014 17:53:51 +0000 (10:53 -0700)]
shutter button color fix (pre-L)

bug: 17011894

Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759

9 years agoA few Size clean-ups to support live metering changes.
Sascha Haeberling [Tue, 2 Sep 2014 21:20:57 +0000 (14:20 -0700)]
A few Size clean-ups to support live metering changes.

  Bug: 16948752

Change-Id: I262a6b3caa42ecd7a4da40d1eaca6a7eaa96be98

9 years agoam be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import...
Andy Huibers [Tue, 2 Sep 2014 21:13:12 +0000 (21:13 +0000)]
am be020925: am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

* commit 'be0209252151382e41c9033eb20e9abb0000cadd':
  Remove android.hardware.camera2 import from Settings3A.

9 years agoam 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings...
Andy Huibers [Tue, 2 Sep 2014 21:05:49 +0000 (21:05 +0000)]
am 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

* commit '4cd2a6abfe628ee0d19cb0f373a438ac305a6fe4':
  Remove android.hardware.camera2 import from Settings3A.

9 years agoam 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into...
Andy Huibers [Tue, 2 Sep 2014 20:58:39 +0000 (20:58 +0000)]
am 5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

* commit '5ca2e0b94a3031ff2117c5e68f8198a2f174b8eb':
  Remove android.hardware.camera2 import from Settings3A.

9 years agoMerge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
Andy Huibers [Tue, 2 Sep 2014 20:51:55 +0000 (20:51 +0000)]
Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier

9 years agoRemove android.hardware.camera2 import from Settings3A.
Andy Huibers [Tue, 2 Sep 2014 20:11:37 +0000 (13:11 -0700)]
Remove android.hardware.camera2 import from Settings3A.

Bug: 17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f

9 years agoam 8435131b: am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities...
Senpo Hu [Tue, 2 Sep 2014 19:24:14 +0000 (19:24 +0000)]
am 8435131b: am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier

* commit '8435131b69208f53c6e1c4422964fe7f4dc77464':
  Starting share/edit/play activities in its own task.

9 years agoam 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task...
Senpo Hu [Tue, 2 Sep 2014 19:09:51 +0000 (19:09 +0000)]
am 76061e1f: am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier

* commit '76061e1fb8615c808e496a09cc3a7b715372feb7':
  Starting share/edit/play activities in its own task.

9 years agoam 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub...
Senpo Hu [Tue, 2 Sep 2014 19:02:01 +0000 (19:02 +0000)]
am 10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier

* commit '10fcde551bddb786e4cae0da3ed81a687cf2d470':
  Starting share/edit/play activities in its own task.

9 years agoMerge "Starting share/edit/play activities in its own task." into ub-camera-glacier
Senpo Hu [Tue, 2 Sep 2014 18:53:54 +0000 (18:53 +0000)]
Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier

9 years agoStarting share/edit/play activities in its own task.
Senpo Hu [Fri, 29 Aug 2014 23:27:03 +0000 (16:27 -0700)]
Starting share/edit/play activities in its own task.

Bug: 17091348
Change-Id: Ib90173e164fab2a1aba753ab4d4f05d305d3d522

9 years agoam e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other...
Alan Newberger [Sat, 30 Aug 2014 02:31:09 +0000 (02:31 +0000)]
am e48f098a: am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

* commit 'e48f098aebd68f6e13c4faaa1dfc9249fe327423':
  Ensure ZoomView appears on top of other views in L

9 years agoam 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in...
Alan Newberger [Sat, 30 Aug 2014 00:56:49 +0000 (00:56 +0000)]
am 2c25a7cb: am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

* commit '2c25a7cbcdb8fe18a3663f849584fcb9160b1f52':
  Ensure ZoomView appears on top of other views in L

9 years agoam ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camer...
Alan Newberger [Sat, 30 Aug 2014 00:49:50 +0000 (00:49 +0000)]
am ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

* commit 'ef4819104fa5e69b7654afcf2f388760e7989b24':
  Ensure ZoomView appears on top of other views in L

9 years agoMerge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
Alan Newberger [Sat, 30 Aug 2014 00:43:49 +0000 (00:43 +0000)]
Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier

9 years agoam b2b1ea96: am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl...
Andy Huibers [Sat, 30 Aug 2014 00:38:48 +0000 (00:38 +0000)]
am b2b1ea96: am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

* commit 'b2b1ea96321c09aff30a1b72869f373aef835b78':
  Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

9 years agoEnsure ZoomView appears on top of other views in L
Alan Newberger [Sat, 30 Aug 2014 00:34:48 +0000 (17:34 -0700)]
Ensure ZoomView appears on top of other views in L

Since our normal image view now has an elevation on L, just calling
bringChildToFront() is not enough, elevation supersedes z order.
So we also ensure the ZoomView is at max elevation when we bring it
to front.

Bug: 17331586
Change-Id: I34b06949d063daa08d964003b28a245eb6133f95

9 years agoam a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share...
Andy Huibers [Sat, 30 Aug 2014 00:26:15 +0000 (00:26 +0000)]
am a394ea69: am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

* commit 'a394ea695b3ac0b09f370cba5d47e732762d690e':
  Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

9 years agoam b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFoc...
Andy Huibers [Sat, 30 Aug 2014 00:17:29 +0000 (00:17 +0000)]
am b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

* commit 'b868274c9dc8d9c772ec89fb5955215cc7911087':
  Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

9 years agoSimplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
Andy Huibers [Wed, 27 Aug 2014 22:28:42 +0000 (15:28 -0700)]
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f

9 years agoam aef43423: am 0767876e: am 68c25ac5: ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 18:48:13 +0000 (18:48 +0000)]
am aef43423: am 0767876e: am 68c25ac5: ZSL refactoring

* commit 'aef434230582ce6788051b09875062914fc4b7d3':
  ZSL refactoring

9 years agoam 8b672ff2: am 42b0b25e: am d308d001: Add missing copyright header in Open Source...
Puneet Lall [Fri, 29 Aug 2014 18:48:13 +0000 (18:48 +0000)]
am 8b672ff2: am 42b0b25e: am d308d001: Add missing copyright header in Open Source code.

* commit '8b672ff2d9c5b37c3ea4c93baa4f7d88abf6622a':
  Add missing copyright header in Open Source code.

9 years agoam e8126a13: am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compres...
Puneet Lall [Fri, 29 Aug 2014 18:48:12 +0000 (18:48 +0000)]
am e8126a13: am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier

* commit 'e8126a131bff5b5f094303956276c56ea6ff8cdf':
  [ZSL Cam] Fixed shutter button, compress on threadpool.

9 years agoam a86ca43f: am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in...
Spike Sprague [Fri, 29 Aug 2014 18:48:12 +0000 (18:48 +0000)]
am a86ca43f: am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier

* commit 'a86ca43f9b52d43dae603b56e241e303c6545896':
  fix for a regression introduced in ag/534531

9 years agoam d6164f47: am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality...
Alan Newberger [Fri, 29 Aug 2014 18:48:10 +0000 (18:48 +0000)]
am d6164f47: am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier

* commit 'd6164f478629643719ba1e355a1b4cd145005f24':
  Increasing JPEG compression quality for filmstrip

9 years agoam 0767876e: am 68c25ac5: ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 03:37:29 +0000 (03:37 +0000)]
am 0767876e: am 68c25ac5: ZSL refactoring

* commit '0767876e281e55fe9ea60a878e16f1ec05cda987':
  ZSL refactoring

9 years agoam 42b0b25e: am d308d001: Add missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 03:35:37 +0000 (03:35 +0000)]
am 42b0b25e: am d308d001: Add missing copyright header in Open Source code.

* commit '42b0b25e5fae0ec49362539c124492799226a430':
  Add missing copyright header in Open Source code.

9 years agoam 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpo...
Puneet Lall [Fri, 29 Aug 2014 03:35:36 +0000 (03:35 +0000)]
am 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier

* commit '53c98a3e6b0320614aeb4cbcd4ec1a194b1e3e07':
  [ZSL Cam] Fixed shutter button, compress on threadpool.

9 years agoam 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into...
Spike Sprague [Fri, 29 Aug 2014 03:35:32 +0000 (03:35 +0000)]
am 70e387a7: am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier

* commit '70e387a78aa95817280d1c9c74bf866bbbaa1ce6':
  fix for a regression introduced in ag/534531

9 years agoam 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip...
Alan Newberger [Fri, 29 Aug 2014 03:35:26 +0000 (03:35 +0000)]
am 4deea574: am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier

* commit '4deea5747493574b6707eff85a350815576ac367':
  Increasing JPEG compression quality for filmstrip

9 years agoam 68c25ac5: ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 02:10:14 +0000 (02:10 +0000)]
am 68c25ac5: ZSL refactoring

* commit '68c25ac5373126670cb6c2324e40537bb47e72d9':
  ZSL refactoring

9 years agoZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 01:36:33 +0000 (18:36 -0700)]
ZSL refactoring

Bug: 16961251

Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da

9 years agoam d308d001: Add missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 01:23:50 +0000 (01:23 +0000)]
am d308d001: Add missing copyright header in Open Source code.

* commit 'd308d001e876b7036fba2727b18b6b9d652ecffb':
  Add missing copyright header in Open Source code.

9 years agoam 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into...
Puneet Lall [Fri, 29 Aug 2014 01:23:49 +0000 (01:23 +0000)]
am 82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier

* commit '82d70ea06c58df44cfefdc4e1a34644f8f817a23':
  [ZSL Cam] Fixed shutter button, compress on threadpool.

9 years agoam b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera...
Spike Sprague [Fri, 29 Aug 2014 01:23:48 +0000 (01:23 +0000)]
am b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier

* commit 'b8c3e31c32601095488a09c457a5cb154599c6a7':
  fix for a regression introduced in ag/534531

9 years agoam 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera...
Alan Newberger [Fri, 29 Aug 2014 01:23:47 +0000 (01:23 +0000)]
am 475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier

* commit '475a1935894830d3006c29d1155b5d98b62cc006':
  Increasing JPEG compression quality for filmstrip

9 years agoAdd missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 00:55:18 +0000 (17:55 -0700)]
Add missing copyright header in Open Source code.

Change-Id: I07703e0f55544204645396423ced09f957214d73

9 years agoMerge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
Puneet Lall [Fri, 29 Aug 2014 00:46:31 +0000 (00:46 +0000)]
Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier

9 years agoMerge "fix for a regression introduced in ag/534531" into ub-camera-glacier
Spike Sprague [Fri, 29 Aug 2014 00:45:14 +0000 (00:45 +0000)]
Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier

9 years agofix for a regression introduced in ag/534531
Spike Sprague [Fri, 29 Aug 2014 00:41:09 +0000 (17:41 -0700)]
fix for a regression introduced in ag/534531

that CL kept the swipe-away-from-filmstip
preview background from alpha-animating correctly.

this CL fixes that and provides an alternate solution
to bug 17301367

Change-Id: I04ba363a55dd9485d13e2d243fd1fb84df1d31e5

9 years ago[ZSL Cam] Fixed shutter button, compress on threadpool.
Puneet Lall [Thu, 28 Aug 2014 23:44:08 +0000 (16:44 -0700)]
[ZSL Cam] Fixed shutter button, compress on threadpool.

Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28

9 years agoMerge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 23:41:45 +0000 (23:41 +0000)]
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier

9 years agoIncreasing JPEG compression quality for filmstrip
Alan Newberger [Thu, 28 Aug 2014 23:37:33 +0000 (16:37 -0700)]
Increasing JPEG compression quality for filmstrip

This CL increases JPEG quality for generated cache images
in the filmstrip. This reduces overall artifacts for thumbnails.

Bug: 17320690
Change-Id: If2d0483502c0d8d18755b42dff5ffe9fd74e540f

9 years agoam 03ac1a09: am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor...
Puneet Lall [Thu, 28 Aug 2014 23:02:23 +0000 (23:02 +0000)]
am 03ac1a09: am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier

* commit '03ac1a09c2b6436dd9bf62e68ee5f88120d93e0e':
  Zsl flash, auto focus, and other minor fixes

9 years agoam 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into...
Puneet Lall [Thu, 28 Aug 2014 22:48:43 +0000 (22:48 +0000)]
am 97421aec: am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier

* commit '97421aecbefbd073442eff7028fe60f844fcc864':
  Zsl flash, auto focus, and other minor fixes

9 years agoam 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera...
Puneet Lall [Thu, 28 Aug 2014 22:37:25 +0000 (22:37 +0000)]
am 3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier

* commit '3724805a043ac149b7bc103bb94787133c7e06a5':
  Zsl flash, auto focus, and other minor fixes

9 years agoMerge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
Puneet Lall [Thu, 28 Aug 2014 22:04:53 +0000 (22:04 +0000)]
Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier

9 years agoZsl flash, auto focus, and other minor fixes
Puneet Lall [Thu, 28 Aug 2014 02:27:50 +0000 (19:27 -0700)]
Zsl flash, auto focus, and other minor fixes

Bug: 17216526
Bug: 17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788

9 years agoam 6655ec9f: am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camer...
Alan Newberger [Thu, 28 Aug 2014 18:27:38 +0000 (18:27 +0000)]
am 6655ec9f: am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier

* commit '6655ec9f012269050c65af771ab190a056d2589d':
  Actually remove settings

9 years agoam 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 18:15:42 +0000 (18:15 +0000)]
am 1c390f77: am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier

* commit '1c390f772c03e6eb748407f8c812c7eac8119e03':
  Actually remove settings

9 years agoam 965db3e8: Merge "Actually remove settings" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 18:07:46 +0000 (18:07 +0000)]
am 965db3e8: Merge "Actually remove settings" into ub-camera-glacier

* commit '965db3e8ca1416e418990344486b1008d1ebc8dd':
  Actually remove settings

9 years agoMerge "Actually remove settings" into ub-camera-glacier
Alan Newberger [Thu, 28 Aug 2014 17:58:39 +0000 (17:58 +0000)]
Merge "Actually remove settings" into ub-camera-glacier

9 years agoActually remove settings
Alan Newberger [Thu, 28 Aug 2014 17:30:33 +0000 (10:30 -0700)]
Actually remove settings

Correct settings removal, which wasn't occurring during upgrades. Will
followup with scrub of preference file references -- there are likely
additional reasons this wasn't causing more crashes, i.e. certain
settings not being ported over earlier versions.

Bug: 16879376
Change-Id: I720a3181958a4201508726d0f6e06803c456f737

9 years agoam 15648c2a: am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture...
Andy Huibers [Thu, 28 Aug 2014 17:28:48 +0000 (17:28 +0000)]
am 15648c2a: am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

* commit '15648c2afc0119da1b1ee301053473742c665fa8':
  Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

9 years agoam 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state...
Andy Huibers [Thu, 28 Aug 2014 17:21:12 +0000 (17:21 +0000)]
am 640a8648: am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

* commit '640a86481390c705576a9cd92f988d02dd4b7ab8':
  Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

9 years agoam 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_...
Andy Huibers [Thu, 28 Aug 2014 17:13:09 +0000 (17:13 +0000)]
am 076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

* commit '076efc0354552ee3b0845ae3b5988e755f92d5b0':
  Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

9 years agoDo not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
Andy Huibers [Thu, 28 Aug 2014 15:52:41 +0000 (08:52 -0700)]
Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).

Bug: 17312087
Change-Id: Ib706e35af5b1f49021efdd45b1e010e24dfbc333

9 years agoam 3ed8f628: am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera...
Sascha Haeberling [Thu, 28 Aug 2014 03:39:09 +0000 (03:39 +0000)]
am 3ed8f628: am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations.

* commit '3ed8f62847b65a36e85ab1cdbd1358f02a71bf27':
  Add simple sound player to be used in Camera implementations.

9 years agoam 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations.
Sascha Haeberling [Thu, 28 Aug 2014 02:24:46 +0000 (02:24 +0000)]
am 10438ec0: am 2d4be257: Add simple sound player to be used in Camera implementations.

* commit '10438ec0d2e7b1986e473273c7daf09c27861561':
  Add simple sound player to be used in Camera implementations.

9 years agoam 2d4be257: Add simple sound player to be used in Camera implementations.
Sascha Haeberling [Thu, 28 Aug 2014 01:44:02 +0000 (01:44 +0000)]
am 2d4be257: Add simple sound player to be used in Camera implementations.

* commit '2d4be2576b265a4abfbabbda20862fcea19c1395':
  Add simple sound player to be used in Camera implementations.