Commit Graph

82173 Commits

Author SHA1 Message Date
Jakub Pawlowski
c7621e5c88 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0 am: b96d8078b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I831801c31ca9dcf8bd1092139a272e685ab1c713
2021-05-12 21:42:47 +00:00
Abel Tesfaye
55b1368af8 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6 am: bc59298a10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367

Change-Id: I08f242d897d96c5691ace7ec176d7ab771d7167f
2021-05-12 21:41:45 +00:00
Abel Tesfaye
b6c37a595d Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459 am: 0ce0ea15a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041

Change-Id: I38535c7566f7423dec504f97c12c5837056846c1
2021-05-12 21:41:43 +00:00
Jakub Pawlowski
b96d8078b7 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c am: bb78247cf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ic7b4785bc1504798c4114f5ece519b5bf017fe09
2021-05-12 21:28:41 +00:00
Abel Tesfaye
bc59298a10 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev am: 989570a9b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441367

Change-Id: I8cd52af6ed5bd2e38f564d103413fdf036278563
2021-05-12 21:28:25 +00:00
Abel Tesfaye
0ce0ea15a7 Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev am: 43905b3459
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14430041

Change-Id: I204e5aa0e861f715024419334ef6db0c5782ef0b
2021-05-12 21:28:23 +00:00
Jakub Pawlowski
bb78247cf0 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2 am: 72cda9d96c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I41cb6bd53a787214896c7875104c6b08419b3047
2021-05-12 21:12:09 +00:00
Jakub Pawlowski
72cda9d96c Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b am: c714533fd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ic9497921a93fb77c05f2d396503f0b3764734586
2021-05-12 20:57:26 +00:00
Jakub Pawlowski
c714533fd2 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
2021-05-12 20:36:41 +00:00
Lucas Lin
0fa0429eb2 [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours am: 209df66539 -s ours
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I4c4b8d4bec9647fbd0948cf440bacb03183cfd12
2021-05-12 20:20:38 +00:00
Kevin Chyn
304d0c6c7b Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11 am: cd9ea26bbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: I0b6d962f682f7243e454d15bf87a9a9d2e8015d8
2021-05-12 20:20:20 +00:00
Jakub Pawlowski
52ea712e3b Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883

Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
2021-05-12 20:19:16 +00:00
Abel Tesfaye
989570a9b6 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Abel Tesfaye
43905b3459 Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Jakub Pawlowski
3a2ab54f36 Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev 2021-05-12 19:27:19 +00:00
Lucas Lin
209df66539 [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours am: e5fcc54bfc -s ours
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: Iac9f11c79dd80cb201fde15ca4cb86db1ae07e2e
2021-05-12 18:51:14 +00:00
Kevin Chyn
cd9ea26bbe Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev am: cbf7e63d11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14506399

Change-Id: If67fb1c335bcfd86c7c1e7daee37d1b2332aaf80
2021-05-12 18:49:57 +00:00
Lucas Lin
e5fcc54bfc [automerger skipped] Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9 am: b6e2b4239c -s ours
am skip reason: Merged-In I47706efe9c53a00438fdec97fda244638cecb3dc with SHA-1 188d66a709 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I0d449ede5a55718480c284a4da6b84336049e19f
2021-05-12 18:24:14 +00:00
Lucas Lin
b6e2b4239c Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3 am: aa307b03a9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I460d308ab370a662b63a43c7e027e355c7d36130
2021-05-12 17:59:57 +00:00
Simon Wingrove
748d1d1cea Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e am: 1cc723877c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: Ibf8edb64ce50f6a617bcd622431e6bd56be31518
2021-05-12 17:59:21 +00:00
Kevin Chyn
cbf7e63d11 Merge "Update fingerprint introduction "Keep in mind" section" into sc-dev 2021-05-12 17:44:11 +00:00
Lucas Lin
aa307b03a9 Merge "Use [set|get]PrivateDnsMode directly" am: 2e7309ffd3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1675475

Change-Id: I18cd6578c4cec746aa1cfaba60822d857fab9b8d
2021-05-12 17:23:45 +00:00
Simon Wingrove
1cc723877c Merge "Allow security controllers to be used in other fragments." into sc-dev am: 47b5eadc5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14485179

Change-Id: I585e871debe441fb7af4ebae31cad57792d037ed
2021-05-12 17:23:20 +00:00
YUKAI HUNG
09a87e1530 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4 am: 3c56056709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: I99946695f1886c79427f60a02a306aa004b28732
2021-05-12 17:14:09 +00:00
Lucas Lin
2e7309ffd3 Merge "Use [set|get]PrivateDnsMode directly" 2021-05-12 17:09:50 +00:00
Simon Wingrove
47b5eadc5e Merge "Allow security controllers to be used in other fragments." into sc-dev 2021-05-12 17:07:08 +00:00
YUKAI HUNG
3c56056709 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev am: 0d765c45a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514139

Change-Id: I35a788d50c0677cab2e8db1586ebde87fd645bdc
2021-05-12 17:00:54 +00:00
YUKAI HUNG
0d765c45a4 Merge "Fix GAR issue for battery chart description and the contrast ratio" into sc-dev 2021-05-12 16:46:38 +00:00
TreeHugger Robot
0bfadc10d7 Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b am: 30a1d20c84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518

Change-Id: I8796d41c6b66c6434bc2df30428a9edd611ac4fd
2021-05-12 16:30:01 +00:00
TreeHugger Robot
30a1d20c84 Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev am: 839207436b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14489518

Change-Id: Ifa88aacfe3f7699bc983fe840c392c22b86f4803
2021-05-12 16:07:07 +00:00
TreeHugger Robot
839207436b Merge "[Provider Model] Show "!" icon when Wi-Fi is not validated (panel)" into sc-dev 2021-05-12 15:51:37 +00:00
ykhung
2102059e2d Fix GAR issue for battery chart description and the contrast ratio
Bug: 187813918
Bug: 187811403
Test: make SettingsRoboTests
Change-Id: I4fae623a305fd1ee022336bcae35d9dd9995146d
2021-05-12 15:38:33 +00:00
Wesley Wang
0a5b46b87c Merge "Update battery charging status string" into sc-dev am: 0f8673407a am: 0f693af408
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133

Change-Id: I4cd73792cd1ddd4d412c5feb6058ca432cbbed6e
2021-05-12 15:33:06 +00:00
Wesley Wang
0f693af408 Merge "Update battery charging status string" into sc-dev am: 0f8673407a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514133

Change-Id: If802b2d8842d4b6ea8ca9f1e39ecc0aa9db63c83
2021-05-12 15:19:09 +00:00
Wesley Wang
0f8673407a Merge "Update battery charging status string" into sc-dev 2021-05-12 14:57:30 +00:00
TreeHugger Robot
37bcbac813 Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c am: 5e1febaf38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816

Change-Id: I2bcd68e10b832d28f365301222504c8b193923ff
2021-05-12 14:10:09 +00:00
TreeHugger Robot
e052b98f0d Merge "Don't show DND access settings in managed users" into sc-dev am: 4784df542d am: 2b431505d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470058

Change-Id: I49ffe518ef505fc4386c38b2ad25bff14549eb5c
2021-05-12 14:10:01 +00:00
TreeHugger Robot
5e1febaf38 Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816

Change-Id: I5c302b9e599694219a24406cba4d829ca541985b
2021-05-12 13:56:44 +00:00
TreeHugger Robot
2b431505d9 Merge "Don't show DND access settings in managed users" into sc-dev am: 4784df542d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470058

Change-Id: I1c8cc4f0c1f05fadae8ccc473f4b0714366803e4
2021-05-12 13:56:28 +00:00
TreeHugger Robot
1f9e88377c Merge "Fix NPE on guest user" into sc-dev 2021-05-12 13:32:08 +00:00
TreeHugger Robot
4784df542d Merge "Don't show DND access settings in managed users" into sc-dev 2021-05-12 13:28:47 +00:00
Wesley.CW Wang
2c6fd8fd3b Update battery charging status string
- Present status string only when status anomalous
 - Remove app usage pages divider

Bug: 185448191
Bug: 187767337
Bug: 187778673
Test: make SettingsRoboTests
Change-Id: I7829e9deed05fb7d95d483ddb718abfdc53b1aa6
2021-05-12 21:14:23 +08:00
Wesley Wang
0c60387b00 Merge "Update battery state string" into sc-dev am: e966debfd5 am: ac62a0a172
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886

Change-Id: Ie9b32530073c3ac8acf860feb11c6d770eab77e5
2021-05-12 10:25:15 +00:00
Wesley Wang
ac62a0a172 Merge "Update battery state string" into sc-dev am: e966debfd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14495886

Change-Id: I4c9157824d6641b18f8171802df7056dd946480b
2021-05-12 10:18:58 +00:00
Weng Su
a0d4c657c7 [Provider Model] Show "!" icon when Wi-Fi is not validated (panel)
- Screenshot:
  https://screenshot.googleplex.com/BLNcfXiJFnuoT9N

Bug: 185454486
Bug: 185637977
Bug: 186543071
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest

Change-Id: Idff6bb8b394db5553cf399d2020aa28d9dedfc74
2021-05-12 10:17:54 +00:00
Betty Chang
d60c4f44cd Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev am: 8081c1fbdc am: bc3f743d58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501879

Change-Id: If84c10273bc2a20057bf6b5d709e1064f4ef32e3
2021-05-12 10:17:19 +00:00
YUKAI HUNG
4c366be30c Merge "Clear static icon and label cache if ui mode is changed" into sc-dev am: d78cd7272d am: becb4874d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514123

Change-Id: Ic0861e0f2dd816eee58610ad0dd125c1aae2f4fc
2021-05-12 10:17:13 +00:00
Wesley Wang
e966debfd5 Merge "Update battery state string" into sc-dev 2021-05-12 10:14:58 +00:00
Betty Chang
bc3f743d58 Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev am: 8081c1fbdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14501879

Change-Id: Iac8ee6c51a15bca92ba3129b0abfdc262514eb9f
2021-05-12 10:03:45 +00:00
Betty Chang
8081c1fbdc Merge "[GAR] Change the text color for "Airplane mode is on" message to follow the GAR" into sc-dev 2021-05-12 09:56:09 +00:00