OSDN Git Service
Baligh Uddin [Thu, 4 Sep 2014 19:22:11 +0000 (19:22 +0000)]
am
6c0832c7: (-s ours) am
7f10a8c0: (-s ours) am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6c0832c79cf061c41da82a72b910ef5b4ae6fa3f':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 19:10:53 +0000 (19:10 +0000)]
am
7f10a8c0: (-s ours) am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
7f10a8c0a0cfbf6d99c10f951192f6915dd56699':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 4 Sep 2014 18:59:17 +0000 (18:59 +0000)]
am
9351f22c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
9351f22c49705fc1df51bb5f3c9afc9e08f95b94':
Import translations. DO NOT MERGE
Puneet Lall [Thu, 4 Sep 2014 18:53:50 +0000 (18:53 +0000)]
am
8d2eeb52: am
ab541776: am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
8d2eeb525c89b58172dc973cc7dc7ebe0ac7cb1c':
Added log for first preview frame
Baligh Uddin [Thu, 4 Sep 2014 18:51:05 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 18:51:01 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE"
Puneet Lall [Thu, 4 Sep 2014 18:40:29 +0000 (18:40 +0000)]
am
ab541776: am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
ab541776f9db60aa1475589e753e452a0242432e':
Added log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:30:00 +0000 (18:30 +0000)]
am
6fa0451d: am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
6fa0451dc863184c4b052d6e8e85bfe37a33f5fe':
Added log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:22:59 +0000 (18:22 +0000)]
am
f1e3dc86: Merge "Added log for first preview frame" into ub-camera-glacier
* commit '
f1e3dc865aa7dfcb3fee584b8e37fd24c23e78c0':
Added log for first preview frame
Puneet Lall [Thu, 4 Sep 2014 18:11:44 +0000 (18:11 +0000)]
Merge "Added log for first preview frame" into ub-camera-glacier
Puneet Lall [Thu, 4 Sep 2014 18:05:14 +0000 (11:05 -0700)]
Added log for first preview frame
Bug:
17386943
Change-Id: I17907402c9d1cd4678634e2ceb8cbf921f010d9f
Baligh Uddin [Thu, 4 Sep 2014 07:04:59 +0000 (00:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic6a46172bb51bfa2e6faa75d8f9ddeb1e46a5c35
Auto-generated-cl: translation import
Baligh Uddin [Thu, 4 Sep 2014 07:03:16 +0000 (00:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I95951618c47241ab89d780f6ebe39e30ae08d332
Auto-generated-cl: translation import
Puneet Lall [Thu, 4 Sep 2014 03:39:56 +0000 (03:39 +0000)]
am
4442501d: am
b80e7562: am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
4442501d5e2cb59b2da52c4fabad166eedb8d93e':
Re-enable shutter-button when switching between front and back cameras.
Alan Newberger [Thu, 4 Sep 2014 03:39:55 +0000 (03:39 +0000)]
am
7c1cddea: am
f3e53dc1: am
a4258d82: am
2ef0f9dc: Fix unnecessary string cast
* commit '
7c1cddea0f14258d582bded9fa48014d2a251857':
Fix unnecessary string cast
Puneet Lall [Thu, 4 Sep 2014 03:22:17 +0000 (03:22 +0000)]
am
b80e7562: am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
b80e75620c339ec360c5e3769adefe7c239ea940':
Re-enable shutter-button when switching between front and back cameras.
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
Puneet Lall [Thu, 4 Sep 2014 01:32:04 +0000 (01:32 +0000)]
am
f8ae4fb6: am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
f8ae4fb65167cf669b7788ac035b31575005964b':
Re-enable shutter-button when switching between front and back cameras.
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
Puneet Lall [Thu, 4 Sep 2014 01:21:27 +0000 (01:21 +0000)]
am
ae6e94f5: Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
* commit '
ae6e94f570a8436715384993f2e06b2193915b78':
Re-enable shutter-button when switching between front and back cameras.
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
Puneet Lall [Thu, 4 Sep 2014 01:11:50 +0000 (01:11 +0000)]
Merge "Re-enable shutter-button when switching between front and back cameras." into ub-camera-glacier
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
Alan Newberger [Thu, 4 Sep 2014 00:55:22 +0000 (00:55 +0000)]
am
adda4d26: am
54bc8e44: am
64e4bc9f: am
2b084ec5: Merge "Fixing settings upgrades" into ub-camera-glacier
* commit '
adda4d263a3c84643a15d7b564221b6ecc3ee27b':
Fixing settings upgrades
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
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
Puneet Lall [Thu, 4 Sep 2014 00:16:21 +0000 (00:16 +0000)]
am
50bafb27: am
b87b255a: am
fb730076: am
4d6d676c: Refactor default picture size selection in zsl cam.
* commit '
50bafb27f091e44a5e3d5b778af559eb14540604':
Refactor default picture size selection in zsl cam.
Alan Newberger [Thu, 4 Sep 2014 00:06:17 +0000 (00:06 +0000)]
Merge "Fixing settings upgrades" into ub-camera-glacier
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.
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:58:51 +0000 (14:58 -0700)]
Re-enable shutter-button when switching between front and back cameras.
Bug:
16961251
Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5
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 19:25:31 +0000 (19:25 +0000)]
am
fdfdc797: 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 '
fdfdc7973df4edadae3ae7dae77b7d938cbd2a4a':
[ZSL Cam] Use largest supported size if no picture size is already set.
Andy Huibers [Wed, 3 Sep 2014 19:25:23 +0000 (19:25 +0000)]
am
f78de871: am
f5bd183a: am
648c05aa: am
4d7f3be8: CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
* commit '
f78de87148eb89c47dd02c1e742d43082c4e0f81':
CaptureModule countdown timer fixes: ability to cancel, and remove premature SoundPlayer release.
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.
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.
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 17:40:40 +0000 (17:40 +0000)]
am
b3bd30ea: am
6836d716: am
a00adf62: am
d568e524: Merge "Add countdown timer to CaptureModule." into ub-camera-glacier
* commit '
b3bd30eaaed80d720df43ffea635bfb1687ad69d':
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.
Sascha Haeberling [Wed, 3 Sep 2014 09:12:57 +0000 (09:12 +0000)]
am
6d275521: am
ca6ca413: am
13a221a2: am
7718b87b: Merge "A few Size clean-ups to support live metering changes." into ub-camera-glacier
* commit '
6d2755213a333d3a1dd75313b62ef200f53e1771':
A few Size clean-ups to support live metering changes.
Spike Sprague [Wed, 3 Sep 2014 09:12:56 +0000 (09:12 +0000)]
am
c87f4f8a: am
8693a3f3: am
39b7e060: am
b9f4b931: Merge "actionbar opactiy tweaks" into ub-camera-glacier
* commit '
c87f4f8adc97ff2f9e398340be5cd56d4df74853':
actionbar opactiy tweaks
Spike Sprague [Wed, 3 Sep 2014 09:12:56 +0000 (09:12 +0000)]
am
0966903c: am
b27bc8ec: am
12a615c8: am
9bfd6bdd: shutter button color fix (pre-L)
* commit '
0966903c583f5d02ff5e03aba2389056265bfc36':
shutter button color fix (pre-L)
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.
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
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)
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 05:03:52 +0000 (05:03 +0000)]
am
4ee52d8e: am
be020925: am
4cd2a6ab: am
5ca2e0b9: Merge "Remove android.hardware.camera2 import from Settings3A." into ub-camera-glacier
* commit '
4ee52d8e54343030ef79a80682101f4968dc75c5':
Remove android.hardware.camera2 import from Settings3A.
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: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.
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:39:27 +0000 (19:39 +0000)]
am
6c689300: am
8435131b: am
76061e1f: am
10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
* commit '
6c689300088e7d644c7526ebef1d9c8bd261ebef':
Starting share/edit/play activities in its own task.
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.
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 [Tue, 2 Sep 2014 17:33:34 +0000 (17:33 +0000)]
am
13970b5d: am
e48f098a: am
2c25a7cb: am
ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
* commit '
13970b5dba6fb074088b899052cd709940631dbc':
Ensure ZoomView appears on top of other views in L
Andy Huibers [Tue, 2 Sep 2014 17:33:18 +0000 (17:33 +0000)]
am
d5d01fc7: am
b2b1ea96: am
a394ea69: am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
d5d01fc75ba551a6679afc6961f14ef016fc0672':
Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
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
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
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.
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 19:13:25 +0000 (19:13 +0000)]
Puneet Lall [Fri, 29 Aug 2014 19:13:25 +0000 (19:13 +0000)]
am
0a799a46: am
8b672ff2: am
42b0b25e: am
d308d001: Add missing copyright header in Open Source code.
* commit '
0a799a46ed5666ab4ecb8a008f3307107fb43d56':
Add missing copyright header in Open Source code.
Puneet Lall [Fri, 29 Aug 2014 19:13:24 +0000 (19:13 +0000)]
am
69d20ef1: am
e8126a13: am
53c98a3e: am
82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '
69d20ef14a72bb29ce883ee11afcdc7d22010a02':
[ZSL Cam] Fixed shutter button, compress on threadpool.
Spike Sprague [Fri, 29 Aug 2014 19:13:23 +0000 (19:13 +0000)]
am
61b52f32: am
a86ca43f: am
70e387a7: am
b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit '
61b52f32f6621dd3faa21cb250b1a302b6b873f1':
fix for a regression introduced in ag/534531
Alan Newberger [Fri, 29 Aug 2014 19:13:22 +0000 (19:13 +0000)]
am
73810ab7: am
d6164f47: am
4deea574: am
475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '
73810ab7edb172bce0bc91a94b54f3afd53fa8aa':
Increasing JPEG compression quality for filmstrip
Puneet Lall [Fri, 29 Aug 2014 18:48:13 +0000 (18:48 +0000)]
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.
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.
OSDN Git Service
