OSDN Git Service
Senpo Hu [Fri, 15 May 2015 17:36:57 +0000 (17:36 +0000)]
am
41777820: am
10fcde55: Merge "Starting share/edit/play activities in its own task." into ub-camera-glacier
* commit '
4177782099827421e4c6486748f29ebfa4805d73':
Alan Newberger [Fri, 15 May 2015 17:36:55 +0000 (17:36 +0000)]
am
12ee27a1: am
ef481910: Merge "Ensure ZoomView appears on top of other views in L" into ub-camera-glacier
* commit '
12ee27a1a2986c31c64c7afb5bde68eca1b3f8d9':
Andy Huibers [Fri, 15 May 2015 17:36:53 +0000 (17:36 +0000)]
am
cd5fcb9b: am
b868274c: Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.
* commit '
cd5fcb9bfee2cf5879135fcbae462bc4c6dfea0e':
Puneet Lall [Fri, 15 May 2015 17:36:50 +0000 (17:36 +0000)]
Puneet Lall [Fri, 15 May 2015 17:36:46 +0000 (17:36 +0000)]
am
9cd04236: am
d308d001: Add missing copyright header in Open Source code.
* commit '
9cd04236ffdc2ef3d03f3bd6a8ac9adf636bbbe0':
Puneet Lall [Fri, 15 May 2015 17:36:42 +0000 (17:36 +0000)]
am
e65cb334: am
82d70ea0: Merge "[ZSL Cam] Fixed shutter button, compress on threadpool." into ub-camera-glacier
* commit '
e65cb334be7f8e4e90a401978879855e25f7d2ce':
Spike Sprague [Fri, 15 May 2015 17:36:38 +0000 (17:36 +0000)]
am
d7ccf67f: am
b8c3e31c: Merge "fix for a regression introduced in ag/534531" into ub-camera-glacier
* commit '
d7ccf67f9f349ce0d40e461713f13629ef2dcb92':
Alan Newberger [Fri, 15 May 2015 17:36:35 +0000 (17:36 +0000)]
am
d7fdc639: am
475a1935: Merge "Increasing JPEG compression quality for filmstrip" into ub-camera-glacier
* commit '
d7fdc639b5ec8530fd7de58e66dcf059c24d1753':
Puneet Lall [Fri, 15 May 2015 17:36:29 +0000 (17:36 +0000)]
am
a7f9c7a4: am
3724805a: Merge "Zsl flash, auto focus, and other minor fixes" into ub-camera-glacier
* commit '
a7f9c7a40a45e661a26235c0a8ca6cc74c7a1b0a':
Alan Newberger [Fri, 15 May 2015 17:36:23 +0000 (17:36 +0000)]
am
acf313fc: am
965db3e8: Merge "Actually remove settings" into ub-camera-glacier
* commit '
acf313fc2586c3ff7c19ba9cd8bb514ccb8873e1':
Andy Huibers [Fri, 15 May 2015 17:36:14 +0000 (17:36 +0000)]
am
6366cd8f: am
076efc03: Do not show AF UI prior to snapping a picture (for state STATE_FOCUSING_SNAP_ON_FINISH).
* commit '
6366cd8f947154688e1814122e5d27fe34ed29aa':
Sascha Haeberling [Fri, 15 May 2015 17:36:05 +0000 (17:36 +0000)]
am
09abe98d: am
2d4be257: Add simple sound player to be used in Camera implementations.
* commit '
09abe98d56a46d016903f0671e94ca6cc966ed54':
Alan Newberger [Fri, 15 May 2015 17:35:52 +0000 (17:35 +0000)]
am
23a5ac09: am
352de757: Merge "Remove FeedbackHelper" into ub-camera-glacier
* commit '
23a5ac091ad6754f4c4d091a359f1c8a3b4fc48b':
Sam Hasinoff [Fri, 15 May 2015 17:35:39 +0000 (17:35 +0000)]
am
233f8dee: am
4f0d6384: gcam: Restore naming of Gcam debug folders.
* commit '
233f8deeb002069adb9e4182335323141d920940':
Puneet Lall [Fri, 15 May 2015 17:35:27 +0000 (17:35 +0000)]
am
83fff453: am
2b3cf868: Merge "Add setprop to enable ZSL." into ub-camera-glacier
* commit '
83fff453d7b37f7eaa778e71dd7728c8f588587d':
Sascha Haeberling [Fri, 15 May 2015 17:35:14 +0000 (17:35 +0000)]
am
8daec257: am
969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier
* commit '
8daec257bfe3575d008189df0a945a1ba2238cfa':
Spike Sprague [Fri, 15 May 2015 17:35:04 +0000 (17:35 +0000)]
am
e9e8eedb: am
480e58b1: Merge "fix for a doublebounce of the filmstip button on filmstip swipe out" into ub-camera-glacier
* commit '
e9e8eedb57e9b2f96bbf92f040d7d398cbfe49d9':
Puneet Lall [Fri, 15 May 2015 17:34:56 +0000 (17:34 +0000)]
am
8ace9601: am
c5b75258: Merge "Initial ZSL implementation" into ub-camera-glacier
* commit '
8ace9601bb23ff67b33b74e039fd70fbfde4e4cc':
Spike Sprague [Fri, 15 May 2015 17:34:48 +0000 (17:34 +0000)]
am
16231abb: am
a98b4b10: Merge "boatload of new assets" into ub-camera-glacier
* commit '
16231abbf182ffb21234c3097bfcf0959ae92c23':
Baligh Uddin [Fri, 15 May 2015 17:34:38 +0000 (17:34 +0000)]
am
c08f4834: (-s ours) am
0043d830: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
c08f4834667dd3c659a5af318bde446dbc8f234d':
Baligh Uddin [Fri, 15 May 2015 17:34:19 +0000 (17:34 +0000)]
am
bad70841: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
* commit '
bad708419f275e87aea1ab4f9d90f31c2f3bed3f':
Import translations. DO NOT MERGE
Sascha Haeberling [Fri, 15 May 2015 17:34:01 +0000 (17:34 +0000)]
am
e3935d71: am
95817308: Enable location and heading to be stored in picture EXIF.
* commit '
e3935d713db003eb1dbb9535b03565055954bdda':
Sascha Haeberling [Fri, 15 May 2015 17:33:39 +0000 (17:33 +0000)]
am
3e879ec0: am
779414e8: Show a message to indicate that Gcam is not yet ready for quality feedback on Shamu.
* commit '
3e879ec00bb6ea6bf7158d51cc96bd11ef1062f8':
Alan Newberger [Fri, 15 May 2015 17:33:11 +0000 (17:33 +0000)]
am
06ebb079: am
26b224dd: Protect video recording callback from activity/module pauses
* commit '
06ebb079393fab517589249c8de507e0629167a9':
Sascha Haeberling [Fri, 15 May 2015 17:32:46 +0000 (17:32 +0000)]
am
4423de9a: am
d225ea60: Add volume key capture suppor to CaptureModule
* commit '
4423de9a8b229facb723831b71ef78109033a476':
Andy Huibers [Fri, 15 May 2015 17:32:25 +0000 (17:32 +0000)]
Spike Sprague [Fri, 15 May 2015 17:31:56 +0000 (17:31 +0000)]
am
24d11545: am
597c4d10: Merge "more consistently apply filmstip hide animations" into ub-camera-glacier
* commit '
24d11545f95712862abd75fbc71a72d8b50d160b':
Andy Huibers [Fri, 15 May 2015 17:31:34 +0000 (17:31 +0000)]
am
17ae13e4: am
bd9b80b2: Reset metering and focus areas when touch focus period ends.
* commit '
17ae13e4222092c64c693fe5ffebe26bb04bb22a':
Alan Newberger [Fri, 15 May 2015 17:31:05 +0000 (17:31 +0000)]
am
f88adf07: am
d4d1dbe0: Merge "Remove one shot callback workaround in VideoModule for L" into ub-camera-glacier
* commit '
f88adf07fd7e601e28519ac657499d8be251e46e':
Andy Huibers [Fri, 15 May 2015 17:30:45 +0000 (17:30 +0000)]
am
3cb3cb6b: am
462d9c51: Merge "In 3A debug mode, show pass/fail for active scans and show exact AF, AE regions." into ub-camera-glacier
* commit '
3cb3cb6bc2200d4f37b16cdf227e65e6e835afd8':
Spike Sprague [Fri, 15 May 2015 17:30:35 +0000 (17:30 +0000)]
am
0b6a937c: am
91098713: Merge "Material Ripple effect on filmstip buttons" into ub-camera-glacier
* commit '
0b6a937c0b88ff0240ff8593edbe98147a7877d8':
Ruben Brunk [Fri, 15 May 2015 17:30:25 +0000 (17:30 +0000)]
am
6311e8e2: am
92ed7b6c: Merge "photosphere: Fix TextureView transforms." into ub-camera-glacier
* commit '
6311e8e29872086608aa1f77595a6117395e8624':
Sascha Haeberling [Fri, 15 May 2015 17:30:14 +0000 (17:30 +0000)]
am
2634d27c: am
afb4c581: Merge "Enable mode options when capture is done." into ub-camera-glacier
* commit '
2634d27cd8e29bc6c9da00b88d3206f4b417e367':
Igor Murashkin [Fri, 15 May 2015 17:30:04 +0000 (17:30 +0000)]
am
cee5f85c: am
666c80b0: Merge "util: Optimal preview size picks smaller-than-display size in case of tie" into ub-camera-glacier
* commit '
cee5f85cc5f4b11e2d3dfdb5f3693ae420543f6f':
Andy Huibers [Fri, 15 May 2015 17:29:55 +0000 (17:29 +0000)]
am
a4823851: am
c0fe0b69: Show animated AF ring UI when lens is moving in continuous autofocus.
* commit '
a48238515bd3b18335674098ac48c3e8633f53dd':
Andy Huibers [Fri, 15 May 2015 17:29:46 +0000 (17:29 +0000)]
am
7b6c337a: am
4d04e99b: Merge "Enable Face rectangles for debugging." into ub-camera-glacier
* commit '
7b6c337aa86e469ec344f9655d314ed60f34dac9':
Sascha Haeberling [Fri, 15 May 2015 17:29:38 +0000 (17:29 +0000)]
am
4c2d8069: am
46b3c730: Merge "Fix crash on Shamu since it\'s no longer camera 2 FULL." into ub-camera-glacier
* commit '
4c2d8069149b3ecc504f3973b2155ce08f813931':
Spike Sprague [Fri, 15 May 2015 17:29:29 +0000 (17:29 +0000)]
am
6c64b406: am
4cc78bb3: set actionbar background to complete transparent
* commit '
6c64b406d4ce9597eb6b0ce2d9357d189d0753af':
Sascha Haeberling [Fri, 15 May 2015 17:29:19 +0000 (17:29 +0000)]
am
9fc70c0d: am
392f249b: Merge "Enable switching within CaptureModule to HDR+ and back." into ub-camera-glacier
* commit '
9fc70c0dffa07335db1f5513814dfe53d0dd467c':
Sol Boucher [Fri, 15 May 2015 17:29:08 +0000 (17:29 +0000)]
am
ad862d7b: am
799acabb: Merge "Switch from stepwise index-based zoom to a ratio-based scale" into ub-camera-glacier
* commit '
ad862d7bab6f0b9456e65984d009dab2a387f460':
Baligh Uddin [Fri, 15 May 2015 17:28:58 +0000 (17:28 +0000)]
am
2e87004b: (-s ours) am
6a836bff: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
2e87004beca0c32fc5e56936962a11f56e5b88bd':
Spike Sprague [Fri, 15 May 2015 17:28:46 +0000 (17:28 +0000)]
Baligh Uddin [Fri, 15 May 2015 17:28:34 +0000 (17:28 +0000)]
am
9272c78f: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
* commit '
9272c78f08f4dc4cf5c0bfff30b973f90a1164ee':
Import translations. DO NOT MERGE
Spike Sprague [Fri, 15 May 2015 17:28:22 +0000 (17:28 +0000)]
am
f10aa3a6: am
fe1af189: Merge "filmstrip actionbar tweaks" into ub-camera-glacier
* commit '
f10aa3a6734e85f7cfbf9551cb3733a8c5524b66':
Sascha Haeberling [Fri, 15 May 2015 17:28:20 +0000 (17:28 +0000)]
am
b56e2001: am
f859793d: Merge "Pick the preview size based on the selected picture size." into ub-camera-glacier
* commit '
b56e20016dc15150e04cebcbda622b940a618de3':
Spike Sprague [Fri, 15 May 2015 17:28:18 +0000 (17:28 +0000)]
am
9a77507d: am
ba97d192: animate filmstrip bottom button bar in and out from the bottom of the screen
* commit '
9a77507d67addb96f47aa6b0b65e3a5912dbfce2':
Sascha Haeberling [Fri, 15 May 2015 17:28:16 +0000 (17:28 +0000)]
am
104fa69c: am
0382139c: Merge "Enable progress reporting for modules like HDR+." into ub-camera-glacier
* commit '
104fa69c20f389d83fad0306421d88a01be79952':
Senpo Hu [Fri, 15 May 2015 17:28:14 +0000 (17:28 +0000)]
am
d19eb82a: am
5b88f9a7: Merge "Change Shamu\'s default video resolution setting." into ub-camera-glacier
* commit '
d19eb82ad7d02e2dbced21674d64b42e6ee02eed':
Sol Boucher [Fri, 15 May 2015 17:28:12 +0000 (17:28 +0000)]
am
4d601a6f: am
dab267ce: Merge "TextureViewHelper workaround for SurfaceTexture/CameraProxy race" into ub-camera-glacier
* commit '
4d601a6f546f72166bd89bba352e0c2370b0a8c2':
Andy Huibers [Fri, 15 May 2015 17:28:09 +0000 (17:28 +0000)]
am
0b832c3f: am
2440815c: Merge "Add zoom to CaptureModule and OneCamera." into ub-camera-glacier
* commit '
0b832c3f870d0df792c64eebe46b14ff082e60d4':
Sascha Haeberling [Fri, 15 May 2015 17:28:07 +0000 (17:28 +0000)]
Alan Newberger [Fri, 15 May 2015 17:28:04 +0000 (17:28 +0000)]
am
f9dba5d3: am
08c219b7: Merge "Update AOSP Camera product icon" into ub-camera-glacier
* commit '
f9dba5d3e7da1e5651c726d158bfe5ef3c7a306b':
Sascha Haeberling [Fri, 15 May 2015 17:28:02 +0000 (17:28 +0000)]
am
9da2ad5e: am
6d7ed701: Merge "roduce debug output for android.util.Pair" into ub-camera-glacier
* commit '
9da2ad5e355ceef748d83ac98dbaf1ad1b9f968f':
Andy Huibers [Fri, 15 May 2015 17:28:00 +0000 (17:28 +0000)]
am
be53d810: am
03e17a62: Start moving AF and 3A to separate class; improve logging.
* commit '
be53d810b2b02f066ca0ace89a2dc3d56feca339':
Alan Newberger [Fri, 15 May 2015 17:27:58 +0000 (17:27 +0000)]
am
5eef9121: am
34264dab: Merge "Remove extra parent mode from array, and make PhotoModule scope string public" into ub-camera-glacier
* commit '
5eef91210b46e16fe71d72d49bb580ce7d335525':
Spike Sprague [Fri, 15 May 2015 17:27:55 +0000 (17:27 +0000)]
am
b04889b8: am
5f8927b9: Merge "tweak filmstrip show/hide background for Material Design" into ub-camera-glacier
* commit '
b04889b8d20d138f0e8b63c21eaa1f3faa0f67ac':
Spike Sprague [Fri, 15 May 2015 17:27:52 +0000 (17:27 +0000)]
am
a764124d: am
66d3d0d0: add functionality to enable/disable clicks on a MultiToggleImageButton without affecting its visual state.
* commit '
a764124d1f239c23c687db52612cb7bbf64f77dd':
Alan Newberger [Fri, 15 May 2015 17:27:50 +0000 (17:27 +0000)]
am
d7c5f149: am
251402b0: Merge "Protect Camera2 functions from null CameraDeviceInfo" into ub-camera-glacier
* commit '
d7c5f149afb234973fcfd362b641a74f7bf5da11':
Spike Sprague [Fri, 15 May 2015 17:27:48 +0000 (17:27 +0000)]
am
c6d70ab0: am
a675af27: Merge "change settings to use dark theme." into ub-camera-glacier
* commit '
c6d70ab0c434b52d41fc1f88619b81360de1828d':
Sascha Haeberling [Fri, 15 May 2015 17:27:46 +0000 (17:27 +0000)]
am
f551a8af: am
a2dd9ea5: Fix orientation and move it to the util class so we can use it elsewhere.
* commit '
f551a8afe83e77961f3d6a59d0ab3281f6038564':
Sascha Haeberling [Fri, 15 May 2015 17:27:42 +0000 (17:27 +0000)]
am
28ae6407: am
096e5b73: (-s ours) DO NOT MERGE - Reverting accidentally merged 524943 into glacier.
* commit '
28ae6407fb1ab40c48643f6f793860a43e8d8c9c':
Sol Boucher [Fri, 15 May 2015 17:27:35 +0000 (17:27 +0000)]
am
7fc9ec53: am
8563d90f: Merge "Move preview transform matrix code into portability library" into ub-camera-glacier
* commit '
7fc9ec53451c8bcbaa49cd85d4984e3e988d2f0d':
Sol Boucher [Fri, 15 May 2015 17:27:27 +0000 (17:27 +0000)]
am
9b8baf73: am
f67f64f3: Merge "Enable seamless switching to/from camera2-backed Photo module" into ub-camera-glacier
* commit '
9b8baf73b9d2f450691c1718b329a4763be5513a':
Andy Huibers [Fri, 15 May 2015 17:27:24 +0000 (17:27 +0000)]
am
492cc95c: am
a69d497f: Merge "Reset 3A regions during CONTINUOUS_PICTURE passive scanning per camera2 API." into ub-camera-glacier
* commit '
492cc95c7c89b9c4a89d7b89dc82dc8558860f4a':
Sascha Haeberling [Fri, 15 May 2015 17:27:22 +0000 (17:27 +0000)]
am
0ca1fecd: am
fa7b92c1: Merge "Add ability to add a ready-state changed listener to the camera." into ub-camera-glacier
* commit '
0ca1fecd6c942ad5590b5be2950d9dbd8d717266':
Andy Huibers [Fri, 15 May 2015 17:27:20 +0000 (17:27 +0000)]
am
274f3127: am
064f851a: Hold touch to focus target in 3A UI debug mode.
* commit '
274f312773fad819a84ffd2682d75781b1808b99':
Andy Huibers [Fri, 15 May 2015 17:27:17 +0000 (17:27 +0000)]
am
7176b849: am
011c5cde: Merge "Consolidate properties for debugging." into ub-camera-glacier
* commit '
7176b849a030d48b2efcc15f69c674824ddaba51':
Alan Newberger [Fri, 15 May 2015 17:27:14 +0000 (17:27 +0000)]
am
5280921f: am
c8c6efa0: Merge "Move preference subscreens to new Activities from Dialogs" into ub-camera-glacier
* commit '
5280921fc58652e8d7ae03db9c3008f5d847a5f4':
Baligh Uddin [Fri, 15 May 2015 17:27:09 +0000 (17:27 +0000)]
am
c59d1b2f: (-s ours) am
31afb359: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
c59d1b2fa40a4b5cb2aadee1b05928f9cb352e8c':
Baligh Uddin [Fri, 15 May 2015 17:27:01 +0000 (17:27 +0000)]
am
60acccaa: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-haleakala
* commit '
60acccaac08fcc3264652da73518822fc3828199':
Import translations. DO NOT MERGE
Sascha Haeberling [Fri, 15 May 2015 17:26:52 +0000 (17:26 +0000)]
am
9fde58ff: am
51163540: Move code from GoogleCamera that dumps capture request metadata.
* commit '
9fde58ff5f44effe34eac931b73c392b6b839e22':
Spike Sprague [Fri, 15 May 2015 17:26:41 +0000 (17:26 +0000)]
am
d3b24e24: am
39384da0: add a range check in MultiToggleImageButton\'s bitmap combine function.
* commit '
d3b24e24818ae23677e1db2761f61b8c43cb25dd':
Alan Newberger [Fri, 15 May 2015 17:26:24 +0000 (17:26 +0000)]
am
869af1c8: am
7951206e: Merge "Revert our layout from FULLSCREEN to LAYOUT_FULLSCREEN" into ub-camera-glacier
* commit '
869af1c823f5e68eebc9fa508eaf2569a08482ae':
Spike Sprague [Fri, 15 May 2015 17:26:06 +0000 (17:26 +0000)]
am
f3e55a69: am
bbcf8774: Merge "Update option icon transitions" into ub-camera-glacier
* commit '
f3e55a696822aa4a4dbd3d46e0edcf49dedf8ef4':
Spike Sprague [Fri, 15 May 2015 17:25:52 +0000 (17:25 +0000)]
am
b8e22726: am
955ae1f8: another tweak of the mode switch expanding circle, no more pre-white circle expansion.
* commit '
b8e22726a83045b2a7aea054022a1654da744459':
Spike Sprague [Fri, 15 May 2015 17:25:40 +0000 (17:25 +0000)]
am
fbc92ffe: am
eb944322: Merge "update mode switch transition anims" into ub-camera-glacier
* commit '
fbc92ffe3818f931ecd7b8670134e96c2d6f8bb4':
Sascha Haeberling [Fri, 15 May 2015 17:25:29 +0000 (17:25 +0000)]
am
c2b036b1: am
62c367f2: Merge "Fix potential multi-threading bug where size can change before deletion." into ub-camera-glacier
* commit '
c2b036b114e1e115f900dc3627df7eb8bbebe918':
Sascha Haeberling [Fri, 15 May 2015 17:25:20 +0000 (17:25 +0000)]
am
22abc18c: am
4c96752b: Merge "Don\'t try to share null data" into ub-camera-glacier
* commit '
22abc18c1bb81d616d51a9b8a792d52965ee8e10':
Alan Newberger [Fri, 15 May 2015 17:25:08 +0000 (17:25 +0000)]
am
b66473e7: am
a804e2d2: Merge "New Material icons for Camera2" into ub-camera-glacier
* commit '
b66473e7406b30e93648df78a83567fa7689132c':
Sascha Haeberling [Fri, 15 May 2015 17:24:55 +0000 (17:24 +0000)]
am
d5d8bfdc: am
59c784bf: [OC] Gcam OneCamera implementation.
* commit '
d5d8bfdc9707299a2b35aa2130a48b1e89e2938d':
Senpo Hu [Fri, 15 May 2015 17:24:30 +0000 (17:24 +0000)]
Alan Newberger [Fri, 15 May 2015 17:23:57 +0000 (17:23 +0000)]
am
c7d31ec1: am
2307b60a: Refactor Upgrade/UpgradeAosp into SettingsUpgrader
* commit '
c7d31ec12994ce0452ffd4bc2be00eebf9a5f25f':
Puneet Lall [Fri, 15 May 2015 17:23:27 +0000 (17:23 +0000)]
am
66ec90f5: am
967b7828: Implemented NDK libjpeg wrapper for YUV420 encoding.
* commit '
66ec90f583598b0c17aeba32dc78cc1d55cbeee7':
Andy Huibers [Fri, 15 May 2015 17:22:51 +0000 (17:22 +0000)]
am
078b7579: am
30ffce08: [OC] Add autofocus (tap-to-focus, UI and pre-shot focus) to OneCamera.
* commit '
078b75798b39891f2b2544773f3e201231b4ce7b':
Alan Newberger [Fri, 15 May 2015 17:22:21 +0000 (17:22 +0000)]
am
087a655d: am
e9a226f6: Merge "Route zoom value through to zoomIndex in device API" into ub-camera-glacier
* commit '
087a655ddbc7a8c6fcb35262362863adfd211d7f':
Sol Boucher [Fri, 15 May 2015 17:21:59 +0000 (17:21 +0000)]
am
ea78cafb: am
7f112487: Merge "Move display orientation calculations out of app code" into ub-camera-glacier
* commit '
ea78cafbfc07c454f197a6e6924d7076b6f244fb':
Spike Sprague [Fri, 15 May 2015 17:21:39 +0000 (17:21 +0000)]
Alan Newberger [Fri, 15 May 2015 17:21:27 +0000 (17:21 +0000)]
am
938f9a4c: am
60c02b43: Merge "fix NPE in action switch" into ub-camera-glacier
* commit '
938f9a4c4af008baa0b8040a37362328794e06e1':
Spike Sprague [Fri, 15 May 2015 17:21:16 +0000 (17:21 +0000)]
am
58da8da6: am
c7ab9c4a: update system ui flags for full screen on android L
* commit '
58da8da6e9ecb10313208005d0e170ce5b073abf':
Sascha Haeberling [Fri, 15 May 2015 17:21:05 +0000 (17:21 +0000)]
am
5e3b1388: am
0024b57e: Merge "[OC] Enable flash support." into ub-camera-glacier
* commit '
5e3b138823bf74458271cf8998954d7d2182dbd8':
Sascha Haeberling [Fri, 15 May 2015 17:20:55 +0000 (17:20 +0000)]
am
699358e9: am
e3dfd5a4: [OC] Migrate away from android.util.Size sinc we cannot use it in K.
* commit '
699358e952e34d7efa85fe27688f59057b746b4b':
Geoff Mendal [Fri, 15 May 2015 17:20:43 +0000 (17:20 +0000)]
am
45a851a6: (-s ours) am
1b9926df: (-s ours) Import translations. DO NOT MERGE
* commit '
45a851a6e7defa70f4ff70097298da89e93f51f8':
Sascha Haeberling [Fri, 15 May 2015 17:20:30 +0000 (17:20 +0000)]
am
1adf80f3: am
822b8e29: Merge "[OC] Introduce OneCameraCreator so we can dynamically create a different version." into ub-camera-glacier
* commit '
1adf80f389d412fd61be9b9a52a051157cf22584':
Sascha Haeberling [Fri, 15 May 2015 17:20:20 +0000 (17:20 +0000)]
am
de756478: am
ad87534c: Merge "Prevent monkey crash when deleting without data" into ub-camera-glacier
* commit '
de756478a540eb1864efd962252b23f4eda63e03':
Alan Newberger [Fri, 15 May 2015 17:20:10 +0000 (17:20 +0000)]
am
c5338515: am
517f32a7: Restore grid initialization logic to fix grid display on startup
* commit '
c5338515007e353786d7d7b0cb93e92734dc2b40':
Sascha Haeberling [Fri, 15 May 2015 17:19:58 +0000 (17:19 +0000)]
am
b3ae8fe6: am
57bcd92f: [OC] Refactoring the session API before intgrating GCam into OneCamera
* commit '
b3ae8fe650dc65c6bb0b19a07fbb2e7de006b88e':
Andy Huibers [Fri, 15 May 2015 17:19:46 +0000 (17:19 +0000)]
am
c63db69f: am
9a9a1086: Improved logging of foreground source type.
* commit '
c63db69fe4e017f0e697d53a7c679cb2f5049c8d':
Sascha Haeberling [Fri, 15 May 2015 17:19:35 +0000 (17:19 +0000)]
am
dd3fda43: am
00d8bbc9: Merge "[OC] Hook new Capture module up, behind a system property." into ub-camera-glacier
* commit '
dd3fda4375e32b9c72154334430d89fc8a46e53d':
Sascha Haeberling [Fri, 15 May 2015 17:19:26 +0000 (17:19 +0000)]
am
60706d3f: am
08b3c94a: [OC] Adds the new CaptureModule and UI.
* commit '
60706d3f5fa5c224495a014ee6d5bab3daf7f8d4':
Sascha Haeberling [Fri, 15 May 2015 17:19:11 +0000 (17:19 +0000)]