OSDN Git Service
Alan Newberger [Wed, 12 Nov 2014 22:52:31 +0000 (22:52 +0000)]
am
5c9d7f34: Fix error in settings key from refactor
* commit '
5c9d7f34039ac96b3a136ccd6b16162e3b220848':
Fix error in settings key from refactor
Alan Newberger [Wed, 12 Nov 2014 22:52:29 +0000 (22:52 +0000)]
am
5db8e20d: Only allow one draw call pending at a time
* commit '
5db8e20db77bf86eba25ec713c76da783dd98b19':
Only allow one draw call pending at a time
Senpo Hu [Wed, 12 Nov 2014 22:52:28 +0000 (22:52 +0000)]
am
31d816f6: Merge "Stability: call stopPreview() before switching off video module." into ub-camera-glacier
* commit '
31d816f64eebfd24e662ff21f611a70b957d4859':
Stability: call stopPreview() before switching off video module.
Spike Sprague [Wed, 12 Nov 2014 22:52:26 +0000 (22:52 +0000)]
am
c19d97b3: Let VideoModule override default mode options enable/disable
* commit '
c19d97b385261312399b67b538f8faa074314beb':
Let VideoModule override default mode options enable/disable
Puneet Lall [Wed, 12 Nov 2014 22:52:24 +0000 (22:52 +0000)]
am
7c703ced: Cleanup: Move api check to ApiHelper
* commit '
7c703ced0248d6a368a216e9d7699ab8e9565415':
Cleanup: Move api check to ApiHelper
Spike Sprague [Wed, 12 Nov 2014 22:52:22 +0000 (22:52 +0000)]
am
2d512cc6: Merge "for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right." into ub-camera-glacier
* commit '
2d512cc688a6e46bb8b34e293e87d2f0088a1abb':
for intent capture and pano, fix the redo/ok/cancel button sizes so touch ripples show up right.
Spike Sprague [Wed, 12 Nov 2014 22:52:19 +0000 (22:52 +0000)]
am
5ea5dc09: Merge "tweaking peephole animation time from 350 to 500, per in-person request" into ub-camera-glacier
* commit '
5ea5dc090151f857ba3787e8c29d1269e3dd6da4':
tweaking peephole animation time from 350 to 500, per in-person request
Alan Newberger [Wed, 12 Nov 2014 22:52:17 +0000 (22:52 +0000)]
am
535eed78: Merge "Avoid building filmstrip item data if activity is destroyed" into ub-camera-glacier
* commit '
535eed78310ff5774f544c8c8bb584585304e7ec':
Avoid building filmstrip item data if activity is destroyed
Spike Sprague [Wed, 12 Nov 2014 22:52:14 +0000 (22:52 +0000)]
am
56afe395: Merge "new share icon" into ub-camera-glacier
* commit '
56afe3958ddc1b0880c7f4cbb8604caca0a32469':
new share icon
Alan Newberger [Wed, 12 Nov 2014 22:52:12 +0000 (22:52 +0000)]
am
a530b688: Merge "WIP: Add recursive thumbnail call to LocalMediaData" into ub-camera-glacier
* commit '
a530b688ce6e5b61e7cea8dc500fd2642ccdb82c':
WIP: Add recursive thumbnail call to LocalMediaData
Shaohan Zou [Thu, 6 Nov 2014 02:17:05 +0000 (02:17 +0000)]
am
6a6fddf8: am
3f57f7a9: am
6e1f4125: Fix camera latency test b/
18239042
* commit '
6a6fddf8e3c32d956d4c176b1216365fdb2f0d81':
Fix camera latency test b/
18239042
Shaohan Zou [Thu, 6 Nov 2014 01:59:38 +0000 (01:59 +0000)]
am
3f57f7a9: am
6e1f4125: Fix camera latency test b/
18239042
* commit '
3f57f7a95e6f82bcb30df5bfc2870aa022fa4a17':
Fix camera latency test b/
18239042
Shaohan Zou [Thu, 6 Nov 2014 01:39:43 +0000 (01:39 +0000)]
am
6e1f4125: Fix camera latency test b/
18239042
* commit '
6e1f41253728e6870de800f88b5aa2cfde60ee8b':
Fix camera latency test b/
18239042
Shaohan Zou [Wed, 5 Nov 2014 23:28:10 +0000 (15:28 -0800)]
Fix camera latency test
b/
18239042
Change-Id: Ia59b4c10551038bf2cbe9b9770f21c63f49731f3
Baligh Uddin [Fri, 31 Oct 2014 17:21:16 +0000 (17:21 +0000)]
am
bef77cbb: (-s ours) am
6871a7ea: (-s ours) Import translations. DO NOT MERGE
* commit '
bef77cbbf6ae879613a98db21385fa2d43c9ce20':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 31 Oct 2014 17:13:16 +0000 (17:13 +0000)]
am
6871a7ea: (-s ours) Import translations. DO NOT MERGE
* commit '
6871a7eaf8695f70bb39d7bd78c66b1dcffa6459':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 30 Oct 2014 18:57:34 +0000 (11:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0e5bc66edc17019f34219cfc25061b9332b1e56e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 27 Oct 2014 05:42:44 +0000 (05:42 +0000)]
am
7c2cbc43: (-s ours) am
2e1d2ed6: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
7c2cbc434014cdafd0cfd3c45e6f0949bccdc6c4':
Neil Fuller [Mon, 27 Oct 2014 05:42:43 +0000 (05:42 +0000)]
am
18f6c519: am
49bcaafb: resolved conflicts for merge of
c0dd3adf to lmp-dev-plus-aosp
* commit '
18f6c5193afd753455bec5f4edef43c1e1a99838':
Dianne Hackborn [Mon, 27 Oct 2014 05:42:42 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:42 +0000 (05:42 +0000)]
am
e3d446cd: am
4828ce4c: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
e3d446cd1aa3434de4b29ea24e24bc75a9e246ab':
Alan Newberger [Mon, 27 Oct 2014 05:42:41 +0000 (05:42 +0000)]
am
570f65dc: am
d4760214: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
570f65dc60163d8cac713ca78bce3e8dacd4354f':
Alan Newberger [Mon, 27 Oct 2014 05:42:40 +0000 (05:42 +0000)]
am
6843a0ad: am
eaed8186: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
6843a0ad7a017c7266152ad9dd0ace17d17fa3d3':
Alan Newberger [Mon, 27 Oct 2014 05:42:40 +0000 (05:42 +0000)]
am
edd29484: am
6ac0378f: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
edd29484d0211f20f7b526be78d5379aedd86113':
Alan Newberger [Mon, 27 Oct 2014 05:42:39 +0000 (05:42 +0000)]
am
f035b2de: am
375d5482: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
f035b2de27a3bde2a83d240d1976bc4fb8c3d518':
Alan Newberger [Mon, 27 Oct 2014 05:42:38 +0000 (05:42 +0000)]
am
f9888d1d: am
198f078b: am
a9ed2418: Only set preview size before starting preview
* commit '
f9888d1de2d0d0b6f2632af268073cad77248e50':
Alan Newberger [Mon, 27 Oct 2014 05:42:38 +0000 (05:42 +0000)]
am
31642b9c: am
c17b9383: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
31642b9ce046b646526374a2dbbd947872e6828c':
Alan Newberger [Mon, 27 Oct 2014 05:42:37 +0000 (05:42 +0000)]
am
a3c0f1a4: am
2fc13a0f: am
dae542a3: Fix error in settings key from refactor
* commit '
a3c0f1a48804c23f80b570c18ea6f3c600d0da22':
Alan Newberger [Mon, 27 Oct 2014 05:42:36 +0000 (05:42 +0000)]
am
528024db: am
ff1bfbf5: am
d822d1cf: Only allow one draw call pending at a time
* commit '
528024db3a84deb04f6d128e756c1077a647239e':
Senpo Hu [Mon, 27 Oct 2014 05:42:36 +0000 (05:42 +0000)]
am
876f7108: am
952779b5: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
876f71085d4a503d259dc4dc5cf5eaa64348d9dd':
Baligh Uddin [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]
am
a4a3b647: (-s ours) am
97750cc8: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
a4a3b647921cf595ca57c422d00fd2cbcaf3e247':
Senpo Hu [Mon, 27 Oct 2014 05:42:35 +0000 (05:42 +0000)]
am
0c9822f3: am
fd696d77: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
0c9822f377fdb8f1e01375b3535d2dfb77d7c160':
Puneet Lall [Mon, 27 Oct 2014 05:42:34 +0000 (05:42 +0000)]
am
67c78543: am
fe297a35: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
67c785431164b2afa5ed2750a244436e1da74a03':
Senpo Hu [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]
am
2b2c9c29: am
8d5639bf: am
93e01102: am
feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
* commit '
2b2c9c2998c86ee284aa597a67d8ccc9df705282':
Andy Huibers [Mon, 27 Oct 2014 05:42:33 +0000 (05:42 +0000)]
am
d5d61e9e: am
556370c3: am
d3a7c5af: am
ad12363e: Revert app workaround for bug
17614203 now that HAL is fixed. This reverts ag/543302.
* commit '
d5d61e9efecb68234b5b216849ec2bed1bbf8a5f':
Alan Newberger [Mon, 27 Oct 2014 05:42:32 +0000 (05:42 +0000)]
am
e8c58ca5: am
6956d11a: am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
e8c58ca5e95c9e20bf0ff7e6f85229a6f5b4f1b4':
Puneet Lall [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]
am
406b3d1f: am
051fddec: am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
406b3d1fa83f5497e49cc8bc3adaf83cb8154414':
Senpo Hu [Mon, 27 Oct 2014 05:42:31 +0000 (05:42 +0000)]
am
cac9f0a2: am
dbfd18d2: am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
cac9f0a2a52aa9d70ff678204eb8b041b8176618':
Alan Newberger [Mon, 27 Oct 2014 05:42:30 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]
am
041d20ec: am
87d802c2: am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
041d20ec22456ac6c525a4f72d3f7707787331eb':
Alan Newberger [Mon, 27 Oct 2014 05:42:29 +0000 (05:42 +0000)]
am
80d6250c: am
45cf7b25: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
80d6250cabde4dfceac343a7e5e1c43e47246232':
Alan Newberger [Mon, 27 Oct 2014 05:42:28 +0000 (05:42 +0000)]
am
b193c857: am
d6567402: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
b193c857c2699319cdacb0e1575c91a416d91fbc':
Spike Sprague [Mon, 27 Oct 2014 05:42:27 +0000 (05:42 +0000)]
am
42a20015: am
10279d29: am
3e8f9db9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
42a20015c3055afc312f94846d9a43144fc1f860':
Spike Sprague [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]
am
19193b9d: am
03a2759c: am
e31c82c2: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
19193b9d4d975d4ad179ab7c8f3411496145a732':
Alan Newberger [Mon, 27 Oct 2014 05:42:26 +0000 (05:42 +0000)]
am
12a535ec: am
78bd5555: am
4c571d7e: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
12a535ec491ec9e20a6825e5e1ef7927fc7aedd1':
Alan Newberger [Mon, 27 Oct 2014 05:42:25 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:24 +0000 (05:42 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:42:23 +0000 (05:42 +0000)]
am
5677ac23: am
2d4b0949: (-s ours) am
d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"
* commit '
5677ac239cfab0b0feb959b0fe783048d472796b':
Baligh Uddin [Mon, 27 Oct 2014 05:36:49 +0000 (05:36 +0000)]
am
2e1d2ed6: (-s ours) am
91bceebd: (-s ours) Import translations. DO NOT MERGE
* commit '
2e1d2ed664bf9a0b91424d19d158f1ea2b58c8fd':
Neil Fuller [Mon, 27 Oct 2014 05:36:45 +0000 (05:36 +0000)]
am
49bcaafb: resolved conflicts for merge of
c0dd3adf to lmp-dev-plus-aosp
* commit '
49bcaafb0ac92b2a2ae6b35deb640714b2a02bd9':
Dianne Hackborn [Mon, 27 Oct 2014 05:36:43 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:42 +0000 (05:36 +0000)]
am
4828ce4c: am
7ba23fed: Fix preference copy migration and incorrect HDR+ sticky bit
* commit '
4828ce4cafbc0f56ca8add88938e7094559d8765':
Alan Newberger [Mon, 27 Oct 2014 05:36:41 +0000 (05:36 +0000)]
am
d4760214: am
0ac0b733: Merge "Fix incorrect key translation in Settings refactor" into lmp-dev
* commit '
d47602140064760f5a540bab7335664930b771e3':
Alan Newberger [Mon, 27 Oct 2014 05:36:39 +0000 (05:36 +0000)]
am
eaed8186: am
d30fdee3: Merge "Trap CameraAgentFactory RTEs during recycle" into lmp-dev
* commit '
eaed81862f73ff88ef215779efcbfbaf6782cf0c':
Alan Newberger [Mon, 27 Oct 2014 05:36:38 +0000 (05:36 +0000)]
am
6ac0378f: am
b0be8f53: Merge "Trap camera close exceptions on pause" into lmp-dev
* commit '
6ac0378ffbc78c42c3fb950c663c44d70e3bfdfc':
Alan Newberger [Mon, 27 Oct 2014 05:36:36 +0000 (05:36 +0000)]
am
375d5482: am
0021c301: Merge "Avoid porting null keys when copying preferences into new system" into lmp-dev
* commit '
375d5482b56df31818aa37a41dfb0951c5fb9005':
Alan Newberger [Mon, 27 Oct 2014 05:36:35 +0000 (05:36 +0000)]
am
198f078b: am
a9ed2418: Only set preview size before starting preview
* commit '
198f078b6a57dad83341cac8a254f24422f0cdcd':
Alan Newberger [Mon, 27 Oct 2014 05:36:34 +0000 (05:36 +0000)]
am
c17b9383: am
e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting Activities from Camera
* commit '
c17b9383ba663529c126207c7fdd96bbf2ec618f':
Alan Newberger [Mon, 27 Oct 2014 05:36:32 +0000 (05:36 +0000)]
am
2fc13a0f: am
dae542a3: Fix error in settings key from refactor
* commit '
2fc13a0fd476c0e427c433444486936db6fa3937':
Alan Newberger [Mon, 27 Oct 2014 05:36:31 +0000 (05:36 +0000)]
am
ff1bfbf5: am
d822d1cf: Only allow one draw call pending at a time
* commit '
ff1bfbf59b2259c6904370a146d1c0e83a99fe09':
Senpo Hu [Mon, 27 Oct 2014 05:36:30 +0000 (05:36 +0000)]
am
952779b5: am
2499af48: Stability: call stopPreview() before switching off video module.
* commit '
952779b558cab573da0c2a2943da51df1abbca85':
Baligh Uddin [Mon, 27 Oct 2014 05:36:28 +0000 (05:36 +0000)]
am
97750cc8: (-s ours) am
2f727aff: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
97750cc8eff73e2d3826739894f40950dcd2691f':
Senpo Hu [Mon, 27 Oct 2014 05:36:27 +0000 (05:36 +0000)]
am
fd696d77: am
ed0fea9b: am
2d3475ae: Fix crash in VideoModule - Method called after release()
* commit '
fd696d77ab1bd1e4b3dd4f3ec74744ef29f22bc3':
Puneet Lall [Mon, 27 Oct 2014 05:36:26 +0000 (05:36 +0000)]
am
fe297a35: am
6014e168: am
022ce61e: Synchronize CaptureModule camera open/close operations
* commit '
fe297a353be6c363870f67cc84597ceecd6cef85':
Senpo Hu [Mon, 27 Oct 2014 05:36:24 +0000 (05:36 +0000)]
am
8d5639bf: am
93e01102: am
feb07ea4: Merge "Stability: add null check for all CameraProxy obj references in VideoModule." into ub-camera-glacier
* commit '
8d5639bf7fb4d1be533ed60aa5a17271901b8fcb':
Andy Huibers [Mon, 27 Oct 2014 05:36:23 +0000 (05:36 +0000)]
am
556370c3: am
d3a7c5af: am
ad12363e: Revert app workaround for bug
17614203 now that HAL is fixed. This reverts ag/543302.
* commit '
556370c333c5e522f0b3118af45440ca91d4702f':
Alan Newberger [Mon, 27 Oct 2014 05:36:21 +0000 (05:36 +0000)]
am
6956d11a: am
f379211c: am
47c4474e: Merge "Force filmstrip images to generate in JPEG compression format" into ub-camera-glacier
* commit '
6956d11a742e3f19d63a7f318a750dd91362d17f':
Puneet Lall [Mon, 27 Oct 2014 05:36:20 +0000 (05:36 +0000)]
am
051fddec: am
fc0e5d89: am
4d2f3bf4: Merge "Recreate a OneCameraManager instance for each Activity." into ub-camera-glacier
* commit '
051fddec10fc62788d6a50d2a9133ce99a26251a':
Senpo Hu [Mon, 27 Oct 2014 05:36:19 +0000 (05:36 +0000)]
am
dbfd18d2: am
437fd924: am
ee3123ba: Stability: add null check for all CameraProxy obj references in PhotoModule.
* commit '
dbfd18d24e748d9b6d20ca20abb6be5812a00916':
Alan Newberger [Mon, 27 Oct 2014 05:36:17 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:16 +0000 (05:36 +0000)]
am
87d802c2: am
92db2cb4: am
6b2d1e0b: Merge "Revert temporary session images in filmstrip to RGB_565" into ub-camera-glacier
* commit '
87d802c2fc7a9052e667ce895b7bae37bdbe7390':
Alan Newberger [Mon, 27 Oct 2014 05:36:15 +0000 (05:36 +0000)]
am
45cf7b25: am
af73f898: am
347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '
45cf7b2546aff7c9bf406b1dc648e6f7b56bf84e':
Alan Newberger [Mon, 27 Oct 2014 05:36:13 +0000 (05:36 +0000)]
am
d6567402: am
9db50c18: am
2631a15a: Don\'t show aspect ratio UI if using API2 portability
* commit '
d6567402bce2705528bf271008d5166b8f49dd56':
Spike Sprague [Mon, 27 Oct 2014 05:36:12 +0000 (05:36 +0000)]
am
10279d29: am
3e8f9db9: am
d8dbf53c: am
eeeed4fa: new sounds for timer ticker and pano / photosphere intermediate captures
* commit '
10279d29063c1976b341f2d8ca9772684cd363df':
Spike Sprague [Mon, 27 Oct 2014 05:36:11 +0000 (05:36 +0000)]
am
03a2759c: am
e31c82c2: am
c89420a6: am
7d1fb593: Merge "monkey test NPE fix, another null check on mCameraDevice" into ub-camera-glacier
* commit '
03a2759c642203985e59106e33ff460df0cf6523':
Alan Newberger [Mon, 27 Oct 2014 05:36:09 +0000 (05:36 +0000)]
am
78bd5555: am
4c571d7e: am
1db7f286: am
b60af188: Merge "Fix filmstrip item bounds to filmstrip scale" into ub-camera-glacier
* commit '
78bd55551657d78e43375439f45b6cbf3424308e':
Alan Newberger [Mon, 27 Oct 2014 05:36:08 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:06 +0000 (05:36 +0000)]
Alan Newberger [Mon, 27 Oct 2014 05:36:05 +0000 (05:36 +0000)]
am
2d4b0949: (-s ours) am
d0927687: (-s ours) Merge "Add scrolling support with a mouse wheel"
* commit '
2d4b0949cf60ec96162bb3436df35db61abd6e09':
Baligh Uddin [Mon, 27 Oct 2014 04:34:09 +0000 (04:34 +0000)]
am
7eb9e062: (-s ours) am
8929aecc: (-s ours) am
41a13974: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
7eb9e0629bf53bf7d9c050cccb252e0789c8aac8':
Jiawen Chen [Mon, 27 Oct 2014 04:34:08 +0000 (04:34 +0000)]
am
484375dd: am
0a9e31f5: am
6dfb91e0: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
484375dda2adbcbeb9389efb2c9d3a8b63cc4870':
Alan Newberger [Mon, 27 Oct 2014 04:34:07 +0000 (04:34 +0000)]
am
2df3de6f: am
04408f74: am
2aa7189d: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
2df3de6fea68410b6709d0a81d9ffae18006e255':
Spike Sprague [Mon, 27 Oct 2014 04:34:07 +0000 (04:34 +0000)]
am
74fb79f8: am
9e6b902f: am
11c70fb3: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
74fb79f8a7a4e9e6bc37820acac0df254a3137b2':
Spike Sprague [Mon, 27 Oct 2014 04:34:06 +0000 (04:34 +0000)]
am
bee1f5ab: am
037e25a6: am
f608095c: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
bee1f5ab503ad62b65d67d04ca18eb5e6d0bb56f':
Spike Sprague [Mon, 27 Oct 2014 04:34:05 +0000 (04:34 +0000)]
am
1e391c0b: am
0d9b4776: am
0f44eb07: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
1e391c0bd5c4e525ad28293217ee7336fcee5835':
Spike Sprague [Mon, 27 Oct 2014 04:34:04 +0000 (04:34 +0000)]
Baligh Uddin [Mon, 27 Oct 2014 04:34:04 +0000 (04:34 +0000)]
am
1003077a: (-s ours) am
6eba7685: (-s ours) am
3cb0aab3: (-s ours) am
9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
1003077aa045b6c4bff64d8b8fa5a579ded13132':
Puneet Lall [Mon, 27 Oct 2014 04:34:03 +0000 (04:34 +0000)]
am
8c7cc87e: am
38827648: am
a82d6ce2: am
0d7a8c08: am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
8c7cc87eca5cec68e3aad7bea9425a202c203014':
Spike Sprague [Mon, 27 Oct 2014 04:34:02 +0000 (04:34 +0000)]
am
657664a9: am
023a45e8: am
22173edc: am
ad1462a9: am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
657664a9f43614459a46017dad169af34a6f9e14':
Baligh Uddin [Mon, 27 Oct 2014 04:21:37 +0000 (04:21 +0000)]
am
8929aecc: (-s ours) am
41a13974: (-s ours) am
82da5e95: (-s ours) am
02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
8929aeccd3772d9a4cf1a1ddbd91562952638825':
Jiawen Chen [Mon, 27 Oct 2014 04:21:35 +0000 (04:21 +0000)]
am
0a9e31f5: am
6dfb91e0: am
284a9b48: am
30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier
* commit '
0a9e31f5bfd4bf4044f090b209c8fbf39356cee7':
Alan Newberger [Mon, 27 Oct 2014 04:21:33 +0000 (04:21 +0000)]
am
04408f74: am
2aa7189d: am
40b52050: am
e684ea54: Merge "Fix CameraSettingsActivityHelper" into ub-camera-glacier
* commit '
04408f74cee92e6712d548ce10561562f4e5248d':
Spike Sprague [Mon, 27 Oct 2014 04:21:32 +0000 (04:21 +0000)]
am
9e6b902f: am
11c70fb3: am
94cd6522: am
19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier
* commit '
9e6b902fcb0b350159fd3dfd3eea9f481cb6ef07':
Spike Sprague [Mon, 27 Oct 2014 04:21:30 +0000 (04:21 +0000)]
am
037e25a6: am
f608095c: am
baae9e84: am
8bbb5122: Merge "add null check to updateCameraParametersPreferences to apease the monkey" into ub-camera-glacier
* commit '
037e25a68613cc95add0e8da3f39f820ddee4ab8':
Spike Sprague [Mon, 27 Oct 2014 04:21:28 +0000 (04:21 +0000)]
am
0d9b4776: am
0f44eb07: am
476a9e24: am
963775c3: portability layer doesn\'t work well with startPreviewWithCallback() here\'s a dirty dirty workaround.
* commit '
0d9b4776f5300bf451533df628cde15c4d826565':
Spike Sprague [Mon, 27 Oct 2014 04:21:26 +0000 (04:21 +0000)]
Baligh Uddin [Mon, 27 Oct 2014 04:21:24 +0000 (04:21 +0000)]
am
6eba7685: (-s ours) am
3cb0aab3: (-s ours) am
9a275f5e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6eba768550a5fe7c3dba506bdaf19c6de83b3819':
Puneet Lall [Mon, 27 Oct 2014 04:21:22 +0000 (04:21 +0000)]
am
38827648: am
a82d6ce2: am
0d7a8c08: am
6f1dfe69: Merge "Don\'t set mCameraAppUI to null in onDestroy" into ub-camera-glacier
* commit '
38827648c2fae431b106c8845bfb7be49d67ecab':
Spike Sprague [Mon, 27 Oct 2014 04:21:20 +0000 (04:21 +0000)]
am
023a45e8: am
22173edc: am
ad1462a9: am
a16219d5: set proper alpha on shutter button on mode switch, eliminates a janky alpha flash
* commit '
023a45e82a1cf7486d7a142308f27b5683b9c238':
Senpo Hu [Sat, 25 Oct 2014 02:33:50 +0000 (02:33 +0000)]
am
f2d18ca0: am
1c5f87e4: am
8fb9e06b: Adopt the new error handling mechanism in portability.
* commit '
f2d18ca0069a57e2d4354c460b7b145b9db8c5ce':
Adopt the new error handling mechanism in portability.