OSDN Git Service
Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]
Enforce null check for mAccessPoint
mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.
Bug:
68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit
0117b995f44758a64b7af6d2d11e17d10ef125ce)
TreeHugger Robot [Tue, 7 Nov 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 7 Nov 2017 09:33:26 +0000 (09:33 +0000)]
Import translations. DO NOT MERGE
am:
73120a4cdb -s ours
Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d
Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e
Bill Yi [Tue, 7 Nov 2017 07:20:38 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180
Fan Zhang [Fri, 3 Nov 2017 00:42:12 +0000 (00:42 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours am:
e981e0b855 -s ours am:
ef61a45cf6 -s ours
am:
5af580a419 -s ours
Change-Id: I83bbad093fdcf90649ce39efbd9783a584d2b7c1
Fan Zhang [Fri, 3 Nov 2017 00:40:07 +0000 (00:40 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours am:
e981e0b855 -s ours
am:
ef61a45cf6 -s ours
Change-Id: If9d124cc6a362a152345a04e0748cd71c6fac42a
Fan Zhang [Fri, 3 Nov 2017 00:38:04 +0000 (00:38 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours am:
d15a81f882 -s ours
am:
e981e0b855 -s ours
Change-Id: I32df0f311eca598b6b6969f288b258f65e43ae49
Fan Zhang [Fri, 3 Nov 2017 00:34:29 +0000 (00:34 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours am:
3c19043e9c -s ours
am:
d15a81f882 -s ours
Change-Id: I937296351e0da23f441dab7c0403b1d59d78a016
Fan Zhang [Fri, 3 Nov 2017 00:31:01 +0000 (00:31 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours am:
e6a8f354fc -s ours
am:
3c19043e9c -s ours
Change-Id: I6e25fc7111d4ec534d0588100e1dd6ce2ced5ee1
Fan Zhang [Fri, 3 Nov 2017 00:28:34 +0000 (00:28 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours am:
dbbcf65c96 -s ours
am:
e6a8f354fc -s ours
Change-Id: I4ea4b1a122429accdaede04201d88f16286fa4da
Fan Zhang [Fri, 3 Nov 2017 00:26:03 +0000 (00:26 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours am:
7690482014 -s ours
am:
dbbcf65c96 -s ours
Change-Id: Ia7d6e53337a1b0225e8917542fa5ae9d092b1ebf
Fan Zhang [Fri, 3 Nov 2017 00:22:09 +0000 (00:22 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours am:
5f02135c42 -s ours
am:
7690482014 -s ours
Change-Id: Ia8925895580e9e010bee69ae638272ec7a9bad1a
Fan Zhang [Fri, 3 Nov 2017 00:19:51 +0000 (00:19 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours am:
1de093b1a1 -s ours
am:
5f02135c42 -s ours
Change-Id: I97a7ff922ca6aed7f99bce5f15f104b6b7ce8411
Fan Zhang [Fri, 3 Nov 2017 00:17:43 +0000 (00:17 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours am:
b17703e871 -s ours
am:
1de093b1a1 -s ours
Change-Id: Ia56b40b2d0de2d993a46970d5cf1e63c8e47cd81
Fan Zhang [Fri, 3 Nov 2017 00:15:15 +0000 (00:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev am:
1c040c7414 -s ours
am:
b17703e871 -s ours
Change-Id: I17c1cacc0a068c4d79e4cf568152607c3e13c4c4
Fan Zhang [Fri, 3 Nov 2017 00:13:11 +0000 (00:13 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
am:
1c040c7414 -s ours
Change-Id: Ibcf00afea271d12b533042711317bb2e2356c0e9
Fan Zhang [Fri, 3 Nov 2017 00:07:32 +0000 (00:07 +0000)]
Merge "Set device credential's Window flag to be SECURE." into lmp-mr1-dev
Fan Zhang [Tue, 10 Oct 2017 21:06:04 +0000 (14:06 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: I445cbad99344a2fcc335a5aad4a4de026ae97441
Merged-In: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Test: manual
TreeHugger Robot [Thu, 2 Nov 2017 00:40:07 +0000 (00:40 +0000)]
Merge "Check system support of wide-color" into oc-mr1-dev
Fan Zhang [Tue, 31 Oct 2017 23:18:42 +0000 (23:18 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours am:
7da421a293 -s ours am:
76f30a360c -s ours
am:
1b1204be64 -s ours
Change-Id: Ia7f4a3d972633cb1cb976550f8cbbd819a8aab3c
Fan Zhang [Tue, 31 Oct 2017 23:15:37 +0000 (23:15 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours am:
7da421a293 -s ours
am:
76f30a360c -s ours
Change-Id: Ib2f57e3bd9adc14be453af9fc510613d210ffe23
Fan Zhang [Tue, 31 Oct 2017 23:11:55 +0000 (23:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours am:
9d865d0c3e -s ours
am:
7da421a293 -s ours
Change-Id: Ia717917794165cb2846f0836c9e42350028a3095
Fan Zhang [Tue, 31 Oct 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours am:
3d94477fb8 -s ours
am:
9d865d0c3e -s ours
Change-Id: Ic2de72b09edc9f4a1a2c5be6ae9b12099eb9ae62
Fan Zhang [Tue, 31 Oct 2017 23:04:53 +0000 (23:04 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours am:
4d9e11990d -s ours
am:
3d94477fb8 -s ours
Change-Id: If5fd35415471ddb7a07899d7fff170fe63dd7dca
Fan Zhang [Tue, 31 Oct 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours am:
0c0728a947 -s ours
am:
4d9e11990d -s ours
Change-Id: Ic7eec070d6a3f352b15b6a6e9b82af93fcbf4403
Fan Zhang [Tue, 31 Oct 2017 23:00:42 +0000 (23:00 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5 am:
b4db530aa5 -s ours
am:
0c0728a947 -s ours
Change-Id: Ia44221b7d0e556ce26b3e50a91d68b90b6453228
Fan Zhang [Tue, 31 Oct 2017 22:59:07 +0000 (22:59 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08 am:
769e1e31f5
am:
b4db530aa5 -s ours
Change-Id: Ia9e4b612cfe9efffbad24a8a123b48dbcb6bb13d
Fan Zhang [Tue, 31 Oct 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613 am:
cd66862b08
am:
769e1e31f5
Change-Id: Ie3cf781e84803ef5e602e8885fe018a2bba993e4
Fan Zhang [Tue, 31 Oct 2017 22:54:07 +0000 (22:54 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev am:
8bffdc2613
am:
cd66862b08
Change-Id: I46830f9d58174aafa138bee67b60e52d0578594b
Fan Zhang [Tue, 31 Oct 2017 22:50:43 +0000 (22:50 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
am:
8bffdc2613
Change-Id: Ie06476c8e34cbf17f4538a477894b7bca1bdfcbd
Fan Zhang [Tue, 31 Oct 2017 22:47:13 +0000 (22:47 +0000)]
Merge "Set device credential's Window flag to be SECURE." into mnc-dev
Fan Zhang [Tue, 31 Oct 2017 21:33:53 +0000 (21:33 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b am:
0c59dca90d -s ours am:
96cc88e218 -s ours
am:
4aec1cee4e -s ours
Change-Id: Id74bf2c46e0454e030e9fc0c4ee231450241aa79
Fan Zhang [Tue, 31 Oct 2017 21:29:53 +0000 (21:29 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b am:
0c59dca90d -s ours
am:
96cc88e218 -s ours
Change-Id: Ic182e3df1a283123d0d53c13499af1ed7501767e
Fan Zhang [Tue, 31 Oct 2017 21:25:58 +0000 (21:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b am:
adabc7561b
am:
0c59dca90d -s ours
Change-Id: I10ea3abe4e4a04fa779cd51cee141cb80cb76acf
Fan Zhang [Tue, 31 Oct 2017 21:23:57 +0000 (21:23 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da am:
80af194f8b
am:
adabc7561b
Change-Id: I58bf359a98fc0b6ceb06cf4a5e83cedabfa6a0f3
Fan Zhang [Tue, 31 Oct 2017 21:21:53 +0000 (21:21 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f am:
e79c26a9da
am:
80af194f8b
Change-Id: Iecfc5f05f9ede225800d12416508d71f7aeb46c0
Fan Zhang [Tue, 31 Oct 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev am:
e69c4dcb8f
am:
e79c26a9da
Change-Id: I3652f6f77479a339b9acc387a49ee96fe70921ff
Fan Zhang [Tue, 31 Oct 2017 21:11:26 +0000 (21:11 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
am:
e69c4dcb8f
Change-Id: I30a0d2578343a7635da63a52cfc81f1427aab23b
Fan Zhang [Fri, 22 Sep 2017 18:25:42 +0000 (11:25 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ie56f725bf245961d61a66eae8a82b728600cb650
Fixes:
64339515
Bug:
38258991
Merged-In: Ife33131004d66092bfa57aa57a9bb856800ce28d
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Fan Zhang [Tue, 31 Oct 2017 21:03:08 +0000 (21:03 +0000)]
Merge "Set device credential's Window flag to be SECURE." into nyc-dev
Fan Zhang [Fri, 22 Sep 2017 16:32:02 +0000 (09:32 -0700)]
Set device credential's Window flag to be SECURE.
This prevents showing any pattern/pin in recent list.
Change-Id: Ife33131004d66092bfa57aa57a9bb856800ce28d
Fixes:
64339515
Bug:
38258991
Merged-In: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Merged-In: Ibe781a3a1e1483a8c6fde4c7cc5dffbf54bdba59
Test: manual
Fan Zhang [Tue, 31 Oct 2017 18:47:59 +0000 (18:47 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev am:
e3d0bbcc80 -s ours
am:
9bb4e0b794 -s ours
Change-Id: I139f18df764f1d888cc6d7687aba5a23ab30053f
Fan Zhang [Tue, 31 Oct 2017 18:36:12 +0000 (18:36 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev
am:
e3d0bbcc80 -s ours
Change-Id: I8be390dc1e5190029be41a55c014c9e2705c7aef
Fan Zhang [Tue, 31 Oct 2017 18:25:36 +0000 (18:25 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dev
Courtney Goeltzenleuchter [Mon, 9 Oct 2017 23:13:47 +0000 (17:13 -0600)]
Check system support of wide-color
getContext().getDisplay().isWideColorGamut() does not check system
support of wide-color. That's window.isWideColor().
No window object handy so call isScreenWideColorGamut() to
verify system support for wide-color as well.
Bug:
64801219
Bug:
67488442
Test: manual, check Developer Settings for Color Mode
option on Pixel or Pixel XL.
Change-Id: If28e52da174dd460850bc84744818979f52add78
(cherry picked from commit
bae1b24ba306793ca2d86aa80552bd79e0e54742)
Bill Yi [Tue, 31 Oct 2017 03:41:23 +0000 (03:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
a68a0f0463 -s ours
Change-Id: I4b9282935fe15d3c1418edb43506aad058a3e485
TreeHugger Robot [Tue, 31 Oct 2017 03:35:52 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 31 Oct 2017 03:34:28 +0000 (03:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Fan Zhang [Tue, 31 Oct 2017 02:44:34 +0000 (02:44 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev
am:
83c49be1da
Change-Id: Iacdaedc972e9d8ba013860be1442620c46c4f19d
TreeHugger Robot [Tue, 31 Oct 2017 02:37:43 +0000 (02:37 +0000)]
Merge "Set device credential's Window flag to be SECURE." into oc-dr1-dev
Bill Yi [Tue, 31 Oct 2017 01:16:54 +0000 (18:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: If1e768b33481061f37bac9612b862ece348f15fb
Bill Yi [Tue, 31 Oct 2017 01:12:54 +0000 (18:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Idb8eeaa4ee52a3d250c95a164a7bf28512d32901
Bill Yi [Sun, 29 Oct 2017 06:21:49 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I17237599107b5576cfc9261b866614c1a69fb531
TreeHugger Robot [Fri, 27 Oct 2017 07:55:00 +0000 (07:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Fri, 27 Oct 2017 07:41:44 +0000 (07:41 +0000)]
Import translations. DO NOT MERGE
am:
09bd03ba04 -s ours
Change-Id: I6ff0a464ed719315f276e794f0851541b200691c
Bill Yi [Fri, 27 Oct 2017 04:16:36 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ida971c59c2e7f9af5cf288628676f959521ddc98
Bill Yi [Fri, 27 Oct 2017 04:10:31 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I35ac0b6a330fb71bc2aa0020ae8417664345e213
Christine Franks [Fri, 27 Oct 2017 03:23:14 +0000 (03:23 +0000)]
Move color mode to DisplayTransformManager
am:
3d1d4a6628 -s ours
Change-Id: I7064dbf657bf93f80f863b6b0e963cb793752194
Fan Zhang [Fri, 27 Oct 2017 00:08:51 +0000 (00:08 +0000)]
Add strings to support multi-state vivid color management
am:
a12b3d318d
Change-Id: I8d47a1c0982d6159cbeb7f7ee74241b4134e6f5a
Bill Yi [Fri, 27 Oct 2017 00:08:39 +0000 (00:08 +0000)]
Import translations. DO NOT MERGE
am:
68d7f87f78 -s ours
Change-Id: I408c19b81f14324b9d445f1a90a087b413583b7d
Romain Guy [Fri, 27 Oct 2017 00:08:33 +0000 (00:08 +0000)]
Add new color mode setting
am:
9143fb26b4 -s ours
Change-Id: I0ba85e94b8cbc85868949f1ed9f7d68242e1eb0b
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Merged-In: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
(cherry picked from commit
e1543a3895a3b0b3af1ac1580b2d5a893ac119a7)
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Test: build
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Merged-In: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
(cherry picked from commit
05fa18f8474cd5fed798e7ee7ef099682c4a4475)
Christine Franks [Wed, 25 Oct 2017 15:55:52 +0000 (08:55 -0700)]
DO NOT MERGE - Move color mode to DisplayTransformManager
Bug:
68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I6cb3287ab4a8043e41765d55da24914f1744dcfa
Chia-I Wu [Wed, 25 Oct 2017 04:28:59 +0000 (04:28 +0000)]
Merge "Add new color mode setting" into oc-mr1-dev
Romain Guy [Tue, 24 Oct 2017 20:59:40 +0000 (21:59 +0100)]
Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)
The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).
Bug:
68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
Bill Yi [Tue, 24 Oct 2017 17:24:03 +0000 (10:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68159303
Change-Id: Ia8f0496b1f43d4072ad97b97d8ff7efa1fb19170
Rajeev Kumar [Fri, 20 Oct 2017 19:44:17 +0000 (12:44 -0700)]
Remove SearchIndexProvider from DataPlanUsageSummary fragment.
This change will prevent showing Data plan usage in the settings search.
Data plan usage feature has been punted to next release and we do not
want to show this to user in current release.
Bug:
68022715
Test: make RunSettingsRoboTests -j40
Change-Id: I56b71796e3c426122434ca9e86c1a2db691849cf
DO NOT MERGE
Fan Zhang [Mon, 23 Oct 2017 23:30:12 +0000 (16:30 -0700)]
Add strings to support multi-state vivid color management
Bug:
68159303
Test: rebuild
Test: Rerun existing robotests
Change-Id: I893278b7b42df82f58d8c9834e7147692e36670f
Jeff Sharkey [Wed, 18 Oct 2017 21:52:46 +0000 (21:52 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours am:
a00521b3a0
am:
16776b64c8
Change-Id: I96d84487e79ac34428c1b784228745074499cbd9
Jeff Sharkey [Wed, 18 Oct 2017 21:51:30 +0000 (21:51 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours am:
a829548c12
am:
3de9e565c8
Change-Id: I965ee6c01f5394f390900002295b3d695790d00d
Jeff Sharkey [Wed, 18 Oct 2017 21:32:46 +0000 (21:32 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5 am:
a637e31547 -s ours
am:
a00521b3a0
Change-Id: Idd7111058107886b24ed208ad09d3b13e945de8d
Jeff Sharkey [Wed, 18 Oct 2017 21:31:42 +0000 (21:31 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3 am:
2a2d92eee8 -s ours
am:
a829548c12
Change-Id: Id3b794c734d743757bc5d70f3386fed1c8640c69
Jeff Sharkey [Wed, 18 Oct 2017 21:01:38 +0000 (21:01 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49 am:
397a3555b5
am:
a637e31547 -s ours
Change-Id: Ic8c595d0e4847d36ee150763606353225be5a7ff
Jeff Sharkey [Wed, 18 Oct 2017 21:00:49 +0000 (21:00 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da am:
8f2a69fad3
am:
2a2d92eee8 -s ours
Change-Id: I3ab5a63962eee76a5f199f4be8243829dc943710
Jeff Sharkey [Wed, 18 Oct 2017 20:40:16 +0000 (20:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6 am:
629553fb49
am:
397a3555b5
Change-Id: I1cd5d59bfbb91806e18f9d33f1ccd897f99c745e
Jeff Sharkey [Wed, 18 Oct 2017 20:39:11 +0000 (20:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd am:
85cb0b43da
am:
8f2a69fad3
Change-Id: If4e97b0c8efd7223323f36954e2eb80aabeb881c
Jeff Sharkey [Wed, 18 Oct 2017 20:26:31 +0000 (20:26 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed am:
d88820f3f6
am:
629553fb49
Change-Id: I075b5225e91a419fbe5d5f6ecdbbf82ba5f1c550
Jeff Sharkey [Wed, 18 Oct 2017 20:25:25 +0000 (20:25 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3 am:
e341fe95bd
am:
85cb0b43da
Change-Id: Ic41907e9ca799e53b7796b25c5cfc818636988aa
Jeff Sharkey [Wed, 18 Oct 2017 20:06:55 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours am:
07c4c8efed
am:
d88820f3f6
Change-Id: If92103e13bdefcaeda54adfc6acf96352b57cd89
Jeff Sharkey [Wed, 18 Oct 2017 20:06:00 +0000 (20:06 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours am:
416ecb20a3
am:
e341fe95bd
Change-Id: Ifc18f5afec1707d19224428ac88399d7463adf9c
Jeff Sharkey [Wed, 18 Oct 2017 19:40:12 +0000 (19:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716 am:
91b1cb4b23 -s ours
am:
07c4c8efed
Change-Id: I7b2baeb9b01b6b9a3f2ab6ed7444601b703e001f
Jeff Sharkey [Wed, 18 Oct 2017 19:39:10 +0000 (19:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0 am:
fad1e6a315 -s ours
am:
416ecb20a3
Change-Id: I152a5dc22a05e3952f3b0bd162f2826580a26db2
Jeff Sharkey [Wed, 18 Oct 2017 19:27:49 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c am:
a954c8c716
am:
91b1cb4b23 -s ours
Change-Id: I5d27e57aed8586fd203bc6dacca480e97ab9ca25
Jeff Sharkey [Wed, 18 Oct 2017 19:27:11 +0000 (19:27 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9 am:
c1ebc09ff0
am:
fad1e6a315 -s ours
Change-Id: I46e94b20903455f26c62922aa735276434dc1fd0
Jeff Sharkey [Wed, 18 Oct 2017 19:21:53 +0000 (19:21 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39 am:
2bf724509c
am:
a954c8c716
Change-Id: I7ae7ab6c40fdcce484c39bdd3314dd4c831b3545
Jeff Sharkey [Wed, 18 Oct 2017 19:20:50 +0000 (19:20 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787 am:
9ba609cef9
am:
c1ebc09ff0
Change-Id: I8f4e5fbc1952b6c7014fbc8c7abac5fcf54af520
Jeff Sharkey [Wed, 18 Oct 2017 18:57:57 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours am:
19fa568b39
am:
2bf724509c
Change-Id: Ia037ac67d83799f104cd30b6caaaad8485ae0326
Jeff Sharkey [Wed, 18 Oct 2017 18:57:03 +0000 (18:57 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours am:
5b2a431787
am:
9ba609cef9
Change-Id: I9148b6352ab44e21e3a81a4d1bc783c867d614e8
Jeff Sharkey [Wed, 18 Oct 2017 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours am:
45fc104958 -s ours
am:
19fa568b39
Change-Id: Id8d333be6d14dac643447f1310629a1adc0fc2cc
Jeff Sharkey [Wed, 18 Oct 2017 18:39:25 +0000 (18:39 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
4cfc684346 -s ours
am:
5b2a431787
Change-Id: Ie5d9d4c5e7f0d9829ad807e7a43edd2d81001aaf
Jeff Sharkey [Wed, 18 Oct 2017 18:29:15 +0000 (18:29 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions. am:
5ef2cfac97 -s ours
am:
45fc104958 -s ours
Change-Id: Ibdd0283a40c9d8994b902f31ed2a80ff894384eb
Jeff Sharkey [Wed, 18 Oct 2017 18:28:28 +0000 (18:28 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
4cfc684346 -s ours
Change-Id: I16f3a2141ed4773b043e9d5553c7eb44e296b428
Pavel Grafov [Wed, 11 Oct 2017 21:57:09 +0000 (22:57 +0100)]
Preserve old password when handling SET_NEW_PASSWORD.
Currently the only way mUserPassword can be set is when it comes
from onActivityResult. This way when the user chooses "Continue
without Pixel Imprint", and we switch ChooseLockGeneric->InternalActivity,
mUserPassword becomes null (it is not preserved in intent extras).
And then this null is used in getLockPasswordIntent which causes the issue.
Another issues is that when the user chooses to use fingerprint,
mHasChallenge is set to true and password is not forwarded to
ChooseLock(Password|Pattern). I changed the intent builders so that both
old password and challenge can be sent at the same time, so the password
is not lost when fingerprint is set.
Bug:
67672081
Test: cd packages/apps/Settings/tests/robotests/ && mma
Test: manual, adb shell am start -a android.app.action.SET_NEW_PASSWORD,
tried setting pin/password with and without fingerprint.
Test: manual, tried to change lock via Settings -> Security&Location
Test: manual, set pin + fingerprint in Setup Wizard, FBE and FDE devices
Test: manual, set pin + added account, used pin to unlock FRP in SUW
Change-Id: I38d56d84f95c63fef24c2aa1a031d629f22756a1
Doris Ling [Fri, 13 Oct 2017 18:45:30 +0000 (11:45 -0700)]
Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.
Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes:
67750626
Test: visual
TreeHugger Robot [Thu, 12 Oct 2017 18:54:43 +0000 (18:54 +0000)]
Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
Jeff Sharkey [Wed, 11 Oct 2017 23:03:25 +0000 (23:03 +0000)]
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am:
5ef2cfac97 -s ours
Change-Id: I5b16d712ea2e7b7c98ccef5fc74fa47527e588e0