Jordan Liu
eda0936e38
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7
am: 1fc63fc444
...
am: 028f2c87a1
Change-Id: I6f6c67b41652ce9b2638aca922ad489db74a0495
2019-08-13 19:13:45 -07:00
Jordan Liu
028f2c87a1
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
am: b377a593b7
...
am: 1fc63fc444
Change-Id: I114db364c10315dca50b75270fc14da7eaf1d354
2019-08-13 19:01:30 -07:00
Jordan Liu
1fc63fc444
Merge "Allow radio info on phones with no subscription" am: 19d1f890a0
...
am: b377a593b7
Change-Id: Ibe68e60583fdf2bd08d6d8f62b5c942878dd160e
2019-08-13 18:48:49 -07:00
Jordan Liu
b377a593b7
Merge "Allow radio info on phones with no subscription"
...
am: 19d1f890a0
Change-Id: Ia63778cf83212b2670413e2567c068bf92f6ff05
2019-08-13 18:37:15 -07:00
Jordan Liu
19d1f890a0
Merge "Allow radio info on phones with no subscription"
2019-08-14 00:22:42 +00:00
Yi Jiang
943e7b34e8
Merge "Don't show suggestion slice if 'Screen attention' is already on" into qt-qpr1-dev
...
am: 7933af0273
Change-Id: Ibb750cc10763ade05e3f611a22e602ea3ebe7d5e
2019-08-12 18:41:16 -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
Jordan Liu
655c1be579
Allow radio info on phones with no subscription
...
Some info is still helpful for debugging in these cases.
Bug: 139074613
Test: manual
Change-Id: Idbde691c60b53e0ab755df229a3a9dc77406934d
Merged-In: Idbde691c60b53e0ab755df229a3a9dc77406934d
2019-08-12 19:02:27 +00:00
Arc Wang
3e64c28534
[Wi-Fi] Remove unsupported EAP methods for WPA3-Enterprise 192-bit
...
am: bde8c0a64d
Change-Id: I82e94257097ab902a72a0dc7d64ff50241938e24
2019-08-08 01:21:32 -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
Christine Franks
4f05fc52bf
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: 31cc369a4d
Change-Id: I0d5e1ef4822616b275f95cba16f3be03a8086973
2019-08-04 01:38:30 -07:00
Christine Franks
c18d0d3090
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: c48918dac0
Change-Id: I3a48b53a963779a61c0608ee921d9f91280a04c3
2019-08-04 01:37:51 -07:00
Christine Franks
e4ffff1ce5
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev am: 37b38f872f
...
am: c586c923aa
Change-Id: Ia18317e871e376f971335c65dedef59292852103
2019-08-04 01:36:00 -07:00
Christine Franks
3cb194c627
[DO NOT MERGE] Update title for null uri when setting changes am: ea14373666
...
am: caebfbe9c9
Change-Id: I488f73f99895fa4aa9e5ae23544684c56b69c78a
2019-08-04 01:34:46 -07:00
Christine Franks
c586c923aa
Merge "[DO NOT MERGE] Update title for null uri when setting changes" into qt-r1-dev
...
am: 37b38f872f
Change-Id: I298f71e7db0840e83af06f5662d6af2d5c60bbac
2019-08-04 00:55:55 -07:00
Christine Franks
caebfbe9c9
[DO NOT MERGE] Update title for null uri when setting changes
...
am: ea14373666
Change-Id: I8f542126d98beefe8f221266b7f25bc9d7b0f4d5
2019-08-04 00:55:33 -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
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
Android Build Merger (Role)
1c98867b18
Merge "Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
am: 063cc34713" into qt-qpr1-dev-plus-aosp
2019-08-02 06:01:14 +00:00
Edgar Wang
73ae3701fc
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 063cc34713
Change-Id: I1f16586a9268f9afb6e8f85319ba03e91e5c98b4
2019-08-01 23:00:28 -07:00
Edgar Wang
fc0aec7f1a
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev am: 8e3b202070
...
am: 3448917d8e
Change-Id: Ib451284c689f984e8064af58ef538b34e8ec6784
2019-08-01 23:00:21 -07:00
Edgar Wang
3448917d8e
Merge "Add skip lock screen in Notification & security lock screen settings" into qt-r1-dev
...
am: 8e3b202070
Change-Id: Ic8c1eb744a1612fedd187902e65d7718500f4e8d
2019-08-01 22:49:22 -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
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
2b40b40a95
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 4c1fa1a5d1
Change-Id: Iedf98f0f2b96ff79c567457c2aad7f2ef8e2e434
2019-08-01 13:54:52 -07:00
Daniel Solomon
442a2b26b4
Merge "Settings: change the color mode preview image" into qt-r1-dev am: c5fbd7b669
...
am: 8e699b6ec8
Change-Id: I5fb775ba96631cbf9ac28b2c9946d2915ea99c10
2019-08-01 13:53:32 -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
4c1fa1a5d1
Merge "Settings: change the color mode preview image" into qt-r1-dev
...
am: c5fbd7b669
Change-Id: Icfc151ca32fa3ab44a68acc4732e3e9307372f22
2019-08-01 13:37:33 -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
a427771754
[automerger skipped] Check the missing useHomeWfMode case am: b7923f5a3f
...
am: 84049d217d
-s ours
am skip reason: change_id If89c67c0595808a1339517c6084f1d1e23f5974b with SHA1 b7923f5a3f
is in history
Change-Id: I3bf159aeec518e09d910ca4ec9c96dc74f68fae3
2019-08-01 11:43:22 -07:00
Youming Ye
34599f661d
Check the missing useHomeWfMode case am: b7923f5a3f
...
am: de8c3c5fd3
Change-Id: I068d40471deb73869b0586e2bd4ebbba522ac85d
2019-08-01 11:41:05 -07:00
Youming Ye
84049d217d
Check the missing useHomeWfMode case
...
am: b7923f5a3f
Change-Id: I81aadd772a8c8b07ca6c967868789aa91fe0dba9
2019-08-01 11:27:48 -07:00
Youming Ye
de8c3c5fd3
Check the missing useHomeWfMode case
...
am: b7923f5a3f
Change-Id: I8ffa6acb13e07b4a28b8f46b348ffc47c143a317
2019-08-01 11:24:55 -07:00
Edgar Wang
58a5be4401
Add skip lock screen in Notification & security lock screen settings
...
Users may have trouble finding this setting in face auth.
Heard this from dogfood/executive feedback and customer support discussion.
So add Skip Lock Screen preference in
Display > Lock screen display > What to show >
and
App & Notifications > Notifications > Lock Screen >
Bug: 138458558
Test: robotest & manual
Change-Id: I10e420821423821743d65b00c8b7e6d4d1224e00
2019-08-01 11:17:05 +08:00
Youming Ye
b7923f5a3f
Check the missing useHomeWfMode case
...
Bug: 133812904
Test: Build
Change-Id: If89c67c0595808a1339517c6084f1d1e23f5974b
Merged-In: If89c67c0595808a1339517c6084f1d1e23f5974b
2019-07-31 16:38:32 -07:00
Antony Sargent
afb537f589
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: e744ee1295
Change-Id: I823994fa96593030d1baf3baa3fa10940dc1c9c5
2019-07-31 16:24:14 -07:00
Bill Yi
f3eb3758eb
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c
-s ours
...
am: f580528464
-s ours
am skip reason: subject contains skip directive
Change-Id: Iff96dd12f5e8ce6ea3f63d442ca549d78a94eb54
2019-07-31 16:07:46 -07:00
Antony Sargent
bf2c5ce274
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev am: 4685c785b9
...
am: ad2f49f851
Change-Id: I3caaf466e7c62cee4de6ef2a4e9695e8725736f1
2019-07-31 16:06:59 -07:00
Bill Yi
1aef5e268e
[automerger skipped] Import translations. DO NOT MERGE am: 5a690f3c4c
-s ours
...
am: 1ccff0ddc6
-s ours
am skip reason: subject contains skip directive
Change-Id: I4d033bda95f189c0617f59cffb021c31f477cab7
2019-07-31 16:05:53 -07:00
Antony Sargent
e744ee1295
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
Change-Id: I1ce1afeee9ab139ff47a1deec14d536c8c9529ad
2019-07-31 16:04:54 -07:00
Antony Sargent
ad2f49f851
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
...
am: 4685c785b9
Change-Id: I5792ff5333005e2e0c66fd24d594b79bf67d140c
2019-07-31 15:56:00 -07:00
Bill Yi
1ccff0ddc6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic10bfa052664715f150c09abfc3f0015aa530ee8
2019-07-31 15:53:52 -07:00
Bill Yi
f580528464
[automerger skipped] Import translations. DO NOT MERGE
...
am: 5a690f3c4c
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibc64425d1a731f6cbd45d44b18537edfdd88acbd
2019-07-31 15:53:13 -07:00
TreeHugger Robot
4685c785b9
Merge "Protect entry points to add an eSIM when admin restricted" into qt-r1-dev
2019-07-31 22:39:22 +00:00
Antony Sargent
482415d37e
Protect entry points to add an eSIM when admin restricted
...
If the DISALLOW_CONFIG_MOBILE_NETWORKS admin policy is set, we were
accidentally still allowing access to the flow where you add an eSIM
subscription via the "plus" button on the Network & internet page. While
fixing this, I also noticed that the mobile networks list page (which
only becomes available if you have multiple subscriptions) has a link at
the bottom to start the flow as well, and that wasn't being protected.
The fix for the plus button on the Network & internet page was just to
make sure not to call setEnabled(true) if the preference was already
disabled by admin policy, since that has the effect of overriding the
admin-disabling.
The fix for the mobile networks list page just needed to add the
relevant tags in the layout XML, and then we get it for free.
Fixes: 137627845
Test: make RunSettingsRoboTests
Change-Id: I896ac248f50aaeecc157791938a0a0a98265aa07
2019-07-31 12:53:39 -07:00
Daniel Solomon
56574d5924
Settings: change the color mode preview image
...
Change the color mode preview image to better illustrate the difference
between Natural and Boosted color modes.
Bug: 138126243
Test: manual testing on Pixel
Change-Id: I367b383f9f2da9b2e2d5960e51c3ec7821d4915b
2019-07-31 12:48:23 -07:00
Bill Yi
5a690f3c4c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I3e51c61d9bdff182bc83a04242ccd6e1e4f9629d
2019-07-31 12:09:08 -07:00