OSDN Git Service
Alan Newberger [Fri, 12 Sep 2014 19:28:58 +0000 (19:28 +0000)]
am
3da05094: am
85fb40bc: am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
3da05094f62baa070a39c803fc232122af1d5778':
Move launcher icons to mipmap
Alan Newberger [Fri, 12 Sep 2014 19:20:16 +0000 (19:20 +0000)]
am
5c4cb7d0: am
1f58c3d8: am
1bbdb135: am
45f316bc: Establish synchronous camera closing when app utilizes API1/API2
* commit '
5c4cb7d07af7b9962960ddf342db4ed630452a9f':
Establish synchronous camera closing when app utilizes API1/API2
Baligh Uddin [Fri, 12 Sep 2014 19:17:16 +0000 (19:17 +0000)]
am
cab39e0a: (-s ours) am
95d4d6bc: (-s ours) am
f2382657: (-s ours) am
0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
* commit '
cab39e0ac32583367e916380d3170c4fb4187d4d':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 12 Sep 2014 19:17:15 +0000 (19:17 +0000)]
am
96c2fe9d: (-s ours) am
5d5362ef: (-s ours) am
91225f8b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
96c2fe9d2cde671442b5aa5e6fbc87e4ec9bd108':
Import translations. DO NOT MERGE
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:21 +0000 (05:07 +0000)]
am
4a7668d7: am
ca5173d8: Move launcher icons to mipmap
* commit '
4a7668d72b2f80e90156bfae4befbe37b10c4d2e':
Move launcher icons to mipmap
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 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
Andy Huibers [Thu, 11 Sep 2014 17:29:55 +0000 (17:29 +0000)]
am
ac7d02e4: am
bc96895d: am
d3db7916: am
e6ebf3d7: If we are using CaptureModule for Gcam only, turn off flash.
* commit '
ac7d02e4bb0b650a59733fab324681a47ac9ff3d':
If we are using CaptureModule for Gcam only, turn off flash.
Alan Newberger [Thu, 11 Sep 2014 17:28:37 +0000 (17:28 +0000)]
am
6a016780: am
23ccf2e8: am
11d3405c: am
0c9af933: Merge "Revert "Delay PhotoModule preview cover removal to address jank"" into ub-camera-glacier
* commit '
6a016780ab57b96545c15c2696a9b43a2a9d55ce':
Revert "Delay PhotoModule preview cover removal to address jank"
Alan Newberger [Thu, 11 Sep 2014 17:27:37 +0000 (17:27 +0000)]
am
a645b993: am
e2508ea0: am
73d569d4: am
7351415d: Reset aspect ratio on pause
* commit '
a645b993b29897026d0bbb9b86a7b42391d96da4':
Reset aspect ratio on pause
Spike Sprague [Thu, 11 Sep 2014 17:26:24 +0000 (17:26 +0000)]
am
d4b3211d: am
cda65018: am
ac1dd2f6: am
87a2300f: Merge "workaround fix" into ub-camera-glacier
* commit '
d4b3211d6c3f5d9ce908f2fd68e16cd5d3835b7f':
workaround fix
Alan Newberger [Thu, 11 Sep 2014 17:26:04 +0000 (17:26 +0000)]
am
98c7ab3c: am
6743394f: am
3d330a60: am
3096e672: Merge "Delay PhotoModule preview cover removal to address jank" into ub-camera-glacier
* commit '
98c7ab3c6841589a7ae547fb9afa704e349b1520':
Delay PhotoModule preview cover removal to address jank
Senpo Hu [Thu, 11 Sep 2014 17:25:40 +0000 (17:25 +0000)]
am
2454e9b6: am
60226c1f: am
cdf62f78: am
d3ee86b7: Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
* commit '
2454e9b65b164624883f7b8874154b52a73d64e9':
Return to filmstrip when video playback finishes.
Senpo Hu [Thu, 11 Sep 2014 17:25:17 +0000 (17:25 +0000)]
am
917aa5f3: am
c03da30a: am
dcf60eea: am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
917aa5f359bcfa7955be5af6f6c034acde15fc64':
Fix the upside-down orienation bug in CaptureModule.
Alan Newberger [Thu, 11 Sep 2014 17:23:40 +0000 (17:23 +0000)]
am
0e1adc06: am
4fb8cfb6: am
45090bab: am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
0e1adc061bfd635896c0856660c1c0f3b7004ba5':
Remove jank on camera options switching
Jiawen Chen [Thu, 11 Sep 2014 17:23:40 +0000 (17:23 +0000)]
am
c558a866: am
f06952f8: am
d7a4c3e2: am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
c558a866abb327773a9801addab0fea910617a59':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Thu, 11 Sep 2014 17:22:46 +0000 (17:22 +0000)]
am
38968eb2: am
54434532: am
0a156cf6: am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
38968eb27f927667167d3533b940d12d97113cf9':
Reinitialize shutter button in Camera mode upon preview start
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: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
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
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:02 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 11 Sep 2014 15:48:57 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into ub-camera-glacier
Alan Newberger [Thu, 11 Sep 2014 14:16:34 +0000 (14:16 +0000)]
am
b980192d: am
4992dc71: am
2acdb01d: am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
b980192d3cdd2e193d0e6d324121df9dbfd61fab':
Reduce logging for unknown camera scope
Andy Huibers [Thu, 11 Sep 2014 14:14:58 +0000 (14:14 +0000)]
am
7b10d1ea: am
ff9ee29a: am
91c1c555: am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
7b10d1ea709307b599bde4c3547fd1c3aad774e2':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Qiwen Zhao [Thu, 11 Sep 2014 14:14:22 +0000 (14:14 +0000)]
am
905c7748: (-s ours) am
14f31379: am
031bcdbd: am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
905c774860941760ddb5a98bf26ab90250628cac':
DO NOT MERGE: Adjust for camera2 API changes
Nicolas Prevot [Thu, 11 Sep 2014 14:12:23 +0000 (14:12 +0000)]
am
c5c872cb: am
b780cffa: am
aefc884c: am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
c5c872cb1ac62de63d5fb77bc4d6765b15560cbb':
Granting read permission in the result intent for VIDEO_CAPTURE.
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
Senpo Hu [Wed, 10 Sep 2014 22:11:15 +0000 (22:11 +0000)]
Merge "Return to filmstrip when video playback finishes." into ub-camera-glacier
Senpo Hu [Wed, 10 Sep 2014 21:59:58 +0000 (21:59 +0000)]
am
c03da30a: am
dcf60eea: am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
c03da30aba2eb202adad6353198ce1dd7c144e5e':
Fix the upside-down orienation bug in CaptureModule.
Senpo Hu [Wed, 10 Sep 2014 21:43:16 +0000 (14:43 -0700)]
Return to filmstrip when video playback finishes.
Bug:
17091348
Change-Id: I9703d014029bf29431b099b129b1ed8bce0ffa03
Senpo Hu [Wed, 10 Sep 2014 21:53:39 +0000 (21:53 +0000)]
am
dcf60eea: am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
dcf60eeab39218adc901a3ba3a736a0f7ccdc05e':
Fix the upside-down orienation bug in CaptureModule.
Senpo Hu [Wed, 10 Sep 2014 21:43:30 +0000 (21:43 +0000)]
am
5675b8af: Fix the upside-down orienation bug in CaptureModule.
* commit '
5675b8af3fddca8d73d0ce0c8aa2f2a38592f556':
Fix the upside-down orienation bug in CaptureModule.
Alan Newberger [Wed, 10 Sep 2014 21:32:17 +0000 (21:32 +0000)]
am
4fb8cfb6: am
45090bab: am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
4fb8cfb6e50c12649395b71e49daf6185e475cd1':
Remove jank on camera options switching
Jiawen Chen [Wed, 10 Sep 2014 21:32:16 +0000 (21:32 +0000)]
am
f06952f8: am
d7a4c3e2: am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
f06952f88acf04e746ff70835b0db3f880026ab2':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Wed, 10 Sep 2014 21:27:13 +0000 (21:27 +0000)]
am
45090bab: am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
45090babe6f614243a179bc7712e75dbf4666fb5':
Remove jank on camera options switching
Jiawen Chen [Wed, 10 Sep 2014 21:22:05 +0000 (21:22 +0000)]
am
d7a4c3e2: am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
d7a4c3e265889c010cdf99170c51701019fb64f0':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Wed, 10 Sep 2014 21:21:08 +0000 (21:21 +0000)]
am
d79b38d6: Merge "Remove jank on camera options switching" into ub-camera-glacier
* commit '
d79b38d669e9e61a954b02f3aca63810476f6fc5':
Remove jank on camera options switching
Senpo Hu [Wed, 10 Sep 2014 21:15:00 +0000 (14:15 -0700)]
Fix the upside-down orienation bug in CaptureModule.
Bug:
17369697
Change-Id: I5beb0ec45f2dbf372dda88ffd8a92b1632b3ab90
Alan Newberger [Wed, 10 Sep 2014 21:13:54 +0000 (21:13 +0000)]
Merge "Remove jank on camera options switching" into ub-camera-glacier
Jiawen Chen [Wed, 10 Sep 2014 21:10:45 +0000 (21:10 +0000)]
am
9cefdd49: Changed double to float. viewFinder -> viewfinder.
* commit '
9cefdd495332719d987ffb942742ec602793d8d4':
Changed double to float. viewFinder -> viewfinder.
Alan Newberger [Wed, 10 Sep 2014 20:57:47 +0000 (20:57 +0000)]
am
54434532: am
0a156cf6: am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
54434532594362c4891c5553254437b7ee06307a':
Reinitialize shutter button in Camera mode upon preview start
Alan Newberger [Wed, 10 Sep 2014 20:42:57 +0000 (20:42 +0000)]
am
0a156cf6: am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
0a156cf6c8543433e1188da2873241bdb1869c11':
Reinitialize shutter button in Camera mode upon preview start
Jiawen Chen [Tue, 9 Sep 2014 21:14:39 +0000 (14:14 -0700)]
Changed double to float. viewFinder -> viewfinder.
Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
Alan Newberger [Wed, 10 Sep 2014 20:32:05 +0000 (20:32 +0000)]
am
ffc395d6: Reinitialize shutter button in Camera mode upon preview start
* commit '
ffc395d6e7eaafcdcd283e183188de16aa14aa4c':
Reinitialize shutter button in Camera mode upon preview start
Alan Newberger [Wed, 10 Sep 2014 20:07:18 +0000 (13:07 -0700)]
Reinitialize shutter button in Camera mode upon preview start
VideoModule already does this here, and by adding to PhotoModule we
address a bug where pausing when capturing leaves the button
disabled on resume.
Bug:
17426670
Change-Id: I8333b52a72c0da8b58070d689406975332ae632e
Alan Newberger [Wed, 10 Sep 2014 18:55:35 +0000 (18:55 +0000)]
am
4992dc71: am
2acdb01d: am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
4992dc710154ff1f9a82dde65b475c99b7930620':
Reduce logging for unknown camera scope
Alan Newberger [Wed, 10 Sep 2014 18:45:37 +0000 (18:45 +0000)]
am
2acdb01d: am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
2acdb01dfb3ce662220f801fb9733cbdca4d6233':
Reduce logging for unknown camera scope
Alan Newberger [Wed, 10 Sep 2014 18:32:48 +0000 (18:32 +0000)]
am
5c4bd6b5: Reduce logging for unknown camera scope
* commit '
5c4bd6b5348a3464783270ea0bb10d4968d3b0cb':
Reduce logging for unknown camera scope
Alan Newberger [Wed, 10 Sep 2014 18:22:19 +0000 (11:22 -0700)]
Reduce logging for unknown camera scope
Still log a warning, but remove stack trace logging.
Change-Id: I28e47feb5d2700fd05e7ff4e6faeb1d5a9e38de5
Andy Huibers [Wed, 10 Sep 2014 17:27:25 +0000 (17:27 +0000)]
am
ff9ee29a: am
91c1c555: am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
ff9ee29a99a8d01f21e75ee29e47a1636c567b03':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Andy Huibers [Wed, 10 Sep 2014 17:16:17 +0000 (17:16 +0000)]
am
91c1c555: am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
91c1c555ec75e66d35ed57dfe6134b50c46ee525':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Qiwen Zhao [Wed, 10 Sep 2014 17:09:29 +0000 (17:09 +0000)]
am
14f31379: am
031bcdbd: am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
14f3137946007d7100ac62db10e167046940cbce':
DO NOT MERGE: Adjust for camera2 API changes
Andy Huibers [Wed, 10 Sep 2014 17:08:50 +0000 (17:08 +0000)]
am
a710f371: Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
* commit '
a710f371b8e454d37b8b2be50e001b79e37c67f2':
This fixes Bitmap.createBitmap offset bug in L, not sure why.
Andy Huibers [Wed, 10 Sep 2014 15:55:10 +0000 (15:55 +0000)]
Merge "This fixes Bitmap.createBitmap offset bug in L, not sure why." into ub-camera-glacier
Qiwen Zhao [Wed, 10 Sep 2014 15:35:46 +0000 (15:35 +0000)]
am
031bcdbd: am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
031bcdbd1ce646d11542165f626f7590bfa85130':
DO NOT MERGE: Adjust for camera2 API changes
Qiwen Zhao [Wed, 10 Sep 2014 15:29:28 +0000 (15:29 +0000)]
am
fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
* commit '
fd97c6da954f3e3e6f8547f6f7363cddba6c1b9a':
DO NOT MERGE: Adjust for camera2 API changes
Qiwen Zhao [Wed, 10 Sep 2014 15:20:46 +0000 (15:20 +0000)]
Merge "DO NOT MERGE: Adjust for camera2 API changes" into ub-camera-glacier
Nicolas Prevot [Wed, 10 Sep 2014 10:06:31 +0000 (10:06 +0000)]
am
b780cffa: am
aefc884c: am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
b780cffa09be568dc7fc94ee227c5918a93199b2':
Granting read permission in the result intent for VIDEO_CAPTURE.
Nicolas Prevot [Wed, 10 Sep 2014 09:56:15 +0000 (09:56 +0000)]
am
aefc884c: am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
aefc884cf5bd12b8caa0a657c33072010cd3234c':
Granting read permission in the result intent for VIDEO_CAPTURE.
Nicolas Prevot [Wed, 10 Sep 2014 09:50:44 +0000 (09:50 +0000)]
am
42a5ad5a: Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
* commit '
42a5ad5a9c7e660854fd0552b81e025c16db9f05':
Granting read permission in the result intent for VIDEO_CAPTURE.
Nicolas Prevot [Wed, 10 Sep 2014 09:42:35 +0000 (09:42 +0000)]
Merge "Granting read permission in the result intent for VIDEO_CAPTURE." into ub-camera-glacier
Andy Huibers [Wed, 10 Sep 2014 07:36:11 +0000 (07:36 +0000)]
Andy Huibers [Wed, 10 Sep 2014 07:25:01 +0000 (07:25 +0000)]
Andy Huibers [Wed, 10 Sep 2014 07:13:17 +0000 (07:13 +0000)]
Andy Huibers [Wed, 10 Sep 2014 06:57:12 +0000 (06:57 +0000)]
Alan Newberger [Wed, 10 Sep 2014 01:47:37 +0000 (18:47 -0700)]
Remove jank on camera options switching
There are two main causes of jank on encountered on options switching:
1. When requesting camera in requestCamera, a portability refactor
introduced a regression where we blocked in the main thread to close
the camera. This main thread blockage is unacceptable as it caused a
preview freeze in addition to the freeze we were trying to create during
the switch, leading to a two-frame preview freeze.
2. The mode options animations which delay the button state transition,
also resulted in preview stutters. Unsure of cause but reverting first
and will assess fixes and reintroduce.
Bug:
17414652
Change-Id: Ib72e331f1bbb5d3b608d8bdc5656c2ff2836ed42
Andy Huibers [Wed, 10 Sep 2014 01:45:28 +0000 (18:45 -0700)]
Remove toast.
This reverts commit
779414e8bfe23d66de310570ff2314654e45ec9f.
Change-Id: Idf04e0bbb69822792327fd17634a4f95f7eb2092
OSDN Git Service
