OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Elliott Hughes [Fri, 25 Aug 2017 16:36:25 +0000 (16:36 +0000)]
Merge "C++14 is the default now."
TreeHugger Robot [Thu, 24 Aug 2017 01:29:23 +0000 (01:29 +0000)]
Merge "Fix check of getSupportedVideoSizes()"
TreeHugger Robot [Thu, 24 Aug 2017 01:26:26 +0000 (01:26 +0000)]
Merge "Fix camera facing by querying characteristics"
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
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:
37214882,
62414856
Test: manually tested as described in the issue
Change-Id: I478d1f53d1d6dec74f98d59c80085d163f09c551
(cherry picked from commit
457620629c641e95cb9621fc804f23e82c60c8b4)
TreeHugger Robot [Fri, 18 Aug 2017 18:55:03 +0000 (18:55 +0000)]
Merge "Correct 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
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
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
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
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
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
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
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
Elliott Hughes [Tue, 15 Aug 2017 20:32:30 +0000 (20:32 +0000)]
Merge "C++14 is the default now."
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
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
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)
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)
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Treehugger Robot [Tue, 25 Jul 2017 20:15:59 +0000 (20:15 +0000)]
Merge "Use support level ZSL and Flash only when platform supports"
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
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
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
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
TreeHugger Robot [Wed, 21 Jun 2017 19:41:41 +0000 (19:41 +0000)]
Merge "Import translations. DO NOT MERGE"
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
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
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
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
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
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
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
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
Jeff Sharkey [Tue, 20 Jun 2017 22:39:16 +0000 (16:39 -0600)]
Only onboard when launched through front door.
When an app is using public API to take a photo, don't confuse the
user with the onboarding flow.
Test: cts-tradefed run commandAndExit cts-dev -m CtsProviderTestCases -t android.provider.cts.MediaStoreUiTest#testImageCapture
Bug:
62204676
Change-Id: Ie0de7b879302a5dd4bf941bf31b449bda95cfdf7
Bill Yi [Wed, 31 May 2017 15:16:55 +0000 (08:16 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5f3dc21659703b6336b6e32dba3891b4dffad5a9
Auto-generated-cl: translation import
Bill Yi [Tue, 16 May 2017 11:07:23 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf42edb51b0ffeabfe5766982509dd1ee71e5a7c
Auto-generated-cl: translation import
Bill Yi [Thu, 11 May 2017 11:42:38 +0000 (11:42 +0000)]
Import translations. DO NOT MERGE am:
2b06298040 -s ours
am:
066f8494ee -s ours
Change-Id: I3d05d07cf9a503d1af03d812e8db25a66ab462f9
Bill Yi [Thu, 11 May 2017 05:41:25 +0000 (05:41 +0000)]
Import translations. DO NOT MERGE
am:
2b06298040 -s ours
Change-Id: Iaf546e0c8e5d3ebb9d7d5671871b6c583e9fcf03
Bill Yi [Wed, 10 May 2017 19:40:25 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iafd232fbeec8aaaf835a4467762690c4582cee72
Auto-generated-cl: translation import
Bill Yi [Tue, 9 May 2017 12:13:08 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc1845051fff699b69e67a2f530693f426a6c7ba
Auto-generated-cl: translation import
Alan Viverette [Tue, 2 May 2017 17:54:20 +0000 (17:54 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev am:
487830bbcf
am:
69c572d803
Change-Id: Ic99f16c26b8317748d47336729a57c5e9fdb474a
Alan Viverette [Tue, 2 May 2017 17:43:00 +0000 (17:43 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev
am:
487830bbcf
Change-Id: I731252c2b1de50d7d22327b2b4b963b9825dfa87
TreeHugger Robot [Tue, 2 May 2017 17:17:14 +0000 (17:17 +0000)]
Merge "Revert "Include v4, use AAPT2"" into oc-dev
Alan Viverette [Tue, 2 May 2017 15:52:38 +0000 (15:52 +0000)]
Merge "Include v4, use AAPT2" into oc-dev am:
a09a333fd2
am:
e164d75371
Change-Id: I4910cd7c5babe0ea85541f15c934ac0c5cf231f1
Alan Viverette [Tue, 2 May 2017 15:11:20 +0000 (15:11 +0000)]
Revert "Include v4, use AAPT2"
Unbundled build was mysteriously failing on missing v13 res APK.
This reverts commit
1c43fe84ebb78d2dc72879be405042ff27d2e2df.
Change-Id: I17d95538dcda742baaf4f356ccdea09a7db016a6