OSDN Git Service
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
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
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier
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
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.
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.
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
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.
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.
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.
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
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.
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
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
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.
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.
Andy Huibers [Wed, 3 Sep 2014 02:16:26 +0000 (02:16 +0000)]
Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
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
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.
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.
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
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
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
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)
Spike Sprague [Tue, 2 Sep 2014 22:33:35 +0000 (22:33 +0000)]
Merge "actionbar opactiy tweaks" into ub-camera-glacier
Spike Sprague [Thu, 28 Aug 2014 22:48:50 +0000 (15:48 -0700)]
actionbar opactiy tweaks
bug:
17319586
Change-Id: I2bfde2db9cff62b6ac8d8f416c1f8512c25bd900
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)
Spike Sprague [Mon, 18 Aug 2014 17:53:51 +0000 (10:53 -0700)]
shutter button color fix (pre-L)
bug:
17011894
Change-Id: Ic7626f89c811c08f1d16bb5e42fa9169b1e65759
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
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.
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.
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
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
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.
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.
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
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
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
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
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
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
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.
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.
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
Puneet Lall [Fri, 29 Aug 2014 03:37:29 +0000 (03:37 +0000)]
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.
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.
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
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
Puneet Lall [Fri, 29 Aug 2014 02:10:14 +0000 (02:10 +0000)]
am
68c25ac5: ZSL refactoring
* commit '
68c25ac5373126670cb6c2324e40537bb47e72d9':
ZSL refactoring
Puneet Lall [Fri, 29 Aug 2014 01:36:33 +0000 (18:36 -0700)]
ZSL refactoring
Bug:
16961251
Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da
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.
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.
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
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
Puneet Lall [Fri, 29 Aug 2014 00:55:18 +0000 (17:55 -0700)]
Add missing copyright header in Open Source code.
Change-Id: I07703e0f55544204645396423ced09f957214d73
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
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
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
Puneet Lall [Thu, 28 Aug 2014 23:44:08 +0000 (16:44 -0700)]
[ZSL Cam] Fixed shutter button, compress on threadpool.
Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28
Alan Newberger [Thu, 28 Aug 2014 23:41:45 +0000 (23:41 +0000)]
Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
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
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
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
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
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
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
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
Alan Newberger [Thu, 28 Aug 2014 17:58:39 +0000 (17:58 +0000)]
Merge "Actually remove settings" into ub-camera-glacier
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
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).
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).
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
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.
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.
Sascha Haeberling [Thu, 28 Aug 2014 00:56:08 +0000 (17:56 -0700)]
Add simple sound player to be used in Camera implementations.
Bug:
17205355
Change-Id: I04c4bf1a692c7a4555eafea794737e41a8fc342c
Alan Newberger [Wed, 27 Aug 2014 22:46:58 +0000 (22:46 +0000)]
am
21bd2937: am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
21bd2937e08f72b73ed187e7667e2d3f4bd6880c':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 22:46:57 +0000 (22:46 +0000)]
am
0cfde67e: am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
0cfde67e18be1ed497987b53953b013b17a23b4c':
gcam: Restore naming of Gcam debug folders.
Alan Newberger [Wed, 27 Aug 2014 22:40:16 +0000 (22:40 +0000)]
am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
352de757246fa28c6fdfa5d0d3e51659e23f8183':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 22:40:15 +0000 (22:40 +0000)]
am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
4f0d63848684cb7cbcde42b0bd714bb6d6f998f5':
gcam: Restore naming of Gcam debug folders.
Alan Newberger [Wed, 27 Aug 2014 22:34:20 +0000 (22:34 +0000)]
Merge "Remove FeedbackHelper" into ub-camera-glacier
Sam Hasinoff [Wed, 27 Aug 2014 05:12:00 +0000 (22:12 -0700)]
gcam: Restore naming of Gcam debug folders.
When Gcam debugging is on, write output to per-burst folders
named SSSS_YYYYMMDD_HHMMSS_XXX, where 'SSSS' is the last 4
digits of the device serial number and 'XXX' are the
milliseconds of the timestamp.
Bug:
17204023
Change-Id: Ie1d58dc3ecb5d9dc7389d24acc4937498f00dbc9
Puneet Lall [Wed, 27 Aug 2014 22:31:14 +0000 (22:31 +0000)]
am
30a17805: am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
30a17805fbc3226eb02fd074658e2df723d34a22':
Add setprop to enable ZSL.
Alan Newberger [Wed, 27 Aug 2014 22:28:57 +0000 (15:28 -0700)]
Remove FeedbackHelper
ag/393130 has comments pointing out that startFeedback has a leak. We don't
use it anymore after Help library integration, so just remove it.
Bug:
17302992
Change-Id: I519a2b0eb7a0ce06d6fcdcbfa2c851837e9a6579
Puneet Lall [Wed, 27 Aug 2014 22:21:45 +0000 (22:21 +0000)]
am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
2b3cf8689d68444dcf8f56a85d8525533d9d96aa':
Add setprop to enable ZSL.
Puneet Lall [Wed, 27 Aug 2014 22:08:30 +0000 (22:08 +0000)]
Merge "Add setprop to enable ZSL." into ub-camera-glacier
Puneet Lall [Wed, 27 Aug 2014 20:38:29 +0000 (13:38 -0700)]
Add setprop to enable ZSL.
Bug:
16961251
Change-Id: I997a47345f7c277abb43f2533fa5226e0c6a3e06
Sascha Haeberling [Wed, 27 Aug 2014 21:48:52 +0000 (21:48 +0000)]
am
ba12c58f: am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
ba12c58f5cbe9a4698441e11c23bee5ae9d48e92':
Make sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 21:39:51 +0000 (21:39 +0000)]
am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
969d606acb2b2f6e755f9164348712306dc7b557':
Make sure CaptureModule (and therefore Gcam) always resumes right.
Sascha Haeberling [Wed, 27 Aug 2014 21:29:14 +0000 (21:29 +0000)]
Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 20:29:48 +0000 (20:29 +0000)]
am
e77ca66d: am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
e77ca66d96c692d1d0b4560226a1a25a7c1fcce5':
fix for a doublebounce of the filmstip button on filmstip swipe out
Spike Sprague [Wed, 27 Aug 2014 20:23:24 +0000 (20:23 +0000)]
am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
480e58b1020f853f6c71d2c3469b342d27084752':
fix for a doublebounce of the filmstip button on filmstip swipe out
Spike Sprague [Wed, 27 Aug 2014 20:13:41 +0000 (20:13 +0000)]
Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
Spike Sprague [Wed, 27 Aug 2014 18:25:45 +0000 (11:25 -0700)]
fix for a doublebounce of the filmstip button on filmstip swipe out
bug:
17301367
Change-Id: I305618ee5012de229c9cc1fd73f0b6506d701477
Puneet Lall [Wed, 27 Aug 2014 19:25:26 +0000 (19:25 +0000)]
am
ae182077: am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
ae182077951354bb2da0e2338a0ee777e2d004e1':
Initial ZSL implementation
Puneet Lall [Wed, 27 Aug 2014 19:18:42 +0000 (19:18 +0000)]
am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
c5b752589e2721c72f8b8f879838f94d816bf1f8':
Initial ZSL implementation
Puneet Lall [Wed, 27 Aug 2014 19:09:59 +0000 (19:09 +0000)]
Merge "Initial ZSL implementation" into ub-camera-glacier
Sascha Haeberling [Wed, 27 Aug 2014 19:07:58 +0000 (12:07 -0700)]
Make sure CaptureModule (and therefore Gcam) always resumes right.
Bug:
17258531
Change-Id: I8a72fcd8f34eb95676ca939c2aff87fcac105e75
Puneet Lall [Thu, 14 Aug 2014 01:53:53 +0000 (18:53 -0700)]
Initial ZSL implementation
Bug:
16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97
Spike Sprague [Wed, 27 Aug 2014 17:52:10 +0000 (17:52 +0000)]
am
18422419: am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
184224196f846533c764ce490301bb3cca519a4a':
boatload of new assets