OSDN Git Service
Baligh Uddin [Tue, 16 Sep 2014 15:21:36 +0000 (15:21 +0000)]
am
a3a6c5b1: (-s ours) am
25361e3f: (-s ours) am
522466e6: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
a3a6c5b14225782b4e78505d31ebb163e61c8307':
Baligh Uddin [Tue, 16 Sep 2014 15:21:36 +0000 (15:21 +0000)]
am
eee44b53: (-s ours) am
0f1acda2: (-s ours) am
03b392d9: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
eee44b535bbb617bf03c76038dcd4bfbae4ff0f7':
Andy Huibers [Tue, 16 Sep 2014 15:21:35 +0000 (15:21 +0000)]
am
7756833e: am
29eae70b: am
02a24bc0: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
7756833e8a9fe9ffe3e9e97c106f2191969a5143':
Alan Newberger [Tue, 16 Sep 2014 15:21:35 +0000 (15:21 +0000)]
am
5420d57f: am
74b1d995: am
893acd56: am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
5420d57fa25c421252bdb703338c2806c18d7b09':
Alan Newberger [Tue, 16 Sep 2014 15:21:34 +0000 (15:21 +0000)]
Spike Sprague [Tue, 16 Sep 2014 15:21:34 +0000 (15:21 +0000)]
am
89ab5057: am
925b1a0c: am
cfaa646d: am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
89ab5057339dc38a9290acb24755868a0d31700d':
Alan Newberger [Tue, 16 Sep 2014 15:21:33 +0000 (15:21 +0000)]
am
73bae32e: am
219d86fa: am
3861e387: am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
73bae32e3118623e58cf725f1eee6e1873656843':
Senpo Hu [Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)]
am
b524167d: am
9a2ff1e8: am
89e485e0: am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
b524167dbf8bce0c73657486e21347c75482b453':
Baligh Uddin [Tue, 16 Sep 2014 15:21:32 +0000 (15:21 +0000)]
am
f1eeedb7: (-s ours) am
4bd2b9b5: (-s ours) am
f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f1eeedb796786fc060cc38f10809d0593a6ca40a':
Import translations. DO NOT MERGE
Senpo Hu [Tue, 16 Sep 2014 15:21:31 +0000 (15:21 +0000)]
am
31e3d15f: am
dcf60eea: am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
31e3d15fff19598aebf89b29a2dc56488c50a219':
Alan Newberger [Tue, 16 Sep 2014 15:21:31 +0000 (15:21 +0000)]
am
8f6e750d: am
45090bab: am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
8f6e750d8adadad2044da945f47da2aea3492925':
Jiawen Chen [Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)]
am
edf2b787: am
d7a4c3e2: am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
edf2b787e94d7b9af0aee07412da0925e9515082':
Alan Newberger [Tue, 16 Sep 2014 15:21:30 +0000 (15:21 +0000)]
am
59a9d83b: am
0a156cf6: am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
59a9d83b968077f9267b15bac3395d51fda22021':
Alan Newberger [Tue, 16 Sep 2014 15:21:29 +0000 (15:21 +0000)]
am
309cdabd: am
2acdb01d: am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
309cdabd062de6dae4fb5387948a4ad823f965ae':
Andy Huibers [Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)]
am
5af3ed93: am
91c1c555: am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
5af3ed93aa84ee5360681cad6db385c0e89bdc35':
Qiwen Zhao [Tue, 16 Sep 2014 15:21:28 +0000 (15:21 +0000)]
am
c6456b7b: am
031bcdbd: am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
c6456b7b90fdc367888a50009821c916e04c143a':
Nicolas Prevot [Tue, 16 Sep 2014 15:21:27 +0000 (15:21 +0000)]
am
0c7af463: am
aefc884c: am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
0c7af4631f8764c89626f16e47cfe88bb212db0a':
Andy Huibers [Tue, 16 Sep 2014 15:21:27 +0000 (15:21 +0000)]
Senpo Hu [Tue, 16 Sep 2014 15:21:26 +0000 (15:21 +0000)]
am
877489aa: am
c4f2f4d9: am
b954b3e8: Merge "Always match camera orientation with device orientation regardless portrait lock." into ub-camera-glacier
* commit '
877489aae0927c0038e9d29b79717d6f1e12800a':
Senpo Hu [Tue, 16 Sep 2014 15:21:26 +0000 (15:21 +0000)]
am
12f408cc: am
7a3bdb23: am
65c00136: Set video quality pref default values at startup.
* commit '
12f408cc7acbdcf6f742841a21166f26e9ce12fc':
Eino-Ville Talvala [Tue, 16 Sep 2014 15:21:25 +0000 (15:21 +0000)]
am
58eb8853: am
420c2c42: Merge "Adjust for camera2 API changes" into lmp-dev
* commit '
58eb8853bc9002dfcb7caf48c251d90070eda5a0':
bulic [Mon, 15 Sep 2014 18:00:30 +0000 (18:00 +0000)]
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Camera2 into lmp-mr1-dev-plus-aosp
Spike Sprague [Fri, 12 Sep 2014 23:29:05 +0000 (23:29 +0000)]
am
ba677c7e: am
b8555b66: am
767a1186: Merge "back to bigger HDR+ icons" into ub-camera-glacier
* commit '
ba677c7e1234ebfa8893eac40281217d7901f05a':
Baligh Uddin [Fri, 12 Sep 2014 23:29:04 +0000 (23:29 +0000)]
am
5d3bebde: keep history after reset to lmp-dev
* commit '
5d3bebdef686cb5af4a765b30bf92ad88230bf45':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)]
am
25361e3f: (-s ours) am
522466e6: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
25361e3f3451bd92daed383fc8338f807cb862d7':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 23:06:12 +0000 (23:06 +0000)]
am
0f1acda2: (-s ours) am
03b392d9: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0f1acda2713c7581ea99ef1e9186d4eee9b8f4cb':
Import translations. DO NOT MERGE
Andy Huibers [Fri, 12 Sep 2014 23:06:11 +0000 (23:06 +0000)]
am
29eae70b: am
02a24bc0: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
29eae70b8fda7aba1775e8346c9476910475823b':
If we are using CaptureModule for Gcam only, turn off flash.
Alan Newberger [Fri, 12 Sep 2014 23:06:11 +0000 (23:06 +0000)]
am
74b1d995: am
893acd56: am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
74b1d99566bac77d698c19d5a7b5e9017df2867e':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Fri, 12 Sep 2014 23:06:10 +0000 (23:06 +0000)]
am
168ca8e3: am
c0e5cc1e: am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
168ca8e31f6ad8e10797fca5d9bce75e13784b11':
Reset aspect ratio on pause
Spike Sprague [Fri, 12 Sep 2014 23:06:10 +0000 (23:06 +0000)]
am
925b1a0c: am
cfaa646d: am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
925b1a0c718fbba459cc9c4d494613c718ee0225':
workaround fix
Alan Newberger [Fri, 12 Sep 2014 23:06:09 +0000 (23:06 +0000)]
am
219d86fa: am
3861e387: am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
219d86faf1f03d0614d73c8a0e3ca334e4c22a9b':
Delay PhotoModule preview cover removal to address jank
Senpo Hu [Fri, 12 Sep 2014 23:06:09 +0000 (23:06 +0000)]
am
9a2ff1e8: am
89e485e0: am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
9a2ff1e83b45c6ed00a7133a6d701ccb2a7f4a7f':
Return to filmstrip when video playback finishes.
Baligh Uddin [Fri, 12 Sep 2014 23:06:08 +0000 (23:06 +0000)]
am
4bd2b9b5: (-s ours) am
f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
4bd2b9b5c5b55c48e2775e627caf2a7a73722e9a':
Import translations. DO NOT MERGE
Puneet Lall [Fri, 12 Sep 2014 19:20:09 +0000 (19:20 +0000)]
am
a4d1c140: am
5c56b2c4: am
70a96525: Don\'t send redundant requests to start the preview
* commit '
a4d1c14021a2b46597ecbe3bea1d4efb37d205e0':
Don't send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:59:44 +0000 (18:59 +0000)]
am
5c56b2c4: am
70a96525: Don\'t send redundant requests to start the preview
* commit '
5c56b2c4bf6b31dee65806fcfa67b877657c3975':
Don't send redundant requests to start the preview
Puneet Lall [Fri, 12 Sep 2014 18:02:34 +0000 (18:02 +0000)]
am
70a96525: Don\'t send redundant requests to start the preview
* commit '
70a96525f16ca6c6abb9a7a9dab26ba1e61235dd':
Don't send redundant requests to start the preview
Baligh Uddin [Fri, 12 Sep 2014 10:38:12 +0000 (10:38 +0000)]
am
522466e6: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
522466e6a32a83b81d988e14c6ddb8b0a37f19ad':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 10:38:12 +0000 (10:38 +0000)]
am
03b392d9: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
03b392d9ba5423c0b77e2f872dad5e8ede9086ae':
Import translations. DO NOT MERGE
Andy Huibers [Fri, 12 Sep 2014 10:38:11 +0000 (10:38 +0000)]
am
02a24bc0: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
02a24bc091ba28a0415d7bd22aeccac34ded0039':
If we are using CaptureModule for Gcam only, turn off flash.
Alan Newberger [Fri, 12 Sep 2014 10:38:10 +0000 (10:38 +0000)]
am
893acd56: am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
893acd56c4a2e55f9c533bce80cc1f1eb19ee171':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Fri, 12 Sep 2014 10:38:10 +0000 (10:38 +0000)]
am
c0e5cc1e: am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
c0e5cc1eb3dbde021713c8d78b3ff039d8d4bd15':
Reset aspect ratio on pause
Spike Sprague [Fri, 12 Sep 2014 10:38:09 +0000 (10:38 +0000)]
am
cfaa646d: am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
cfaa646d2c3b3cf45df6faf7354b9bf461935fbe':
workaround fix
Alan Newberger [Fri, 12 Sep 2014 10:38:09 +0000 (10:38 +0000)]
am
3861e387: am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3861e38769d06057910a2219562916e172d8caef':
Delay PhotoModule preview cover removal to address jank
Senpo Hu [Fri, 12 Sep 2014 10:38:08 +0000 (10:38 +0000)]
am
89e485e0: am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
89e485e0970bce2e1e2ec011738a50090bc6a2ac':
Return to filmstrip when video playback finishes.
Baligh Uddin [Fri, 12 Sep 2014 10:38:08 +0000 (10:38 +0000)]
am
f5cafa5a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f5cafa5afec323e34315ee20934365360282926b':
Import translations. DO NOT MERGE
Alan Newberger [Fri, 12 Sep 2014 08:26:08 +0000 (08:26 +0000)]
am
55e9bf0f: am
3c324d34: am
486ba1da: Revert layout change for Camera
* commit '
55e9bf0fe8060bc43bfe5d0f02618cb530ed6596':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 08:26:07 +0000 (08:26 +0000)]
am
85fb40bc: am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
85fb40bc72bdc6e38ecb80e0a74b8285ccd6b0e6':
Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 05:07:22 +0000 (05:07 +0000)]
am
3c324d34: am
486ba1da: Revert layout change for Camera
* commit '
3c324d34bd0930c615bac32bdb6bbbf7d9cf31c5':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 05:07:21 +0000 (05:07 +0000)]
am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
4a7668d72b2f80e90156bfae4befbe37b10c4d2e':
Move launcher icons to mipmap
Puneet Lall [Fri, 12 Sep 2014 00:33:21 +0000 (17:33 -0700)]
Don't send redundant requests to start the preview
Change-Id: I43d8a2917bbe0140f1e9367cce21f68b19807aa8
Alan Newberger [Fri, 12 Sep 2014 01:46:46 +0000 (01:46 +0000)]
am
486ba1da: Revert layout change for Camera
* commit '
486ba1da145f70b07235617e5f1f64186daa0fc0':
Revert layout change for Camera
Alan Newberger [Fri, 12 Sep 2014 01:46:44 +0000 (01:46 +0000)]
am
ca5173d8: Move launcher icons to mipmap
* commit '
ca5173d84722383d2d9ef49dd85fba28af035429':
Move launcher icons to mipmap
Alan Newberger [Thu, 11 Sep 2014 23:29:20 +0000 (16:29 -0700)]
Revert layout change for Camera
Changing from LAYOUT_FULLSCREEN to FULLSCREEN interferes with layout of
Action Bar.
Bug:
17477202
Change-Id: I029a84adbe4c5017cc8185c5c0c2601a03196bde
Alan Newberger [Thu, 11 Sep 2014 21:39:22 +0000 (14:39 -0700)]
Move launcher icons to mipmap
Bug:
17457682
Change-Id: I6a626c8547f3eea8a06fc47fc70c1a587767b040
Alan Newberger [Thu, 11 Sep 2014 18:32:25 +0000 (18:32 +0000)]
am
1f58c3d8: am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
1f58c3d8ee90a39ee37e480ead1e00d944a24074':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 18:01:03 +0000 (18:01 +0000)]
am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
1bbdb135f84e0c223bac9ee68e5ef6960e03ae62':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:51:52 +0000 (17:51 +0000)]
am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
45f316bcecb8713cbb217507981fd657fcdaa274':
Establish synchronous camera closing when app utilizes API1/API2
Alan Newberger [Thu, 11 Sep 2014 17:25:54 +0000 (10:25 -0700)]
Establish synchronous camera closing when app utilizes API1/API2
To ensure API1 and API2 portability implementations coordinate together,
if app uses API2 for any mode, lock both modes into synchronouse camera
closing.
Bug:
17464089
Change-Id: If4cf1eb02053ec9e56b7b8df97c21e012467aa3a
Baligh Uddin [Thu, 11 Sep 2014 16:12:35 +0000 (16:12 +0000)]
am
95d4d6bc: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
95d4d6bc9b095ef61930ceaf7b9c0a8107b4112d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:12:34 +0000 (16:12 +0000)]
am
5d5362ef: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
5d5362ef5fe47dae6f4ecd43a83b57d5c8b8e31a':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:11:33 +0000 (16:11 +0000)]
am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
f238265746c8769bdbba8091d6ae0b30f7ee8697':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:11:24 +0000 (16:11 +0000)]
am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91225f8b7d51be3f2ca8c187de70e775551b3ce4':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:06:18 +0000 (16:06 +0000)]
am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
f238265746c8769bdbba8091d6ae0b30f7ee8697':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 11 Sep 2014 16:02:34 +0000 (16:02 +0000)]
am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
91225f8b7d51be3f2ca8c187de70e775551b3ce4':
Import translations. DO NOT MERGE
Andy Huibers [Thu, 11 Sep 2014 16:00:34 +0000 (16:00 +0000)]
am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
d3db7916c770c33feffa34dc2da486af66ab8a13':
If we are using CaptureModule for Gcam only, turn off flash.
Alan Newberger [Thu, 11 Sep 2014 15:59:52 +0000 (15:59 +0000)]
am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
11d3405c96e68888e9d8088f35c77a81e941164c':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 15:59:09 +0000 (15:59 +0000)]
am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
73d569d4939008528be950f055c571048af6e648':
Reset aspect ratio on pause
Baligh Uddin [Thu, 11 Sep 2014 15:58:23 +0000 (15:58 +0000)]
am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
0c5fc1d311eaa82dff09cee6332140fda21d473e':
Import translations. DO NOT MERGE
Spike Sprague [Thu, 11 Sep 2014 15:58:12 +0000 (15:58 +0000)]
am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
ac1dd2f67a60aebbac54b779fa419b4c90e49bf9':
workaround fix
Alan Newberger [Thu, 11 Sep 2014 15:58:03 +0000 (15:58 +0000)]
am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3d330a601da095e86735d7b58f35d22aa8c4e469':
Delay PhotoModule preview cover removal to address jank
Senpo Hu [Thu, 11 Sep 2014 15:57:42 +0000 (15:57 +0000)]
am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
cdf62f7876cbf24fd8a645a95d1948e65c33c88b':
Return to filmstrip when video playback finishes.
Baligh Uddin [Thu, 11 Sep 2014 15:49:05 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 15:49:04 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Thu, 11 Sep 2014 15:48:57 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Andy Huibers [Thu, 11 Sep 2014 04:53:44 +0000 (04:53 +0000)]
am
bc96895d: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
bc96895d1644651dcf8cb8abad75b34dd85afec6':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:44:11 +0000 (04:44 +0000)]
am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
d3db7916c770c33feffa34dc2da486af66ab8a13':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:37:47 +0000 (04:37 +0000)]
am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
e6ebf3d73bb3f337413bdde437fbb8fde6cee436':
If we are using CaptureModule for Gcam only, turn off flash.
Andy Huibers [Thu, 11 Sep 2014 04:08:56 +0000 (21:08 -0700)]
If we are using CaptureModule for Gcam only, turn off flash.
Bug:
17460394
Change-Id: I4743e9c31f516d12537b2ceedc9e1fe35fbd8381
Alan Newberger [Thu, 11 Sep 2014 02:16:30 +0000 (02:16 +0000)]
am
23ccf2e8: am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
23ccf2e8f0096712ae980a7b14e76fbc5d4e9d2d':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 01:48:20 +0000 (01:48 +0000)]
am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
11d3405c96e68888e9d8088f35c77a81e941164c':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 01:37:45 +0000 (01:37 +0000)]
am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
0c9af933b7227577003f462ddab12a1ca49208fe':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 01:26:18 +0000 (01:26 +0000)]
Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
Alan Newberger [Thu, 11 Sep 2014 01:26:01 +0000 (01:26 +0000)]
Revert "Delay PhotoModule preview cover removal to address jank"
This CL introduced PhotoModule state corruption, multiple picture taking was not possible. Need to deal with stopPreview during picture taking vs module initialization.
Bug:
17451185
This reverts commit
49fb93b5517e12606eb747f0a5d218b4d03df821.
Change-Id: I0a1eec8147ce859d2e83ee7bdd17655b4054f904
Alan Newberger [Thu, 11 Sep 2014 00:58:01 +0000 (00:58 +0000)]
am
e2508ea0: am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
e2508ea0601ac6cc5bb479eb5bbb34608478d40a':
Reset aspect ratio on pause
Alan Newberger [Thu, 11 Sep 2014 00:44:18 +0000 (00:44 +0000)]
am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
73d569d4939008528be950f055c571048af6e648':
Reset aspect ratio on pause
Alan Newberger [Thu, 11 Sep 2014 00:33:48 +0000 (00:33 +0000)]
am
7351415d: Reset aspect ratio on pause
* commit '
7351415ddfaf7f563a4a12c9204e6feb20fdf49d':
Reset aspect ratio on pause
Alan Newberger [Wed, 10 Sep 2014 22:03:27 +0000 (15:03 -0700)]
Reset aspect ratio on pause
When resuming the app we do resize things but the old aspect
ratio is cached, thus skipping a reset of the transform matrices
because the app thinks it is already at the correct aspect ratio.
In certain cases (changing orientation when paused) this leads to
layout bugs.
Bug:
17304671
Change-Id: Ia171190b3c76dc05519bdf4d1947d9664d5fb604
Spike Sprague [Wed, 10 Sep 2014 23:32:47 +0000 (23:32 +0000)]
am
cda65018: am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
cda65018a7029fd2af183c6d9b21368da2561cae':
workaround fix
Spike Sprague [Wed, 10 Sep 2014 23:24:45 +0000 (23:24 +0000)]
am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
ac1dd2f67a60aebbac54b779fa419b4c90e49bf9':
workaround fix
Alan Newberger [Wed, 10 Sep 2014 23:16:25 +0000 (23:16 +0000)]
am
6743394f: am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
6743394fad922dba0aca7a9920c2079767bf2408':
Delay PhotoModule preview cover removal to address jank
Spike Sprague [Wed, 10 Sep 2014 23:14:50 +0000 (23:14 +0000)]
am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
87a2300ff2b49b8bd6a69815d1e4f3db477fcf4d':
workaround fix
Spike Sprague [Wed, 10 Sep 2014 23:07:48 +0000 (23:07 +0000)]
Merge "workaround fix" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 23:04:41 +0000 (23:04 +0000)]
am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3d330a601da095e86735d7b58f35d22aa8c4e469':
Delay PhotoModule preview cover removal to address jank
Alan Newberger [Wed, 10 Sep 2014 22:58:30 +0000 (22:58 +0000)]
am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
3096e6729b72a47ee3ed0a68a455bc978036de5c':
Delay PhotoModule preview cover removal to address jank
Alan Newberger [Wed, 10 Sep 2014 22:53:06 +0000 (22:53 +0000)]
Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
Alan Newberger [Wed, 10 Sep 2014 22:44:01 +0000 (15:44 -0700)]
Delay PhotoModule preview cover removal to address jank
Cover should stay in place at least until startPreview completes.
Since it is async, we should call handlers in a callback.
Bug:
17451185
Change-Id: I220c49b9bb75ad977d92780c6eea0ff126a7dcb8
Senpo Hu [Wed, 10 Sep 2014 22:34:01 +0000 (22:34 +0000)]
am
60226c1f: am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
60226c1fc1b4791f68334db7df207041de69d7d4':
Return to filmstrip when video playback finishes.
Senpo Hu [Wed, 10 Sep 2014 22:24:58 +0000 (22:24 +0000)]
am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
cdf62f7876cbf24fd8a645a95d1948e65c33c88b':
Return to filmstrip when video playback finishes.
Senpo Hu [Wed, 10 Sep 2014 22:17:02 +0000 (22:17 +0000)]
am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
d3ee86b7c1f1973119619f8e1b356d9707dd0493':
Return to filmstrip when video playback finishes.
Spike Sprague [Wed, 10 Sep 2014 18:31:09 +0000 (11:31 -0700)]
workaround fix
change View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN to View.SYSTEM_UI_FLAG_FULLSCREEN
on L, with View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN the entire camera app window is shifted down by the height of the status bar.
with View.SYSTEM_UI_FLAG_FULLSCREEN thw window lays out correctly.
note: with either flag on KitKat the window lays out correctly.
bug:
17457492
Change-Id: I6534fcedaafbbb525967289db7fb759ba50fca42
OSDN Git Service
