OSDN Git Service

android-x86/packages-apps-Camera2.git
6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:42:35 +0000 (11:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: I7f1d412558943798c62a41fd0216ca8333707411
Auto-generated-cl: translation import

6 years agoImport translations. DO NOT MERGE am: 22125898d7 -s ours
Bill Yi [Mon, 30 Oct 2017 07:50:10 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE am: 22125898d7  -s ours
am: ce460aa7fb  -s ours

Change-Id: I361f31ab3b35ca8976917a1ac6e21814017ab2c4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 30 Oct 2017 07:33:12 +0000 (07:33 +0000)]
Import translations. DO NOT MERGE
am: 22125898d7  -s ours

Change-Id: Ibd8092b0fc3d1854f4961df4a9e1519c7f362772

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 29 Oct 2017 07:37:38 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I4b2ef70e99e3c0333b7f097292e280eff6ea4f77

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 27 Oct 2017 08:01:01 +0000 (01:01 -0700)]
Import translations. DO NOT MERGE

Change-Id: I65d2c29d4cbea06208a4a41c2a88a4ea3ad42cb5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 867c2a333b -s ours am: 3ef7cf5ae8 -s ours
Bill Yi [Fri, 20 Oct 2017 17:41:14 +0000 (17:41 +0000)]
Import translations. DO NOT MERGE am: 867c2a333b  -s ours am: 3ef7cf5ae8  -s ours
am: f3e460ed8f  -s ours

Change-Id: I4adb14d65864c39deeec106919f60242757e6518

6 years agoImport translations. DO NOT MERGE am: 867c2a333b -s ours
Bill Yi [Fri, 20 Oct 2017 17:11:13 +0000 (17:11 +0000)]
Import translations. DO NOT MERGE am: 867c2a333b  -s ours
am: 3ef7cf5ae8  -s ours

Change-Id: I77523bdc53a64115146d2fd099a58c389ef2e716

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 16:36:22 +0000 (16:36 +0000)]
Import translations. DO NOT MERGE
am: 867c2a333b  -s ours

Change-Id: I42c139c47c292dea7374d4d6c6a19ed3bf85cbe4

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 08:11:14 +0000 (01:11 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: Idece2fc08294600d7f7c444506aab87ad435e224

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 19 Oct 2017 13:23:25 +0000 (06:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: I43fa73e7fa969ebdffa65ffea95bfb4871809fdb
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 3beb113d7c -s ours am: ebe8700d44 -s ours
Bill Yi [Tue, 17 Oct 2017 09:01:56 +0000 (09:01 +0000)]
Import translations. DO NOT MERGE am: 3beb113d7c  -s ours am: ebe8700d44  -s ours
am: e088d4b48e  -s ours

Change-Id: I97af0d4472bc8636d70237f0dc15de99ee922ebf

6 years agoImport translations. DO NOT MERGE am: 3beb113d7c -s ours
Bill Yi [Tue, 17 Oct 2017 05:36:20 +0000 (05:36 +0000)]
Import translations. DO NOT MERGE am: 3beb113d7c  -s ours
am: ebe8700d44  -s ours

Change-Id: Ie64213aa47c4e9fa5fe7228a5c4e6ac29cac92fe

6 years agoImport translations. DO NOT MERGE am: 3beb113d7c -s ours am: d8d7ab2100 -s ours
Bill Yi [Tue, 17 Oct 2017 03:53:10 +0000 (03:53 +0000)]
Import translations. DO NOT MERGE am: 3beb113d7c  -s ours am: d8d7ab2100  -s ours
am: 3f073efad8  -s ours

Change-Id: I4b35508eefe14d8008233647977923ed2b0713cb

6 years agoImport translations. DO NOT MERGE am: 9129a76e01 -s ours
Bill Yi [Tue, 17 Oct 2017 03:52:54 +0000 (03:52 +0000)]
Import translations. DO NOT MERGE am: 9129a76e01  -s ours
am: d40a4595cd  -s ours

Change-Id: I4be3a3e96f2973358bdd54e79e4e404517f5da75

6 years agoImport translations. DO NOT MERGE am: 3beb113d7c -s ours
Bill Yi [Tue, 17 Oct 2017 00:20:34 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE am: 3beb113d7c  -s ours
am: d8d7ab2100  -s ours

Change-Id: Ib4707a5610266cafaeffc7d7b3d30706ca633e24

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 00:20:27 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE
am: 3beb113d7c  -s ours

Change-Id: Ic4d3046ab27b074be059cc23d372dfd875974533

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 00:20:12 +0000 (00:20 +0000)]
Import translations. DO NOT MERGE
am: 9129a76e01  -s ours

Change-Id: I97c0e78402baa246805bb78a985def6453da8807

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 17 Oct 2017 00:15:23 +0000 (00:15 +0000)]
Import translations. DO NOT MERGE
am: 3beb113d7c  -s ours

Change-Id: Id3bfdb57096b9d71c0ab03873ba632dbe8a4b510

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 06:57:43 +0000 (23:57 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I06bbcabf9346183edf8307d9b77f98e643f5d717

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 16 Oct 2017 06:56:41 +0000 (23:56 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ie9c80f28b107688784cc211373f5453b6d329144

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 7 Oct 2017 19:44:44 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic9834190ef37119474154d84867b471b469f2231
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 28 Sep 2017 03:55:30 +0000 (20:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6050fa55b1096aaa281ab87dea8923ed585f62af
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoFix build with proguard
Colin Cross [Tue, 26 Sep 2017 19:49:57 +0000 (12:49 -0700)]
Fix build with proguard

Add extra resource directories to fix proguard errors:
Warning: android.support.design.widget.CoordinatorLayout: can't find referenced class android.support.coreui.R$attr
...
Warning: android.support.v4.media.app.NotificationCompat$DecoratedMediaCustomViewStyle: can't find referenced class android.support.mediacompat.R$layout

Test: m TARGET_PRODUCT=full TARGET_BUILD_VARIANT=userdebug TARGET_BUILD_APPS=Camera2
Change-Id: I6d9be73c0442d741d8ff7c7af9c4446434a2ed93

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 20 Sep 2017 22:52:39 +0000 (15:52 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6c96833dc802edbb7d88db4adaefac442dce4c2d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 18:14:10 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0734f4a52ae8aa395e6b1db2edc3770222aeff6b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 29d8f0dbdc -s ours
Bill Yi [Sat, 16 Sep 2017 21:33:26 +0000 (21:33 +0000)]
Import translations. DO NOT MERGE am: 29d8f0dbdc  -s ours
am: 730491eef5  -s ours

Change-Id: I2e589373343523e84334b26670df1599e163c65e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 21:22:55 +0000 (21:22 +0000)]
Import translations. DO NOT MERGE
am: 29d8f0dbdc  -s ours

Change-Id: I0cc62d6c42c5b0d200490cb59d8b574248c833e2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 16 Sep 2017 15:19:26 +0000 (08:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I366eda67212898909736cadaed3ccccda365c0b2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 6 Sep 2017 11:42:06 +0000 (04:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I85e6b22d8b269ebd2d8fb92a82e5325038edeb5b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: 9f3ef2ac81 -s ours
Bill Yi [Wed, 30 Aug 2017 03:19:14 +0000 (03:19 +0000)]
Import translations. DO NOT MERGE am: 9f3ef2ac81  -s ours
am: 1067bc75e5  -s ours

Change-Id: Ifad00a86ad8b815ab0ab2f8146ed2a93f8473a80

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 30 Aug 2017 00:42:45 +0000 (00:42 +0000)]
Import translations. DO NOT MERGE
am: 9f3ef2ac81  -s ours

Change-Id: Ie204c828edcc17177c466002f63be0e73cfb89b3

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 29 Aug 2017 20:19:52 +0000 (13:19 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ib380a6c5d7d87dadd9c807bd0cbee8404abfc999

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 27 Aug 2017 17:00:13 +0000 (10:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7c963b07d845b88a381e42e659d464f3a46625c4
Auto-generated-cl: translation import

6 years agoMerge "C++14 is the default now."
Elliott Hughes [Fri, 25 Aug 2017 16:36:25 +0000 (16:36 +0000)]
Merge "C++14 is the default now."

6 years agoMerge "Fix check of getSupportedVideoSizes()"
TreeHugger Robot [Thu, 24 Aug 2017 01:29:23 +0000 (01:29 +0000)]
Merge "Fix check of getSupportedVideoSizes()"

6 years agoMerge "Fix camera facing by querying characteristics"
TreeHugger Robot [Thu, 24 Aug 2017 01:26:26 +0000 (01:26 +0000)]
Merge "Fix camera facing by querying characteristics"

6 years agoC++14 is the default now.
Elliott Hughes [Wed, 23 Aug 2017 22:55:00 +0000 (15:55 -0700)]
C++14 is the default now.

Bug: http://b/32019064
Test: builds
Change-Id: Ifbe43ff37f9f4b56b009ce4de3e48db3182221c3

6 years agouse activity context for FirstRunDialog
Yuki Awano [Tue, 25 Apr 2017 07:42:55 +0000 (16:42 +0900)]
use activity context for FirstRunDialog

orientation of ApplicationContext always returns its orientation as
landscape in clamshell mode. While it is the root cause of this issue,
IIUC, we don't need to use application context for FirstRunDialog.

Bug: 3721488262414856
Test: manually tested as described in the issue

Change-Id: I478d1f53d1d6dec74f98d59c80085d163f09c551
(cherry picked from commit 457620629c641e95cb9621fc804f23e82c60c8b4)

6 years agoMerge "Correct return type for CameraCharacteristics.get()"
TreeHugger Robot [Fri, 18 Aug 2017 18:55:03 +0000 (18:55 +0000)]
Merge "Correct return type for CameraCharacteristics.get()"

6 years agoCorrect return type for CameraCharacteristics.get()
Ping-Hao Wu [Wed, 16 Aug 2017 02:01:32 +0000 (19:01 -0700)]
Correct return type for CameraCharacteristics.get()

Bug: 64070732
Test: Camera app works properly
Change-Id: Idc7b292f7fc87649e1d1fcbc1679804d4c998fc2

6 years agoAdaptive icon for Camera2 AOSP Bug: 64332797 Test: manual am: dbed2a484c
Hyunyoung Song [Tue, 15 Aug 2017 23:29:33 +0000 (23:29 +0000)]
Adaptive icon for Camera2 AOSP Bug: 64332797 Test: manual am: dbed2a484c
am: cd14565623

Change-Id: Ida873dab1193a82ebef975f5bb780f870e04260a

6 years agoAdaptive icon for Camera2 AOSP Bug: 64332797 Test: manual
Hyunyoung Song [Tue, 15 Aug 2017 22:59:18 +0000 (22:59 +0000)]
Adaptive icon for Camera2 AOSP Bug: 64332797 Test: manual
am: dbed2a484c

Change-Id: Ia053d5426aa7835e03ed6343523467b66d4c19f6

6 years agoMerge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d am: 54ea634edd am...
Elliott Hughes [Tue, 15 Aug 2017 21:19:27 +0000 (21:19 +0000)]
Merge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d am: 54ea634edd am: 25a3d3833c
am: 8396cb370f

Change-Id: Id9a6b988633ab6596249267f4a08f5f9cc229421

6 years agoMerge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d am: 54ea634edd
Elliott Hughes [Tue, 15 Aug 2017 21:00:53 +0000 (21:00 +0000)]
Merge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d am: 54ea634edd
am: 25a3d3833c

Change-Id: Iab6b96e5c15d87876f0c5a9f9c9e109b38d3b611

6 years agoMerge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d
Elliott Hughes [Tue, 15 Aug 2017 20:50:13 +0000 (20:50 +0000)]
Merge "C++14 is the default now." am: 572bd35933 am: a4cb3c1c2d
am: 54ea634edd

Change-Id: I620848d2cc08f2b73c0d1e274011fe59a475b9c5

6 years agoMerge "C++14 is the default now." am: 572bd35933
Elliott Hughes [Tue, 15 Aug 2017 20:45:25 +0000 (20:45 +0000)]
Merge "C++14 is the default now." am: 572bd35933
am: a4cb3c1c2d

Change-Id: I7d01629d1f7db0c2daaf668667f21bcfe14a75a3

6 years agoMerge "C++14 is the default now."
Elliott Hughes [Tue, 15 Aug 2017 20:38:44 +0000 (20:38 +0000)]
Merge "C++14 is the default now."
am: 572bd35933

Change-Id: I60e7ceae8c7190b5fec557ae132a5098ed10cc90

6 years agoMerge "C++14 is the default now."
Elliott Hughes [Tue, 15 Aug 2017 20:32:30 +0000 (20:32 +0000)]
Merge "C++14 is the default now."

6 years agoAdaptive icon for Camera2 AOSP
Hyunyoung Song [Tue, 15 Aug 2017 18:08:44 +0000 (11:08 -0700)]
Adaptive icon for Camera2 AOSP
Bug: 64332797
Test: manual

Change-Id: I91ddd5db21f4164ef52d2de94230c0298cc7394c

6 years agoC++14 is the default now.
Elliott Hughes [Sat, 12 Aug 2017 06:04:46 +0000 (23:04 -0700)]
C++14 is the default now.

Bug: http://b/32019064
Test: builds
Change-Id: Ibe0b5d4474c36492656f49c0873150567d213e27

6 years agoFix check of getSupportedVideoSizes()
Justin Chuang [Wed, 6 Apr 2016 10:25:01 +0000 (18:25 +0800)]
Fix check of getSupportedVideoSizes()

com.android.ex.camera2.portability.CameraCapabilities.getSupportedVideoSizes()
does not return null even when
android.hardware.Camera.Parameters.getSupportedVideoSizes() returns
NULL.

BUG=27805501

Change-Id: Ie1bbf9ffcfc1a947ebfdd9f9fb7a2ab87ea6b7ef
(cherry picked from commit bcfede4820c2c5177ec2ff1b63495f6569050b16)

6 years agoFix camera facing by querying characteristics
henryhsu [Tue, 8 Mar 2016 02:50:25 +0000 (10:50 +0800)]
Fix camera facing by querying characteristics

Query facing from characteristics instead of hard coded.
Some code like camera_id_icons still assume the back camera id is
0. But these codes are only used when switching cameras. If there
is only one camera (either front or back), camera app works fine.
If there are two cameras, back camera id should be 0.

Also changing CHECK_BACK_CAMERA_ONLY to false because some devices
only have a front camera.

BUG=27516910
TEST=manually run camera app on device

Change-Id: I9f6914e2eb7609a6cb7eb840e3e27e440a7c81df
(cherry picked from commit daa06b80d28adfccfb785b8fa9b73898af50579b)

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 12 Aug 2017 11:46:12 +0000 (04:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: If16c52514f809b295f0f3870aacab71e27a64334
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
The Android Open Source Project [Wed, 9 Aug 2017 13:29:55 +0000 (06:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: I86fc62e43fb3f67c8d85ca0d0f33c256ff605b82
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: d8bfd41abe -s ours am: 079e27ad8b -s ours...
Bill Yi [Mon, 7 Aug 2017 06:27:05 +0000 (06:27 +0000)]
Import translations. DO NOT MERGE am: d8bfd41abe  -s ours am: 079e27ad8b  -s ours am: dc0fd6c578  -s ours
am: 6c538b45f6  -s ours

Change-Id: Ia7ec59b10caa4f8d1c26a2e71c45fc07a34cd2f5

6 years agoImport translations. DO NOT MERGE am: d8bfd41abe -s ours am: 079e27ad8b -s ours
Bill Yi [Mon, 7 Aug 2017 06:12:00 +0000 (06:12 +0000)]
Import translations. DO NOT MERGE am: d8bfd41abe  -s ours am: 079e27ad8b  -s ours
am: dc0fd6c578  -s ours

Change-Id: Ia04b9a123cc1d68fab0eab544961e3c029d6cf5a

6 years agoImport translations. DO NOT MERGE am: d8bfd41abe -s ours
Bill Yi [Mon, 7 Aug 2017 05:52:22 +0000 (05:52 +0000)]
Import translations. DO NOT MERGE am: d8bfd41abe  -s ours
am: 079e27ad8b  -s ours

Change-Id: I8b955190145b659697724db4dd1af956c6701462

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 7 Aug 2017 05:37:38 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am: d8bfd41abe  -s ours

Change-Id: Id6ff7ded58874204fd7f525ebb3a9f693978c01c

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 6 Aug 2017 17:58:16 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: If4cf45ba79302aac18870517c6825a23a045779c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE am: ea11729ec0 -s ours am: 13867e4122 -s ours
Bill Yi [Sat, 5 Aug 2017 03:16:45 +0000 (03:16 +0000)]
Import translations. DO NOT MERGE am: ea11729ec0  -s ours am: 13867e4122  -s ours
am: ff5de37dcf  -s ours

Change-Id: I8dcb5110f22471a2bd1672efe5997d7ecebc64d6

6 years agoImport translations. DO NOT MERGE am: ea11729ec0 -s ours am: 072ca47b99 -s ours
Bill Yi [Sat, 5 Aug 2017 03:16:36 +0000 (03:16 +0000)]
Import translations. DO NOT MERGE am: ea11729ec0  -s ours am: 072ca47b99  -s ours
am: c5434646f2  -s ours

Change-Id: I3a212380e07cd76e3ff736f58039823741eb5d8e

6 years agoImport translations. DO NOT MERGE am: ea11729ec0 -s ours
Bill Yi [Sat, 5 Aug 2017 03:11:12 +0000 (03:11 +0000)]
Import translations. DO NOT MERGE am: ea11729ec0  -s ours
am: 13867e4122  -s ours

Change-Id: Ia876f7c9498f719f32121be8dbe193e33435c4eb

6 years agoImport translations. DO NOT MERGE am: ea11729ec0 -s ours
Bill Yi [Sat, 5 Aug 2017 03:05:23 +0000 (03:05 +0000)]
Import translations. DO NOT MERGE am: ea11729ec0  -s ours
am: 072ca47b99  -s ours

Change-Id: I82a74a4a79ff9295b667f64ca3986d83b7903ff2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 02:59:12 +0000 (02:59 +0000)]
Import translations. DO NOT MERGE
am: ea11729ec0  -s ours

Change-Id: I91f2ca65ed95eed98449db059b4e127e1547be80

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 5 Aug 2017 02:57:52 +0000 (02:57 +0000)]
Import translations. DO NOT MERGE
am: ea11729ec0  -s ours

Change-Id: I64537df06c42588147d0fea90f27a0076b0ddb15

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 4 Aug 2017 22:54:35 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: I84192201c0c61e7890fdbf6f6e09c018559c051d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7...
Yin-Chia Yeh [Wed, 2 Aug 2017 05:22:03 +0000 (05:22 +0000)]
Merge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c" into oc-dr1-dev-plus-aosp am: e3899fe278" into oc-mr1-dev-plus-aosp
am: 3af29cdb7b

Change-Id: If74a22df175b79ccc0c56363862c5cf5297c0900

6 years agoMerge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c am...
Yin-Chia Yeh [Wed, 2 Aug 2017 05:21:54 +0000 (05:21 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c am: c66d44b076" into oc-mr1-dev-plus-aosp
am: 5199cc8ea6

Change-Id: Id877f8c4bc9f17f27f8785e781540c431fc016ce

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 94a30bf46d am: 58373e3d4e
Yin-Chia Yeh [Wed, 2 Aug 2017 05:21:44 +0000 (05:21 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 94a30bf46d am: 58373e3d4e
am: 376adc9e1f

Change-Id: I171f687b35193353a84ce5f97e845f01eb783fa5

6 years agoMerge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7...
Android Build Merger (Role) [Wed, 2 Aug 2017 05:17:33 +0000 (05:17 +0000)]
Merge "Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c" into oc-dr1-dev-plus-aosp am: e3899fe278" into oc-mr1-dev-plus-aosp

6 years agoMerge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c"...
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:25 +0000 (05:17 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c" into oc-dr1-dev-plus-aosp
am: e3899fe278

Change-Id: I2ba276ac27591404265f5d8267a1ab0b3cdcca7e

6 years agoMerge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c am...
Android Build Merger (Role) [Wed, 2 Aug 2017 05:17:22 +0000 (05:17 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c am: c66d44b076" into oc-mr1-dev-plus-aosp

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:15 +0000 (05:17 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c
am: c66d44b076

Change-Id: Ic8b015bb808df7dfdcb21a9874db1933758f1813

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 94a30bf46d
Yin-Chia Yeh [Wed, 2 Aug 2017 05:17:14 +0000 (05:17 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 94a30bf46d
am: 58373e3d4e

Change-Id: If92061dbcd4760f49338fba68099d35b16eab2ee

6 years agoMerge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c"...
Android Build Merger (Role) [Wed, 2 Aug 2017 05:12:51 +0000 (05:12 +0000)]
Merge "Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280 am: 73774aed7c" into oc-dr1-dev-plus-aosp

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
am: 73774aed7c

Change-Id: I6fb66d6ccdc84ad42a2eac678e762cad470f3849

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
am: 94a30bf46d

Change-Id: Icbaa55e2dbf56b9307ef1cb97b13043b872b2fa7

6 years agoCamera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
Yin-Chia Yeh [Wed, 2 Aug 2017 05:12:44 +0000 (05:12 +0000)]
Camera: allow instant app do IMAGE_CAPTURE am: 0e804c2280
am: 73774aed7c

Change-Id: I3bd99c9eb1e2015d07ece0e82aa4ad467bf2c7a2

6 years agoCamera: allow instant app do IMAGE_CAPTURE
Yin-Chia Yeh [Wed, 2 Aug 2017 05:08:14 +0000 (05:08 +0000)]
Camera: allow instant app do IMAGE_CAPTURE
am: 0e804c2280

Change-Id: Ib0522454df8cc0e93a02e589f963267538833451

6 years agoCamera: allow instant app do IMAGE_CAPTURE
Yin-Chia Yeh [Wed, 2 Aug 2017 05:08:13 +0000 (05:08 +0000)]
Camera: allow instant app do IMAGE_CAPTURE
am: 0e804c2280

Change-Id: I5fa416cb26de79bb7a31597e60a6fd1e76a020b1

6 years agoCamera: allow instant app do IMAGE_CAPTURE
Yin-Chia Yeh [Mon, 31 Jul 2017 21:10:58 +0000 (14:10 -0700)]
Camera: allow instant app do IMAGE_CAPTURE

Test: build
Bug: 64137808
Change-Id: I744135c0e13e50378b6f245b4f6ca2aca36936bd

6 years agoMerge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d...
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:47:50 +0000 (20:47 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d am: 92ab0d63c2 am: 0529fdaedf am: b42861b84b
am: aa2e552fea

Change-Id: Ie7a083a5527a79918eedffeca652ebbb945e4d11

6 years agoMerge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d...
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:38:06 +0000 (20:38 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d am: 92ab0d63c2 am: 0529fdaedf
am: b42861b84b

Change-Id: I77770b75d41bfb0e3ce96f9f635a47d9141e2be7

6 years agoMerge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d...
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:34:41 +0000 (20:34 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d am: 92ab0d63c2
am: 0529fdaedf

Change-Id: Id18345701037b6306f2fec8dc233cd2fb1760833

6 years agoMerge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:31:20 +0000 (20:31 +0000)]
Merge "Use support level ZSL and Flash only when platform supports" am: 8690a7317d
am: 92ab0d63c2

Change-Id: I919ea3df2f1f6eb99aba67fdd985e0d37a441708

6 years agoMerge "Use support level ZSL and Flash only when platform supports"
Eiichi,Ohnishi [Tue, 25 Jul 2017 20:27:20 +0000 (20:27 +0000)]
Merge "Use support level ZSL and Flash only when platform supports"
am: 8690a7317d

Change-Id: Ie6db06ce5747bab1f995a05a7aa624b0547e725a

6 years agoMerge "Use support level ZSL and Flash only when platform supports"
Treehugger Robot [Tue, 25 Jul 2017 20:15:59 +0000 (20:15 +0000)]
Merge "Use support level ZSL and Flash only when platform supports"

6 years agoFix TARGET_BUILD_APPS build with proguard
Colin Cross [Sat, 22 Jul 2017 00:10:00 +0000 (17:10 -0700)]
Fix TARGET_BUILD_APPS build with proguard

Fix missing transitive dependency issues caught by proguard.

Test: m -j ANDROID_COMPILE_WITH_JACK=false TARGET_BUILD_APPS=Camera2
Change-Id: If0905e42ee49c1d4b8191f543168b25e1d2c596b

6 years agoUse support level ZSL and Flash only when platform supports
Eiichi,Ohnishi [Wed, 12 Jul 2017 08:33:31 +0000 (17:33 +0900)]
Use support level ZSL and Flash only when platform supports

Camera2 does not work when platform has no capability for ZSL and Flash.
To avoid this:

 - Select support level LIMITED_YUV when reprocessing is not supported.
   And use TEMPLATE_STILL_CAPTURE instead of
   TEMPLATE_ZERO_SHUTTER_LAG to take picture in LIMITED_YUV.

 - Select Flash off when Flash is not supported.

Bug: 63694123
Change-Id: I147c275f9126be0e1050c6cc61896adebce5c578

6 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 13 Jul 2017 12:43:06 +0000 (05:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1757c3b535bed5178497bccd704e1442c20d0f93
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 7 Jul 2017 10:28:46 +0000 (03:28 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4d7f713f7e712a322123140c26626f936c710516
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 21 Jun 2017 19:41:41 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d...
Jeff Sharkey [Wed, 21 Jun 2017 17:59:49 +0000 (17:59 +0000)]
Merge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d" into oc-dr1-dev-plus-aosp
am: 2e781bb778

Change-Id: Ifd6e99383dbd5a528e9f402a8d3abf1d8d054636

6 years agoOnly onboard when launched through front door. am: 2d6d4d23a9 am: b91d23b0ae
Jeff Sharkey [Wed, 21 Jun 2017 17:56:38 +0000 (17:56 +0000)]
Only onboard when launched through front door. am: 2d6d4d23a9 am: b91d23b0ae
am: 9605596b54

Change-Id: I91683bbbd31be80e7e6e74d9803488f2664ccfe1

6 years agoMerge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d...
Android Build Merger (Role) [Wed, 21 Jun 2017 17:46:12 +0000 (17:46 +0000)]
Merge "Only onboard when launched through front door. am: 2d6d4d23a9 am: c34270d03d" into oc-dr1-dev-plus-aosp

6 years agoOnly onboard when launched through front door. am: 2d6d4d23a9
Jeff Sharkey [Wed, 21 Jun 2017 17:45:31 +0000 (17:45 +0000)]
Only onboard when launched through front door. am: 2d6d4d23a9
am: c34270d03d

Change-Id: I2572057489e7ffa53dfb6a8a7e8808a4f4be0a32

6 years agoOnly onboard when launched through front door. am: 2d6d4d23a9
Jeff Sharkey [Wed, 21 Jun 2017 17:44:20 +0000 (17:44 +0000)]
Only onboard when launched through front door. am: 2d6d4d23a9
am: b91d23b0ae

Change-Id: If77b0960c7e7c2ccc8576d33cad14141a497e806

6 years agoOnly onboard when launched through front door.
Jeff Sharkey [Wed, 21 Jun 2017 17:38:03 +0000 (17:38 +0000)]
Only onboard when launched through front door.
am: 2d6d4d23a9

Change-Id: I3ca9470af9a3814980c059e7785466f2330011e5

6 years agoOnly onboard when launched through front door.
Jeff Sharkey [Wed, 21 Jun 2017 17:38:03 +0000 (17:38 +0000)]
Only onboard when launched through front door.
am: 2d6d4d23a9

Change-Id: I05d5de2cba94599f0f55d817114cf2e965d5fec1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 21 Jun 2017 05:39:59 +0000 (22:39 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia409972d8e5e8a4cce8ee831cfa9e33c58fc36d1
Auto-generated-cl: translation import