Abel Tesfaye
5c93b1df44
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: Ibdd8876cfb18ce275288ed3df984ab5902b4473b
2021-05-12 21:26:41 +00:00
Abel Tesfaye
08737147fb
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: I5f48ffb64e83a4307a1954ae5b13b9d4bd9e4566
2021-05-12 21:26:40 +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
789fd875b3
[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: I6cb4e928d0270b8ae7e9a86b16792386ffead306
2021-05-12 18:49:37 +00:00
Kevin Chyn
7f459bb888
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: I1819d509eb85c7a63fde3ba1c3519f8136d06ce1
2021-05-12 18:48:30 +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
438979693d
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: I8a1e942a795f608bee1f03e809a9e03d4a7e4b35
2021-05-12 17:21:25 +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
ceb8e815aa
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: I7417ce89163669e30940d6debfe27969c69ff2e1
2021-05-12 16:59:13 +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
ba98c7a2a1
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: I8d7d68697de07d87b845ae876bae665cf9b569c5
2021-05-12 16:05:46 +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
7df1df779b
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: I745c47feec86d6c5feeea2c9c1894185671fd205
2021-05-12 15:18:03 +00:00
Wesley Wang
0f8673407a
Merge "Update battery charging status string" into sc-dev
2021-05-12 14:57:30 +00:00
TreeHugger Robot
b9b6ef3ae0
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: Icaa8946754efe33c0cf934617fc7b0be01cf1007
2021-05-12 13:55:12 +00:00
TreeHugger Robot
36684c94d8
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: Id45d80b06e0def1731216e51f8a334823a160dcf
2021-05-12 13:55:05 +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
72129c3097
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: I986ecbf01ffe3043d79b7f73b66229d08e02431a
2021-05-12 10:32:12 +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
9b142d110b
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: Id2fe600645f240ce192db0caeefa9e39ababbcf8
2021-05-12 10:02:12 +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
0ba3c098bf
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: Ie7a73e282b69b76506c4582fc24340cbfce5f411
2021-05-12 09:53:49 +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
a346b68566
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: I643cba80260833999556743e65fc10bce85f3727
2021-05-12 09:01:01 +00:00
Menghan Li
dbfa9a70d6
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: I4369b173b2c030bfa00caea1eb5243fed73b2f9d
2021-05-12 09:00:55 +00:00
TreeHugger Robot
7ef815494c
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: Ide616df3f9cf81da3a36a082096df18b474bcd1b
2021-05-12 09:00:50 +00:00
Betty Chang
fcac4211c4
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: I790fc73b33f770cd7d454a52cc2cd47a96ca7a73
2021-05-12 09:00:31 +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
76fb754bb8
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: I6fe29e6f95c274112214fefaa59fa92a1f3a40ee
2021-05-12 07:11:23 +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
034d7f194a
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: I4423449061e3187f8a15c1ece2635707c3928ec3
2021-05-12 06:32:10 +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
ec06881420
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: Ia6b59847846800f30237c9945f5bd7d5d4613e14
2021-05-12 06:24: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
ykhung
28605dcf16
Should not show internal package entry in the usage list
...
Bug: 187770266
Test: make SettingsRoboTests
Change-Id: I56897c8f91295ba2139b7fda8c59a863130ecd86
2021-05-12 05:17:22 +00:00