Jakub Pawlowski
cebc80d634
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours am: 8ae86914d6
-s ours am: 694f25b2c7
-s ours am: b0da292758
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I200b463a5d65a565eb0d3321c02a9bd467878e2c
2021-05-12 21:26:21 +00:00
Jakub Pawlowski
7623ac8a68
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: I2f63786d11a9a1cf5b7d539196d2386dd0f36914
2021-05-12 21:26:13 +00:00
Abel Tesfaye
3f37a074d4
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: I62b1b5f692c4429757235dbe5ad4413fe3c33dde
2021-05-12 21:25:55 +00:00
Abel Tesfaye
766b3d099a
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: I2d56896f4073a2922b25509cb8e1b233acb912bd
2021-05-12 21:25:54 +00:00
Jakub Pawlowski
b0da292758
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours am: 8ae86914d6
-s ours am: 694f25b2c7
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I8a18f3daaac645a495de33a0e479fa699857c872
2021-05-12 21:12:17 +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
694f25b2c7
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours am: 8ae86914d6
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I5c4bcf5792f7e9a5564444bb5d5c98f473e1b619
2021-05-12 20:57:33 +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
8ae86914d6
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours am: 31c29a0791
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I1cd894a5924c4afc52256d85f9a19da5a2cede22
2021-05-12 20:36:51 +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
31c29a0791
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours am: 8797825bc1
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I145082eccf613bb5729b67a7f58a34f3c913184e
2021-05-12 20:19:24 +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
Jakub Pawlowski
8797825bc1
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
am: d6ed1528cb
-s ours
...
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I65f86808c2d2455c98c022ad52680597c58ff148
2021-05-12 20:04:53 +00:00
Jakub Pawlowski
d6ed1528cb
Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
2021-05-12 19:47:21 +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
9d99e0b3ff
Prevent drawing on top of DevicePickerActivity
...
Bug: 182584940
Merged-In: I8b27b397bce1708a42b96b1b647c64e23142c468
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
2021-05-12 19:27:32 +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
eb65d2eede
[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: I234ea6e285e237f51d14b25ca686b819681b9f9b
2021-05-12 18:48:47 +00:00
Kevin Chyn
1de4861f75
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: I907d6b7d15df9e074f2092293265da2bde10e971
2021-05-12 18:48:21 +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
6b741c5a88
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: Id8d6cfe0654c88dc3f8276d2d8fe56352783703d
2021-05-12 17:21:57 +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
a3f81730fb
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: I76d63f899b74f158ac84ce93c731f9d3f6adc04f
2021-05-12 16:56:52 +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
ab1088f14d
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: I9b6ba81b9fbc37aa69330764f63c589d995047da
2021-05-12 16:05:44 +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
10b2fb5ea5
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: I7f6f23771dbcc84bebdd3a1216bbd4d8e0a9bc6f
2021-05-12 15:17:00 +00:00
Wesley Wang
0f8673407a
Merge "Update battery charging status string" into sc-dev
2021-05-12 14:57:30 +00:00
TreeHugger Robot
4cc160c9dc
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: I404d1e57f7763c6646f036bb8c8e26e327153c55
2021-05-12 13:54:51 +00:00
TreeHugger Robot
43d219b8dc
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: Icf7425fdd761fe35b623638e131d2a2fe8b429f3
2021-05-12 13:54:29 +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
82bfe543b4
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: Iceac9effabb476b3bf0429db5a7326de338ddc86
2021-05-12 10:29:47 +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
4e6c1e163b
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: I83c2560dc46d1e6c799a50fab731b44eb4daae05
2021-05-12 10:00:34 +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
8d9e565cc1
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: Ia717acae65b401da15d3a28234c99a00d1c3152f
2021-05-12 09:51:40 +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
3117ab7481
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: Ia81e71842f0870188d81fbc94bfb9b644bc62c26
2021-05-12 08:59:28 +00:00
Menghan Li
8accadcc1c
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: I54b2fcd3d7fa766d21b1cad611292d04a989c3b5
2021-05-12 08:59:22 +00:00
TreeHugger Robot
fb67b5622f
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: Icb90a284135aa5ed402acbac35b2f9672175bc6d
2021-05-12 08:59:15 +00:00
Betty Chang
d90197803c
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: Iddc540b112bd0e0b10135029c83f9035c7fd0c4c
2021-05-12 08:58:55 +00:00