OSDN Git Service
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)]
Sascha Haeberling [Fri, 15 May 2015 17:18:59 +0000 (17:18 +0000)]
am
acb486be: am
f5e51ec4: [OC] Camera2-based OneCamera implementation.
* commit '
acb486be758fee80654c3a58628cd1c3c30584aa':
Sascha Haeberling [Fri, 15 May 2015 17:18:56 +0000 (17:18 +0000)]
am
c19b72f7: am
2f001066: Merge "Put conversion from string to size into SettingsManager." into ub-camera-glacier
* commit '
c19b72f7435475c1ce50f31e6f069e45cdf026eb':
Sascha Haeberling [Fri, 15 May 2015 17:18:54 +0000 (17:18 +0000)]
am
b9948e61: am
d674447d: Add empty version of SystemProperties interface.
* commit '
b9948e61dd0673ec8ef22754752b85588b912427':
Sascha Haeberling [Fri, 15 May 2015 17:18:52 +0000 (17:18 +0000)]
am
70aafc98: am
ee36c5f5: Minor clean-up around the code base.
* commit '
70aafc98520a33d7a44409b23ea4bc6faac19200':
Sascha Haeberling [Fri, 15 May 2015 17:18:49 +0000 (17:18 +0000)]
am
ba501625: am
b0d171e8: [OC] Adding the OneCamera manager API.
* commit '
ba501625594f9a5aabc61e87e1f78f8380046b29':
Sascha Haeberling [Fri, 15 May 2015 17:18:47 +0000 (17:18 +0000)]
am
154f4a98: am
8c34b30b: [OC] Add common abstract OneCamera class.
* commit '
154f4a983808c33347758f5cbeba7bfbba77b970':
Sascha Haeberling [Fri, 15 May 2015 17:18:45 +0000 (17:18 +0000)]
am
ad3e35da: am
00c122a5: [OC] Version 1 of the nterface for OneCamera.
* commit '
ad3e35da398956d7c9f8185e7036fa5cab895744':
Sascha Haeberling [Fri, 15 May 2015 17:18:43 +0000 (17:18 +0000)]
am
01f38732: am
c7223fa9: Merge "[OC] Adds a class with common utility functions for capture modules." into ub-camera-glacier
* commit '
01f387320559b5e6de35949412eac9a48c66fb07':
Spike Sprague [Fri, 15 May 2015 17:18:41 +0000 (17:18 +0000)]
am
d6a65feb: am
6a8aceef: AndroidManifest formatting cleanup
* commit '
d6a65febd582654306c16011c03b163ffb0438e0':
Spike Sprague [Fri, 15 May 2015 17:18:39 +0000 (17:18 +0000)]
am
304341aa: am
2f92712c: re-added color and background entries for gcam
* commit '
304341aa70040ff259d4b378a84c249aff90e6f7':
Spike Sprague [Fri, 15 May 2015 17:18:36 +0000 (17:18 +0000)]
am
2f62d5aa: am
ffa2ff02: added a mutate() call when loading LayerDrawables.
* commit '
2f62d5aafa430f6b29749cd45e5ae86ad79a2be6':
Alan Newberger [Fri, 15 May 2015 17:18:34 +0000 (17:18 +0000)]
am
d83efa01: am
df5989b0: Merge "Ensure default focus mode is continuous-picture" into ub-camera-glacier
* commit '
d83efa01763efad2f11fcee2fac768ca4c02457e':
Spike Sprague [Fri, 15 May 2015 17:18:32 +0000 (17:18 +0000)]
am
e6e4dbd1: am
141263e2: Merge "ripple drawable on shutter button" into ub-camera-glacier
* commit '
e6e4dbd140a28b2638de61e5727e6f020eec22fa':
Baligh Uddin [Fri, 15 May 2015 17:18:30 +0000 (17:18 +0000)]
am
49f43bda: (-s ours) am
036400b3: (-s ours) am
21b8cb69: (-s ours) Import translations. DO NOT MERGE
* commit '
49f43bdadb06bc666253f949c667644a742edc26':
Baligh Uddin [Fri, 15 May 2015 17:18:28 +0000 (17:18 +0000)]
am
f4a12f94: (-s ours) am
01afd999: (-s ours) Import translations. DO NOT MERGE
* commit '
f4a12f94ba26dc45657651463f173359318019a8':
Alan Newberger [Fri, 15 May 2015 17:18:26 +0000 (17:18 +0000)]
am
28a6b1a9: am
7bc335f4: Upgrade mode index settings after mode indices were cleaned
* commit '
28a6b1a9ac8668a3d7f4bf2d46074d99cdea32a4':
Alan Newberger [Fri, 15 May 2015 17:18:23 +0000 (17:18 +0000)]
am
c2246664: am
62c20bfb: Modify Camera settings scope enforcement from crash to warning
* commit '
c2246664488a82b252a4841af590cb6847a87fe8':
Spike Sprague [Fri, 15 May 2015 17:18:20 +0000 (17:18 +0000)]
am
4e6b6bfc: am
dde95571: Merge "filmstip quantumification" into ub-camera-glacier
* commit '
4e6b6bfc757d9d45f701694ab09825e768cf55c9':
Baligh Uddin [Fri, 15 May 2015 17:18:17 +0000 (17:18 +0000)]
am
ef0a598e: (-s ours) am
3736714d: (-s ours) am
373c970d: (-s ours) Import translations. DO NOT MERGE
* commit '
ef0a598e3a1ee58bc9fb185c7ca0241d68cdcd37':
Baligh Uddin [Fri, 15 May 2015 17:18:13 +0000 (17:18 +0000)]
am
13da89c1: (-s ours) am
f953e32e: (-s ours) Import translations. DO NOT MERGE
* commit '
13da89c1958dcda4bba209cc3fe647a54e3f9661':
Baligh Uddin [Fri, 15 May 2015 17:18:07 +0000 (17:18 +0000)]
am
d001fe89: (-s ours) Import translations. DO NOT MERGE
* commit '
d001fe89f21d675f24acd54c1c525cd520519a3b':
Import translations. DO NOT MERGE
Spike Sprague [Fri, 15 May 2015 17:18:01 +0000 (17:18 +0000)]
am
5cef93f1: am
dd19c33c: Merge "fixing mode -> color mapping" into ub-camera-glacier
* commit '
5cef93f14acf2c774c94ecaf27f01d3e7db29352':
Sascha Haeberling [Fri, 15 May 2015 17:17:54 +0000 (17:17 +0000)]
am
8fe7329a: am
f15d63e8: Make sure to set an audio source using MediaRecorder.
* commit '
8fe7329a586c319951d3ad3403b32a1d57d3e32e':
Spike Sprague [Fri, 15 May 2015 17:17:48 +0000 (17:17 +0000)]
am
95a374bb: am
17038432: Merge "clean out timelapse stuff from codebase" into ub-camera-glacier
* commit '
95a374bb3994efa616638a213037aac0744222ef':
Alan Newberger [Fri, 15 May 2015 17:17:44 +0000 (17:17 +0000)]
am
a68baf9d: am
39529585: Route switch preferences through SettingManager
* commit '
a68baf9d2f88b38b48cdcb2b6a49a3c7c067c76f':
Sascha Haeberling [Fri, 15 May 2015 17:17:36 +0000 (17:17 +0000)]
am
f6c64f1d: am
71ae986c: resolved conflicts for merge of
dcea7639 to ub-camera-glacier
* commit '
f6c64f1de59e6cf62403b9649c743996f1662a86':
Spike Sprague [Fri, 15 May 2015 17:17:23 +0000 (17:17 +0000)]
Sascha Haeberling [Fri, 15 May 2015 17:17:11 +0000 (17:17 +0000)]
am
be2a587c: am
78683612: Store temp session data in \'cache\' directory, not data.
* commit '
be2a587ce10d57191c81c55c20bae15fc7a6757a':
Sascha Haeberling [Fri, 15 May 2015 17:16:58 +0000 (17:16 +0000)]
am
6d1cf304: am
ca82f50d: Don\'t try to show storage hint if activity is no longer running.
* commit '
6d1cf304e750bde3d104d8502f5631817cdc2953':
Sascha Haeberling [Fri, 15 May 2015 17:16:40 +0000 (17:16 +0000)]
am
53fa8a31: am
a899a5a5: am
3c6de14b: Work in #onPictureTaken will be on a forked, so no need to fork the call.
* commit '
53fa8a31a254c350b3d527034d9e3bb381265d21':
Sascha Haeberling [Fri, 15 May 2015 17:16:28 +0000 (17:16 +0000)]
am
db5564e5: am
27450ecc: Don\'t crash if filename could not be found for ID.
* commit '
db5564e51f92e121dcbe1a78d75deaa3c733b32c':
Sascha Haeberling [Fri, 15 May 2015 17:16:17 +0000 (17:16 +0000)]
Sol Boucher [Fri, 15 May 2015 17:16:02 +0000 (17:16 +0000)]
am
ee189bcb: am
3755aefa: Merge "Eliminate unnecessary context in FragmentActivity constructor" into ub-camera-glacier
* commit '
ee189bcb6ea8cb55c77c398b289ae3c59574e15e':
Sol Boucher [Fri, 15 May 2015 17:15:50 +0000 (17:15 +0000)]
am
526b012a: am
c8f40886: Merge "Make app build against updated frameworks/ex portability library" into ub-camera-glacier
* commit '
526b012aaf4336cecc669f50e368b91b1d91a5c6':
Sam Judd [Fri, 15 May 2015 17:15:38 +0000 (17:15 +0000)]