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
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
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
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
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
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
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
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
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
YUKAI HUNG
becb4874d0
Merge "Clear static icon and label cache if ui mode is changed" into sc-dev am: d78cd7272d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14514123
Change-Id: Idda30d4418727cc1b39b507cce8dd9380b24943a
2021-05-12 09:55:18 +00:00
YUKAI HUNG
d78cd7272d
Merge "Clear static icon and label cache if ui mode is changed" into sc-dev
2021-05-12 09:21:23 +00:00
Menghan Li
e2fd5336fa
Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677
Change-Id: Id8f44c1e0c24af514d2b69ba3eee565309c4f962
2021-05-12 09:02:59 +00:00
Menghan Li
5d16f0016e
Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196
Change-Id: I976439b8928f711fcb7d9b484838d800a297637e
2021-05-12 09:02:55 +00:00
TreeHugger Robot
c2937740e6
Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352146
Change-Id: I9dcccebb62be55148a3811bd0f819a320662c604
2021-05-12 09:02:51 +00:00
Betty Chang
d76d734a91
Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684
Change-Id: Ibb2be02a34f3c3471c186987b0364facf21fc00f
2021-05-12 09:02:32 +00:00
Menghan Li
fd05966f4f
Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev
2021-05-12 08:49:55 +00:00
Menghan Li
7bdf791e6c
Merge "[Material Next] Support "Learn more" for help link" into sc-dev
2021-05-12 08:44:30 +00:00
TreeHugger Robot
0b43270035
Merge "Implements profile selection tab in Storage Settings" into sc-dev
2021-05-12 07:48:43 +00:00
Betty Chang
d3cbec6488
Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev
2021-05-12 07:42:37 +00:00
menghanli
11a0700847
Fix style in "Vision Settings" is inconsistent
...
Root cause: "Accessibility button" page apply BC style but other pages in SUW didn't. It causes page style inconsistency.
Solution: Don't show annotation link to make user open "Accessibility
button" page during SuW.
Bug: 187658718
Test: Manual testing
Change-Id: I6cc3da9a72b68829efd5537ae93fc329ef716fb4
2021-05-12 07:16:05 +00:00
TreeHugger Robot
3509ae87e4
Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218
Change-Id: I5685379c15000523eac23d2aa22c89be29d7b9e8
2021-05-12 07:13:03 +00:00
TreeHugger Robot
a1bfc7daeb
Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev
2021-05-12 06:54:02 +00:00
ykhung
5a783d0815
Clear static icon and label cache if ui mode is changed
...
we should clear icon cache if theme is changed between light and dark
theme, otherwise we may show incorrect styled icon for applications
Bug: 185187729
Test: make SettingsRoboTests
Change-Id: Ib06abe5a5345b2ea363a04ecaec886a4765fd8ab
2021-05-12 06:53:56 +00:00