OSDN Git Service
Alan Newberger [Wed, 27 Aug 2014 23:05:32 +0000 (23:05 +0000)]
am
0a75eff3: am
06d0ab5d: am
21bd2937: am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
0a75eff37b7c9aeb03d8b66b50e41db2daebe491':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 23:05:32 +0000 (23:05 +0000)]
am
e6bd6277: am
5cac58bd: am
0cfde67e: am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
e6bd62773151625260ae22ddc7cb11f2343c7567':
gcam: Restore naming of Gcam debug folders.
Puneet Lall [Wed, 27 Aug 2014 22:56:53 +0000 (22:56 +0000)]
am
2e083c1b: am
0e724685: am
30a17805: am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
2e083c1b482ec5995ce783007cffbb32eb0cfe05':
Add setprop to enable ZSL.
Alan Newberger [Wed, 27 Aug 2014 22:54:45 +0000 (22:54 +0000)]
am
06d0ab5d: am
21bd2937: am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
06d0ab5d3af79eeb14081228fdbd37f924c5bb0a':
Remove FeedbackHelper
Sam Hasinoff [Wed, 27 Aug 2014 22:54:45 +0000 (22:54 +0000)]
am
5cac58bd: am
0cfde67e: am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
5cac58bd94fb0ce59cf8a539d7c95ef8304fdc41':
gcam: Restore naming of Gcam debug folders.
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.
Puneet Lall [Wed, 27 Aug 2014 22:42:09 +0000 (22:42 +0000)]
am
0e724685: am
30a17805: am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
0e724685729d36d834fdd588651d7f29bb29192f':
Add setprop to enable ZSL.
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
Sascha Haeberling [Wed, 27 Aug 2014 22:06:17 +0000 (22:06 +0000)]
am
6bc470b3: am
98f99f70: am
ba12c58f: am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
6bc470b3f114973b0ded4c8fe245f5373f2afbce':
Make sure CaptureModule (and therefore Gcam) always resumes right.
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:58:19 +0000 (21:58 +0000)]
am
98f99f70: am
ba12c58f: am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
98f99f707027e8d226a7bdc6cea9ad8009da2b7e':
Make sure CaptureModule (and therefore Gcam) always resumes right.
Spike Sprague [Wed, 27 Aug 2014 21:50:29 +0000 (21:50 +0000)]
am
5eb589bc: am
8bd18378: am
e77ca66d: am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
5eb589bc4a53fb9a8c650ff619d4dddbfaaa69be':
fix for a doublebounce of the filmstip button on filmstip swipe out
Puneet Lall [Wed, 27 Aug 2014 21:50:29 +0000 (21:50 +0000)]
am
6ebe1a3a: am
ad505043: am
ae182077: am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
6ebe1a3a1ab2ed9c959dd4e17e9a0e31bb3961ac':
Initial ZSL implementation
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.
Spike Sprague [Wed, 27 Aug 2014 21:36:33 +0000 (21:36 +0000)]
am
8bd18378: am
e77ca66d: am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
8bd183781acd048020cab0c5f81a073f68228673':
fix for a doublebounce of the filmstip button on filmstip swipe out
Puneet Lall [Wed, 27 Aug 2014 21:35:50 +0000 (21:35 +0000)]
am
ad505043: am
ae182077: am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
ad5050431d9692a41992e881fb80e0fe903479fc':
Initial ZSL implementation
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 18:12:19 +0000 (18:12 +0000)]
am
c6678674: am
0838d693: am
18422419: am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
c667867443a7d8591320d2d4e5f9fc8c07b962b8':
boatload of new assets
Spike Sprague [Wed, 27 Aug 2014 17:59:50 +0000 (17:59 +0000)]
am
0838d693: am
18422419: am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
0838d69344926eac4684a2722e367f4724d5eea3':
boatload of new assets
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
Spike Sprague [Wed, 27 Aug 2014 17:44:37 +0000 (17:44 +0000)]
am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
a98b4b10a1ce7a6ce6499f364ae33cebbb94d023':
boatload of new assets
Spike Sprague [Wed, 27 Aug 2014 17:35:31 +0000 (17:35 +0000)]
Merge "boatload of new assets" into ub-camera-glacier
Baligh Uddin [Wed, 27 Aug 2014 17:14:14 +0000 (17:14 +0000)]
am
45d74583: (-s ours) am
fe8c2f29: (-s ours) am
b95bfd1b: (-s ours) am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
45d745836eee965688236ba78f67a5bd6b7e6014':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:52:55 +0000 (16:52 +0000)]
am
fe8c2f29: (-s ours) am
b95bfd1b: (-s ours) am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
fe8c2f29aa855f0738e346ca6f7bda6088d9af44':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:42:00 +0000 (16:42 +0000)]
am
b95bfd1b: (-s ours) am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
b95bfd1b641db6de55aa10e2e5173261f151c567':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:32:57 +0000 (16:32 +0000)]
am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
0043d830c7ae38ae938302c8ef1c862ba87eca90':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Aug 2014 16:22:42 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 27 Aug 2014 16:22:38 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Sascha Haeberling [Wed, 27 Aug 2014 09:47:46 +0000 (09:47 +0000)]
am
3cdfe078: am
173a5f63: am
e25590a9: am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
3cdfe0780cc6e10ff40be808963fb28bbd007ff4':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 09:47:25 +0000 (09:47 +0000)]
am
c0434e8a: am
b8b145c5: am
a35ba87b: am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
c0434e8ad7d00adfd5a2ca1625ccbcddf1102fa9':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Sascha Haeberling [Wed, 27 Aug 2014 06:24:45 +0000 (06:24 +0000)]
am
173a5f63: am
e25590a9: am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
173a5f63962bc4ed0ce5929c6dea2dd7d50b19c6':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 06:14:51 +0000 (06:14 +0000)]
am
e25590a9: am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
e25590a998c05297fb151bdf089a292b5d0b59f0':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 06:04:40 +0000 (06:04 +0000)]
am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
95817308fddad554c73cbe4539cb868dd4722ff9':
Enable location and heading to be stored in picture EXIF.
Sascha Haeberling [Wed, 27 Aug 2014 01:03:22 +0000 (18:03 -0700)]
Enable location and heading to be stored in picture EXIF.
Bug:
17202845
Change-Id: Ic789c9a2d6078b35a09308d1b631166529f3f1bd
Sascha Haeberling [Wed, 27 Aug 2014 05:01:42 +0000 (05:01 +0000)]
am
b8b145c5: am
a35ba87b: am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
b8b145c5c50478db9953e2d9e1e3ab13d2549a4c':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Alan Newberger [Wed, 27 Aug 2014 04:55:15 +0000 (04:55 +0000)]
am
599784d1: am
e8885dd0: am
a6e9539a: am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
599784d118b0ddecd85ba405ac3987f3ef0a6a04':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 04:55:15 +0000 (04:55 +0000)]
am
d6717451: am
dfe537bd: am
b8383940: am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
d67174510531b03cf11405d46ebdacbcd3cc2291':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 04:55:14 +0000 (04:55 +0000)]
am
b9c781f2: am
76cfbe7b: am
29d5bcd8: am
9d3ec039: Add timeout to touch to focus.
* commit '
b9c781f2a3b74ae2b7fff3502903882cc0904fdc':
Add timeout to touch to focus.
Sascha Haeberling [Wed, 27 Aug 2014 04:49:08 +0000 (04:49 +0000)]
am
a35ba87b: am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
a35ba87b58db732b528930cd23d72cee33bcc03a':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Alan Newberger [Wed, 27 Aug 2014 04:46:02 +0000 (04:46 +0000)]
am
e8885dd0: am
a6e9539a: am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
e8885dd0c3f87e2c62e592809abbd6302068e0a0':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 04:46:01 +0000 (04:46 +0000)]
am
dfe537bd: am
b8383940: am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
dfe537bdd717b30bf6caef58dc92834aa57b0c08':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 04:46:01 +0000 (04:46 +0000)]
am
76cfbe7b: am
29d5bcd8: am
9d3ec039: Add timeout to touch to focus.
* commit '
76cfbe7bbe402872308b77e6a0ad69136ba3bd2e':
Add timeout to touch to focus.
Baligh Uddin [Wed, 27 Aug 2014 04:39:30 +0000 (21:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I785196ae077b6f1720086a546c115f6eec7e1043
Auto-generated-cl: translation import
Sascha Haeberling [Wed, 27 Aug 2014 04:38:59 +0000 (04:38 +0000)]
am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
779414e8bfe23d66de310570ff2314654e45ec9f':
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Baligh Uddin [Wed, 27 Aug 2014 04:38:03 +0000 (21:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I577c1f6a3977db4d57e6b5be9ab9c1706b78e52d
Auto-generated-cl: translation import
Sascha Haeberling [Wed, 27 Aug 2014 04:04:52 +0000 (21:04 -0700)]
Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
Bug:
17204023
Change-Id: I03ac9df0e4df8f09f5a4527616add6fb12ff0fd8
Alan Newberger [Wed, 27 Aug 2014 03:45:42 +0000 (03:45 +0000)]
am
a6e9539a: am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
a6e9539a30454f19b70e7fdf639bd22bc95cec4d':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 03:45:22 +0000 (03:45 +0000)]
am
b8383940: am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
b8383940a87ddcadaa051fda93d02f92753cdcdb':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 03:44:49 +0000 (03:44 +0000)]
am
29d5bcd8: am
9d3ec039: Add timeout to touch to focus.
* commit '
29d5bcd89b8d5b61ce0698caa7c211ad11707d3a':
Add timeout to touch to focus.
Spike Sprague [Wed, 27 Aug 2014 02:59:32 +0000 (02:59 +0000)]
am
17422c3c: am
a2e46e6c: am
1732f551: am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
17422c3c61aa8d92fdbc0177c7b33fce9f5ccdd1':
more consistently apply filmstip hide animations
Alan Newberger [Wed, 27 Aug 2014 02:28:28 +0000 (02:28 +0000)]
am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
26b224dd3b4391dbbb8ee6ed35c40c431bdbec85':
Protect video recording callback from activity/module pauses
Sascha Haeberling [Wed, 27 Aug 2014 01:35:41 +0000 (01:35 +0000)]
am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
d225ea6074a58021013c8c063abb51eb80b1feb7':
Add volume key capture suppor to CaptureModule
Andy Huibers [Wed, 27 Aug 2014 01:25:23 +0000 (01:25 +0000)]
am
9d3ec039: Add timeout to touch to focus.
* commit '
9d3ec0396b71d7b9068f83b2e820eee988df8215':
Add timeout to touch to focus.
Alan Newberger [Wed, 27 Aug 2014 01:18:48 +0000 (18:18 -0700)]
Protect video recording callback from activity/module pauses
This CL should eliminate MediaRecorder start exceptions, which
appear to be due to ending the camera or switching the module.
Storage I/O could take a while during which pauses can occur,
so we check for them and avoid starting video in that case.
Bug:
16298718
Change-Id: I9abca815400e9ce545fed96f6e31cb792860a1d0
Sascha Haeberling [Wed, 27 Aug 2014 01:20:35 +0000 (18:20 -0700)]
Add volume key capture suppor to CaptureModule
Bug:
17289383
Change-Id: If548c4ebe5f702aca6fc9a983ac4775812ad551f
Spike Sprague [Wed, 27 Aug 2014 00:47:27 +0000 (00:47 +0000)]
am
a2e46e6c: am
1732f551: am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
a2e46e6cb3eabb4469208bcd986a23637cb0013d':
more consistently apply filmstip hide animations
Spike Sprague [Wed, 27 Aug 2014 00:40:17 +0000 (00:40 +0000)]
am
1732f551: am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
1732f551cc31e3f1f9fc47e98e0e3f41be531444':
more consistently apply filmstip hide animations
Andy Huibers [Wed, 27 Aug 2014 00:32:39 +0000 (17:32 -0700)]
Add timeout to touch to focus.
Bug:
17289205
Change-Id: Ide39b4b9c86691de36149fdd15d1db41f9fed342
Spike Sprague [Wed, 27 Aug 2014 00:31:28 +0000 (00:31 +0000)]
am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
597c4d10b9bf0174a81e617cb89bab1a196cbc3a':
more consistently apply filmstip hide animations
Spike Sprague [Wed, 27 Aug 2014 00:17:45 +0000 (00:17 +0000)]
Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
Andy Huibers [Wed, 27 Aug 2014 00:23:32 +0000 (00:23 +0000)]
am
39a974d4: am
7958bb4d: am
67ba1d5b: am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
39a974d4aa91c2c8430ed2ff5cff16addca36774':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Wed, 27 Aug 2014 00:17:03 +0000 (00:17 +0000)]
am
7958bb4d: am
67ba1d5b: am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
7958bb4d46f4e77e2ba1e585056a4140e3d970e7':
Reset metering and focus areas when touch focus period ends.
Spike Sprague [Wed, 27 Aug 2014 00:09:45 +0000 (17:09 -0700)]
more consistently apply filmstip hide animations
bug:
17278732
bug:
17279637
Change-Id: I2346dcd77c0afd84eb1167ad5d5df3770551c14f
Andy Huibers [Wed, 27 Aug 2014 00:12:11 +0000 (00:12 +0000)]
am
67ba1d5b: am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
67ba1d5b6a5a7091f43c9e5a7883f56c297e9dc2':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Wed, 27 Aug 2014 00:03:49 +0000 (00:03 +0000)]
am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
bd9b80b267195f78a8514847d0f02629e761a334':
Reset metering and focus areas when touch focus period ends.
Andy Huibers [Tue, 26 Aug 2014 23:21:15 +0000 (16:21 -0700)]
Reset metering and focus areas when touch focus period ends.
Bug:
17286539
Change-Id: I36e554cac3969d6d0422efd2cb169d7afb08911c
Alan Newberger [Tue, 26 Aug 2014 23:47:18 +0000 (23:47 +0000)]
am
c89ca925: am
984039c4: am
dcc2eb04: am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
c89ca9251bff33f4437ddaad0aba861a8170b997':
Remove one shot callback workaround in VideoModule for L
Alan Newberger [Tue, 26 Aug 2014 23:36:37 +0000 (23:36 +0000)]
am
984039c4: am
dcc2eb04: am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
984039c4a6222363560e15f0f2ddb2fe491b9ed0':
Remove one shot callback workaround in VideoModule for L
Andy Huibers [Tue, 26 Aug 2014 23:30:10 +0000 (23:30 +0000)]
am
eecf0aaf: am
88aef841: am
7a9fecd8: am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
eecf0aaf674b057505cf586fc18e3ccb2be1743d':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Alan Newberger [Tue, 26 Aug 2014 23:25:57 +0000 (23:25 +0000)]
am
dcc2eb04: am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
dcc2eb045c97a9ecee9b4621af41e1e7b1ceba03':
Remove one shot callback workaround in VideoModule for L
Andy Huibers [Tue, 26 Aug 2014 23:20:26 +0000 (23:20 +0000)]
am
88aef841: am
7a9fecd8: am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
88aef841ac403e39b63f1d93f3e68f1172a4325c':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Alan Newberger [Tue, 26 Aug 2014 23:19:37 +0000 (23:19 +0000)]
am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
d4d1dbe00b84285bd0d235d984b9d71ea63a9305':
Remove one shot callback workaround in VideoModule for L
Alan Newberger [Tue, 26 Aug 2014 23:11:24 +0000 (23:11 +0000)]
Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
Andy Huibers [Tue, 26 Aug 2014 23:10:18 +0000 (23:10 +0000)]
am
7a9fecd8: am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
7a9fecd8168ff9a067e4965e42795542472d2323':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 23:02:01 +0000 (23:02 +0000)]
am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
462d9c510bbd072c63fb5be1ec12df15b4775f5f':
In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions.
Andy Huibers [Tue, 26 Aug 2014 22:57:10 +0000 (22:57 +0000)]
Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 22:40:06 +0000 (22:40 +0000)]
am
95412355: am
3e6e9f33: am
1424be09: am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
954123550caee955a02af3bee8809c724bd1d894':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:33:53 +0000 (22:33 +0000)]
am
3e6e9f33: am
1424be09: am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
3e6e9f33dc4ac969fe4000b42443106ba46bb89f':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:26:16 +0000 (22:26 +0000)]
am
1424be09: am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
1424be09e51af9cbf8a8110a0fb3afd009e93fbe':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:16:41 +0000 (22:16 +0000)]
am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
9109871358e32726f23d9b4db9d6fbf55a03cddc':
Material Ripple effect on filmstip buttons
Spike Sprague [Tue, 26 Aug 2014 22:06:24 +0000 (22:06 +0000)]
Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
Spike Sprague [Tue, 26 Aug 2014 21:59:43 +0000 (14:59 -0700)]
Material Ripple effect on filmstip buttons
bug:
17281225
Change-Id: Ic2876527a6d1fedaeb9ecdddbc8627e1c4e396b1
OSDN Git Service
