PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,088 Commits 1 Branch 0 Tags
82c75c6eae4c2b5eb8b4872b43ba645e9de3af3c
Commit Graph

55088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Xin Li
c3ef16882d DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master 
Bug: 139369544
Change-Id: I483962d870c69d1c454d5bc04c76d9f7d7a12520
 2019-08-13 16:36:39 -07:00
android-build-team Robot
573db8a758 Snap for 5674421 from 4a949c0640 to pi-platform-release 
Change-Id: Idb0d7d08f9581908c2f5e2881a73b1c806f1ddb9
 2019-08-13 16:25:08 +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
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
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
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
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
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
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
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
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
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
android-build-team Robot
d767898bf1 Snap for 5778854 from 37b38f872f to qt-c2f2-release 
Change-Id: I65f2c3f99c9767109fb4aa653b2e4afcfeedfa51
 2019-08-03 23:02:29 +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
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
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
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
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
android-build-team Robot
3c6f2108a8 Merge cherrypicks of [9131405, 9130772, 9131110, 9131093, 9131019, 9131394, 9131395, 9131396, 9131406, 9131480, 9131397] into qt-c2f2-release 
Change-Id: Ib91991cbbbda41bae347ca9f17e1405e9d960f89
 2019-08-02 04:02:33 +00:00
Daniel Solomon
eb15083e1b 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
(cherry picked from commit 56574d5924)
 2019-08-02 04:00:51 +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
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
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
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
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
d893200d78 Check the missing useHomeWfMode case 
am: b7923f5a3f

Change-Id: I359a8f3a93837b54a119f7dd9d8a7ca3b508e257
 2019-08-01 11:30:47 -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