Commit Graph

85210 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Menghan Li
ab21467a53 Merge "Fix style in "Vision Settings" is inconsistent" into sc-dev am: fd05966f4f am: e2fd5336fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493677

Change-Id: I96fe285426c8fc23c92d6901679c019859a363fa
2021-05-12 09:24:00 +00:00
Menghan Li
a8a43a11d9 Merge "[Material Next] Support "Learn more" for help link" into sc-dev am: 7bdf791e6c am: 5d16f0016e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486196

Change-Id: I110ca2788362df24b2d229196f397b8b87736e0c
2021-05-12 09:23:55 +00:00
TreeHugger Robot
01393e73f4 Merge "Implements profile selection tab in Storage Settings" into sc-dev am: 0b43270035 am: c2937740e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352146

Change-Id: I16ebd28937138127081e35cf845ee7e87e40a3f0
2021-05-12 09:23:50 +00:00
Betty Chang
2663e3073a Merge "[GAR] Remove the registerForContextMenu for getting the correct TalkBack feedback" into sc-dev am: d3cbec6488 am: d76d734a91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493684

Change-Id: I6533ee71ce106cb82921a0feae4da8dbdcfbbaf7
2021-05-12 09:23:38 +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
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
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
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
Jernej Virag
fd540cbb0c Fix power+volume chord fallback when LPP option is disabled
Not all devices will have power+volume chord enabled. Fix current wrong behaviour by falling back to mute chord behaviour only if it was set as the default option in device overlay.

Bug: 187814162
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.gestures.*"
Change-Id: I15c0a71d25738b3b01a20bf22c790d9dcba5d6fd
2021-05-12 08:39:03 +00:00
Jason Chiu
7d9dceadb7 Redesign homepage IA icon
- remove the outer circle of the icons
- tint the icons including injected ones

Test: robotest, visual
Bug: 182870640
Change-Id: If72c37152f4f0d68e25149b11d497eef1c7ece91
2021-05-12 08:37:37 +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
TreeHugger Robot
f042835757 Merge "[Provider Model] Show searching sub-title only when the Wi-Fi network is empty" into sc-dev am: a1bfc7daeb am: 3509ae87e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14511218

Change-Id: I52f50f47e40f3e31048d592445a1e28b4f8858e3
2021-05-12 07:33:47 +00:00