Kevin Chyn
88936d4a46
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
2019-08-19 19:57:37 -07:00
Kevin Chyn
7b8e594e5c
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
Change-Id: Id77bc47085b72bbc04a9cee635fe288f3c8f7ef4
2019-08-19 19:57:30 -07:00
TreeHugger Robot
41aafab963
Merge "Remove attention controller" into qt-r1-dev
2019-08-20 02:37:20 +00:00
Kevin Chyn
ac55252e28
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
Change-Id: I031e6034ac2cc1bcd7a6d6e36c4fc28b9014636b
2019-08-19 15:11:17 -07:00
Kevin Chyn
59538f62c1
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
Change-Id: I59870f9318f9ac84107c437aaa660f3d28b861c5
2019-08-19 15:08:48 -07:00
Kevin Chyn
ca2bbdfeca
Merge "Remove delay from enroll start button" into qt-r1-dev
2019-08-19 21:50:22 +00:00
Bill Yi
9909286ace
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
2019-08-19 10:42:35 -07:00
android-build-team Robot
6327a11afd
Snap for 5811135 from 5188a0560f
to qt-qpr1-release
...
Change-Id: I6707a442fd7fd079623de9b9dc76dc8079d72b40
2019-08-17 23:10:11 +00:00
Bill Yi
5188a0560f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
-s ours
am skip reason: subject contains skip directive
Change-Id: I02568545b0452c41a81daf515960665dbf7516cc
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
-s ours
am skip reason: subject contains skip directive
Change-Id: Id230b9e65dd2bb45e599c6064be37203eb4ac014
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00:00
Arc Wang
2394d0821b
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
Change-Id: I7267b4fe82f6e5e6e6523463eb710049c68e66f9
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
f490c7cb7f
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
Change-Id: Ic8302db945bdf128bb04eda2ba6105abe6083ce0
2019-08-16 20:01:16 -07:00
Kevin Chyn
208b633c7e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
Change-Id: Ie03ff39347a98318bf44928124cdb0c4bae57f5c
2019-08-16 19:51:18 -07:00
Kevin Chyn
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
2019-08-16 19:42:52 -07:00
Kevin Chyn
e218dc0517
Merge "Update attention string" into qt-r1-dev
2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
...
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab
Remove attention controller
...
Bug: 139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1
Update attention string
...
Bug: 139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00
android-build-team Robot
6f843dbcfd
Snap for 5800161 from 7933af0273
to qt-qpr1-release
...
Change-Id: I3c0f015275c3ab7e6bb580952a1b35605a756de0
2019-08-14 05:26:38 +00:00
Yi Jiang
e6af4e136b
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
Change-Id: Iecc58066521d19bb58514eca667a5f4daecbe0de
2019-08-12 18:51:42 -07:00
Yi Jiang
7933af0273
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
2019-08-13 01:28:31 +00:00
android-build-team Robot
00cd8349ca
Snap for 5794870 from bde8c0a64d
to qt-qpr1-release
...
Change-Id: Ieeafbad5aec7848733d196eb2769edbdc751b1b4
2019-08-10 23:16:16 +00:00
Arc Wang
5776e726d0
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
am: bde8c0a64d
Change-Id: Ib7dc37d80825346c6c024c84f450f8762c21b3ef
2019-08-08 01:30:51 -07:00
Arc Wang
bde8c0a64d
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
1. Only support EAP-TLS for WPA3-Enterprise 192-bit
2. Remove "Do not validate" from the CA certificate menu
3. Remove "Do not provide" from user certificate menu
Bug: 135127581
Test: WifiConfigControllerTest
Change-Id: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
Merged-In: Ibf904da9407ec803afb8bb995e9df1a2e25f0dcb
2019-08-08 14:52:08 +08:00
Yi Jiang
811908f568
Don't show suggestion slice if 'Screen attention' is already on
...
Bug: 137259771
Fix: 137259771
Test: Manually
Change-Id: I5568b569ecd4db943f1a239c7ddcd2923bec4028
(cherry picked from commit 06f0bd6d4e
)
Merged-In: I5568b569ecd4db943f1a239c7ddcd2923bec4028
2019-08-05 17:06:24 +00:00
android-build-team Robot
c2953cfc94
Snap for 5779208 from 31cc369a4d
to qt-qpr1-release
...
Change-Id: I2dc6eebc9364f22d4e8be606ab84d199ac6a5e3f
2019-08-04 23:14:55 +00:00
Christine Franks
8e7f23910f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
Change-Id: I578907b141f2a6a705473394e16519507997caa8
2019-08-04 01:37:50 -07:00
Christine Franks
e003f38b53
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
Change-Id: I268d4d01a515e1c49b83e3c321af230cb06bffc9
2019-08-04 01:32:21 -07:00
Christine Franks
5bf177fa50
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
Change-Id: I467572888aa273e7ce4669dc5eb9456b501e8f47
2019-08-04 00:55:55 -07:00
Christine Franks
2b07a7e818
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
Change-Id: Icfb8e179f59529b30d3262c00d644257aa2f67f1
2019-08-04 00:55:36 -07:00
Christine Franks
31cc369a4d
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
Change-Id: Ie2b1e884d7501fb1d37ce816a5f4c78042be6300
2019-08-04 00:53:35 -07:00
Christine Franks
c48918dac0
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
Change-Id: Idca3e0d0855ced876f4bd891739e0141ec86a777
2019-08-04 00:53:29 -07:00
android-build-team Robot
bd0170ca58
Snap for 5778794 from 063cc34713
to qt-qpr1-release
...
Change-Id: I9e0c0f494dbb126e4e7666add8d8f1a23839b800
2019-08-03 23:13:28 +00:00
Christine Franks
37b38f872f
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
2019-08-03 14:47:40 +00:00
Christine Franks
ea14373666
[DO NOT MERGE] Update title for null uri when setting changes
...
Currently, the title will not update at all if set to silent.
Bug: 130445562
Test: make RunSettingsRoboTests -j48
Change-Id: Id8fc0182adb37c05436f5924b7dcdffb9d994e0d
2019-08-03 01:00:31 +00:00
Edgar Wang
09f2469440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
Change-Id: Ic856426092578e47418498de40e22aa484badb19
2019-08-01 23:00:15 -07:00
Edgar Wang
063cc34713
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
Change-Id: Ib1cf35ee24f88a9eae71714349fe40cb982214b0
2019-08-01 22:49:22 -07:00
Edgar Wang
345315c440
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
Change-Id: I37b7b29cd4c88948a6e7f0197bec84d0d1c2b0e4
2019-08-01 22:49:04 -07:00
Edgar Wang
8e3b202070
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
2019-08-02 05:38:23 +00:00
Daniel Solomon
6f2c664186
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 8e699b6ec8
Change-Id: I077cdf4c165158aa927f4d1aa0632b6c343b2fb2
2019-08-01 13:51:28 -07:00
Daniel Solomon
8e699b6ec8
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
Change-Id: I719cdde36a264519900584b9835d5c6e70cc5818
2019-08-01 13:38:20 -07:00
Daniel Solomon
c249d21eb4
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
Change-Id: Ic8e7827609bf0ae9862cbf38d7db5659c8107a6d
2019-08-01 13:27:42 -07:00
TreeHugger Robot
c5fbd7b669
Merge "Settings: change the color mode preview image" into qt-r1-dev
2019-08-01 19:58:47 +00:00
Youming Ye
e4b53c55d2
Check the missing useHomeWfMode case am: b7923f5a3f
...
am: 84049d217d
Change-Id: I101a0d837a4912e316c3cd25f6f829d15cbc8745
2019-08-01 11:58:55 -07:00
Youming Ye
d893200d78
Check the missing useHomeWfMode case
...
am: b7923f5a3f
Change-Id: I359a8f3a93837b54a119f7dd9d8a7ca3b508e257
2019-08-01 11:30:47 -07:00