OSDN Git Service
Bill Yi [Fri, 9 Mar 2018 20:18:26 +0000 (20:18 +0000)]
Import translations. DO NOT MERGE
am:
271692ede4 -s ours
Change-Id: I9e52cc3e9cf9bef1755b5fa1a4f997a4d512d7bc
Bill Yi [Thu, 8 Mar 2018 22:41:27 +0000 (14:41 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I37d0993841aea1210d0782e77fc217b02be1ddd2
Bill Yi [Sat, 3 Mar 2018 13:02:07 +0000 (13:02 +0000)]
Import translations. DO NOT MERGE am:
55151b2b02 -s ours
am:
d971298e3a -s ours
Change-Id: I5dc6df21fef852194c921a83b5ddb81f4f9839d0
Bill Yi [Sat, 3 Mar 2018 12:57:36 +0000 (12:57 +0000)]
Import translations. DO NOT MERGE
am:
55151b2b02 -s ours
Change-Id: Ieb3787d64479bb7042431e773f6ab8ba19305fca
TreeHugger Robot [Fri, 2 Mar 2018 21:44:14 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Fri, 2 Mar 2018 01:13:37 +0000 (17:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Icb348ac3d74b006c12772f7b1cd0bfc9e6965d70
Bill Yi [Fri, 2 Mar 2018 01:12:33 +0000 (17:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0f86112614e3280f3f354269caaa2bef995e322e
Auto-generated-cl: translation import
Derek Sollenberger [Fri, 23 Feb 2018 18:31:38 +0000 (13:31 -0500)]
Stop using deprecated Canvas APIs.
Bug:
73777445
Test: compile
Change-Id: Ib8a0b7dcbe606c2a1a9df26549cc805c6eeb892b
Bill Yi [Mon, 26 Feb 2018 20:07:28 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1c4559edba9d4cab4d55830608dffb5693251896
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 22 Feb 2018 04:55:41 +0000 (04:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Nan Zhang [Thu, 22 Feb 2018 02:36:40 +0000 (02:36 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build" am:
6c904ced81 am:
052a3a63c0
am:
14099e84b7
Change-Id: I43e30a73055b9923cc6cdd39e1f169204561da39
Nan Zhang [Thu, 22 Feb 2018 02:29:31 +0000 (02:29 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build" am:
6c904ced81
am:
052a3a63c0
Change-Id: I79497cc430668f8a9aa01dbf04450c97ce26c33d
Nan Zhang [Thu, 22 Feb 2018 02:21:25 +0000 (02:21 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build"
am:
6c904ced81
Change-Id: Iebf1b6d884116a10233e572318170a10b3bd650e
Treehugger Robot [Thu, 22 Feb 2018 02:07:15 +0000 (02:07 +0000)]
Merge "Use HAS_BUILD_NUMBER to check engineering build"
Bill Yi [Thu, 22 Feb 2018 00:53:15 +0000 (16:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89d002751f7a15ef9a77ec518830daa0dc580cfa
Auto-generated-cl: translation import
Nan Zhang [Tue, 20 Feb 2018 21:27:56 +0000 (13:27 -0800)]
Use HAS_BUILD_NUMBER to check engineering build
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build
reruns.
Test: m -j32
Bug: b/
70351683
Change-Id: I95fcc5c92130182a3720f3c08469f196d7f7b4f9
TreeHugger Robot [Tue, 20 Feb 2018 22:46:17 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 20 Feb 2018 18:16:06 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE am:
00c4e3f78a -s ours
am:
9f8b73f2cb -s ours
Change-Id: If0de5401e908465fb23003d9963191379e9a8e35
Bill Yi [Tue, 20 Feb 2018 18:08:45 +0000 (18:08 +0000)]
Import translations. DO NOT MERGE
am:
00c4e3f78a -s ours
Change-Id: Ice2b164b67bf58692c77c516709f0377957a0032
Bill Yi [Tue, 20 Feb 2018 11:00:38 +0000 (03:00 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id6cfd543e0d94b6c52b909c9c9280d887b361320
Bill Yi [Tue, 20 Feb 2018 10:59:34 +0000 (02:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ife0104b684617ac09f3c7de7075c38c2c0d7b07a
Auto-generated-cl: translation import
Alan Viverette [Thu, 8 Feb 2018 22:19:40 +0000 (17:19 -0500)]
Migrate to AAPT2
Bug:
73128633
Test: m Camera2
Change-Id: I97fa2e3b036ea950c231f13d987a5d1e83308721
Bill Yi [Sat, 3 Feb 2018 16:30:42 +0000 (08:30 -0800)]
Import translations. DO NOT MERGE
Change-Id: I94e0da72cb78773ae27ac0225496ac2336dc3f3b
Auto-generated-cl: translation import
Bill Yi [Sat, 27 Jan 2018 17:20:38 +0000 (17:20 +0000)]
Import translations. DO NOT MERGE am:
7234404ed3 -s ours
am:
92ce98aaee -s ours
Change-Id: Ibcb4ef2dc5ee80c274adb7238d8bdd82da4f529a
Bill Yi [Sat, 27 Jan 2018 17:18:18 +0000 (17:18 +0000)]
Import translations. DO NOT MERGE
am:
7234404ed3 -s ours
Change-Id: I3bbffffdcf0bf8757d2e329bd70395d8d512a356
Bill Yi [Sat, 27 Jan 2018 13:28:23 +0000 (05:28 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iaeaa7571a045b4356c454708d360ee520e253bc1
Bill Yi [Sat, 27 Jan 2018 13:27:26 +0000 (05:27 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icfe2e70fcd15e39482c2fcf45820cfe0bbb7e1fb
Auto-generated-cl: translation import
Bill Yi [Fri, 19 Jan 2018 08:53:46 +0000 (00:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibc4f209e051175156a80f83f792aeb3fa5476e19
Auto-generated-cl: translation import
Bill Yi [Wed, 10 Jan 2018 17:06:49 +0000 (09:06 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2d7650a575455f650e160caa1fb3ba4794a565cc
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 8 Dec 2017 05:11:57 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE"
Xin Li [Fri, 8 Dec 2017 04:52:16 +0000 (04:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
0658146997 -s ours am:
6e2c1bdca4
am:
acbb99ada0 -s ours
Change-Id: I3fe6e85562e0b62e1c3f81fe63562843c69c2a76
Bill Yi [Fri, 8 Dec 2017 01:10:12 +0000 (17:10 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie6fa093f248262c559496845879e08e6066fe5cb
Auto-generated-cl: translation import
Stephen Li [Thu, 7 Dec 2017 23:44:38 +0000 (23:44 +0000)]
Manually merge changes from giant AOSP topic
Change-Id: Ib8f588ebe08bac8b557793127a6eea042cf2a653
Xin Li [Thu, 7 Dec 2017 12:56:41 +0000 (12:56 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am:
0658146997 -s ours
am:
6e2c1bdca4
Change-Id: If4d6ac81a29e6adbc09ecd96fd3b565603251032
Xin Li [Thu, 7 Dec 2017 12:52:00 +0000 (12:52 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am:
0658146997 -s ours
Change-Id: I5aff9abe8f04dbd5217255de33ae7eebbb5b03bc
Xin Li [Thu, 7 Dec 2017 06:52:11 +0000 (06:52 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master am:
53e928cde7 -s ours
am:
bc5992d659
Change-Id: If0ab1e9b8eec4a303ffa3608741519403da0e3e5
Xin Li [Thu, 7 Dec 2017 04:23:56 +0000 (04:23 +0000)]
DO NOT MERGE: Merge Oreo MR1 into master
am:
53e928cde7 -s ours
Change-Id: Idfac165fa00fc76408d4b0c98fc3e398bb0fc91d
Xin Li [Wed, 6 Dec 2017 23:18:29 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:52:05 +0000 (11:52 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I2c87f970e53f32486e748642691c6d7231e46548
Bill Yi [Thu, 30 Nov 2017 01:52:48 +0000 (01:52 +0000)]
Import translations. DO NOT MERGE am:
7ebc83533a -s ours
am:
17a8d4b80d -s ours
Change-Id: Ib01b4ecc12d07fcad75aa384530092673db57ee7
Bill Yi [Thu, 30 Nov 2017 01:45:41 +0000 (01:45 +0000)]
Import translations. DO NOT MERGE
am:
7ebc83533a -s ours
Change-Id: I95a1766e8612597b5d37535747cc61e4f23e8fc0
Bill Yi [Thu, 30 Nov 2017 00:02:29 +0000 (16:02 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
69925163
Change-Id: I8f2b26860d2d68700c357e66e566d929ebee09f4
TreeHugger Robot [Mon, 20 Nov 2017 21:45:12 +0000 (21:45 +0000)]
Merge "Import 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
TreeHugger Robot [Wed, 15 Nov 2017 03:08:29 +0000 (03:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Xin Li [Wed, 15 Nov 2017 02:25:58 +0000 (02:25 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
f95fefd3a8
Change-Id: I8271c99137610c9c114537ad6a06666eb37b5ef7
Xin Li [Wed, 15 Nov 2017 00:38:21 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: Ib06ebe440487ee913d5670c55300b75f5f2c8323
Bill Yi [Tue, 14 Nov 2017 20:56:09 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie36b5d4eefb9d8e6ffcd2b3316c292a56f9a376b
Auto-generated-cl: translation import
Xin Li [Mon, 13 Nov 2017 22:35:41 +0000 (14:35 -0800)]
Merge commit '
e088d4b48e74646a148b6839fb5cf0e78dcd40d4' into HEAD
Change-Id: I2d5709acb94525894558f9c8ca8230197dd8eaf3
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
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
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
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
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
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
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
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
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
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
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
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)
OSDN Git Service
