Abel Tesfaye
dd2aab02f7
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: I6527c2778eb2e20936456cb063c080991724ad9f
2021-05-12 21:26:36 +00:00
Abel Tesfaye
a4f4f50eef
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: Id755391ca396bce2da9526bd03e49905b25929be
2021-05-12 21:26:34 +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
Lucas Lin
7edee6aa73
[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: I014f3046d027d25390d0dcdd2f73e6d51442fc2a
2021-05-12 18:49:37 +00:00
Kevin Chyn
4fd8be6a16
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: If590b192c513bba270da67eaf4bb72f44b8cb421
2021-05-12 18:48:29 +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
ee1c12a870
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: I6fa35879e7848b3ca78cc3e9db14ed0f65ab2ed6
2021-05-12 17:21:06 +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
14c574f6c8
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: I87667fd8350f235f38a10f586b0c87a85d07439a
2021-05-12 16:58:58 +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
7a19462201
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: I69ac7745b6d1e587a7d890faf2d1a21e308646ab
2021-05-12 16:05:35 +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
634496dda1
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: I4d48fdf9f3f71c02209757b497a1be721899bd0d
2021-05-12 15:17:11 +00:00
Wesley Wang
0f8673407a
Merge "Update battery charging status string" into sc-dev
2021-05-12 14:57:30 +00:00
TreeHugger Robot
22652621f9
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: Ia7dd2ca40b7a3d33e157aad2bdee9ec5fe2ee7a2
2021-05-12 13:55:12 +00:00
TreeHugger Robot
baedfb43c0
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: I10a6d3e8bb3e1054721e742d5affbd6a3e549ec6
2021-05-12 13:54:52 +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
3e7ec9bcf0
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: I24d6a2239c2d2577c0c0bb3286d6c9edd39aaac2
2021-05-12 10:31:56 +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
3394850b21
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: I3f8b28e021bc6781a337b888b212bfdc06ea2f2e
2021-05-12 10:01:56 +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
7a471760ea
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: Ifa38475def3d22e67b6982174c67631c217bb927
2021-05-12 09:53:42 +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
f24a6d011e
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: Ided1aa9691700ecadb5451764a117318becbee68
2021-05-12 09:00:39 +00:00
Menghan Li
f844bdd355
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: If63815ee9d0704744a9f553c0738359fa646d209
2021-05-12 09:00:33 +00:00
TreeHugger Robot
ab53492a65
[automerger skipped] Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035
-s ours
...
am skip reason: Merged-In I8361c29bc240c519c7261b19522c41439479c1c2 with SHA-1 fa6e82b879
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352146
Change-Id: I1082fc4ba917d8e80f3ad9f5f628aef61ac28f05
2021-05-12 09:00:27 +00:00
Betty Chang
f7350bea09
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: Ia5977fbf5499473e8cbef078099def90a5baa02d
2021-05-12 09:00:16 +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
0f2524b6e3
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: I9b450f56fa4711a3578b216cb8a186daf5f56298
2021-05-12 07:09:15 +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
YUKAI HUNG
55f9c92e00
Merge "Should not show internal package entry in the usage list" into sc-dev am: 0d00ace0d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511219
Change-Id: I391e5b838a70c431ecf31b51f032d6eb274602a6
2021-05-12 06:31:57 +00:00
YUKAI HUNG
0d00ace0d2
Merge "Should not show internal package entry in the usage list" into sc-dev
2021-05-12 06:24:55 +00:00
Kevin Han
dd601a2f78
Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev am: 421c4e3efc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471254
Change-Id: I454a0a9e40007ffbcce78b5fbfb565373313ca6f
2021-05-12 06:22:29 +00:00
TreeHugger Robot
b3287c4461
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-05-12 06:06:51 +00:00
Kevin Han
421c4e3efc
Merge "Fix "X unused apps" string to match w/ unused apps" into sc-dev
2021-05-12 06:06:49 +00:00
menghanli
7979d9337a
[Material Next] Support "Learn more" for help link
...
Allow CaptionManager, Magnification, Color correction, Color inversion,
Time to take action, and Autoclick.
Bug: 187671696
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityFooterPreferenceTest
Change-Id: I9d753243d4f61b6b3d58b50425b7a75a812a481d
2021-05-12 13:53:44 +08:00