Commit Graph

36744 Commits

Author SHA1 Message Date
Joshua Mccloskey
ecdce82c6f Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131

Change-Id: Ia1eb05aabe80e2617c6854a18852423ee3ecfaf2
2021-04-25 23:29:19 +00:00
Joshua Mccloskey
5487f2fa6c Merge "Updated settings for new get/set feature change" into sc-dev 2021-04-25 23:20:35 +00:00
ykhung
f64775502a Fix incorrect battery history merging logic to cause data losing am: 5e578ddd13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299195

Change-Id: I746e0ef1f7330d78f001c1b1ce92beac5464597b
2021-04-25 11:23:33 +00:00
ykhung
1d54252b9f Refresh category title by different time slot condition am: 41fd8a7494
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299187

Change-Id: I394b045149277fff4bf4712849ef300a50c99b7d
2021-04-25 11:23:31 +00:00
ykhung
5e578ddd13 Fix incorrect battery history merging logic to cause data losing
Bug: 184807417
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ic26799f4d95b9f990e873ee26a42d6cc0c404659
2021-04-25 08:35:55 +00:00
ykhung
41fd8a7494 Refresh category title by different time slot condition
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: Ib124e1cfb9549f838540ff547bc616049f65180d
2021-04-25 07:47:31 +00:00
Santos Cordon
b7d64ed7e7 Merge "Use new getBrighntessInfo() API for brightness" into sc-dev am: 219dabcabf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14076526

Change-Id: I0541a077707c635124bd89211f154234cad81c84
2021-04-24 15:59:26 +00:00
Santos Cordon
219dabcabf Merge "Use new getBrighntessInfo() API for brightness" into sc-dev 2021-04-24 15:38:20 +00:00
YUKAI HUNG
ab4e189c58 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev am: 230c3f2de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14296275

Change-Id: Ice2a60064723c72f6203a9fb06edc0fcd58192e2
2021-04-24 13:15:33 +00:00
YUKAI HUNG
230c3f2de0 Merge "Add test cases for utcToLocalTime in the ConvertUtils" into sc-dev 2021-04-24 13:03:08 +00:00
ykhung
ef6cea8c84 Add test cases for utcToLocalTime in the ConvertUtils
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I22bda2db821e69c40202db692ada52e96af25e16
2021-04-24 13:41:45 +08:00
Julia Reynolds
6847795ce6 Merge "Move preference loading to a background thread" into sc-dev am: 9d77efb7e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14297890

Change-Id: I95ff44498dd066c991dad2e152a5a764b5f3ef50
2021-04-24 00:53:28 +00:00
Julia Reynolds
9d77efb7e7 Merge "Move preference loading to a background thread" into sc-dev 2021-04-24 00:34:26 +00:00
TreeHugger Robot
c5afdce49d Merge "Do not auth in settings if UDFPS" into sc-dev am: 8eec01fc17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14282593

Change-Id: I1189e3aff61536dd014bce38dca21c4ba9b72959
2021-04-23 20:29:27 +00:00
TreeHugger Robot
8eec01fc17 Merge "Do not auth in settings if UDFPS" into sc-dev 2021-04-23 20:12:46 +00:00
Julia Reynolds
aee53bc98d Move preference loading to a background thread
To improve the loading time of the Notifications screen. Also introduce
placeholder preferences to minimize jank when the data becomes available

Test: Robotests, adb shell am start -W -a android.settings.NOTIFICATION_SETTINGS
Fixes: 185877371
Change-Id: Id63469fdb42e1a66468f2c5f1da8c366686f06e4
2021-04-23 19:48:02 +00:00
Julia Reynolds
c21bb5c3b6 Merge "Add enterprise popup to notif lockscreen settings" into sc-dev am: 16861ac068
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14284498

Change-Id: I6c4aac46dd8d2ef4600b8dc43a0bd8d7f3278f94
2021-04-23 15:03:11 +00:00
Julia Reynolds
16861ac068 Merge "Add enterprise popup to notif lockscreen settings" into sc-dev 2021-04-23 14:46:19 +00:00
TreeHugger Robot
9b43bd93d8 Merge "Use new api to get bluetooth device icon" into sc-dev am: 3bcd6bade2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14250087

Change-Id: I32dacad80f43ef6b68b88a27c2771de3123c2a75
2021-04-23 12:02:14 +00:00
TreeHugger Robot
3bcd6bade2 Merge "Use new api to get bluetooth device icon" into sc-dev 2021-04-23 11:59:04 +00:00
Almaz Mingaleev
06ef7696fb Do not show toggle for location tz detection in search. am: 6be940f396
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14293706

Change-Id: Id4009c438479632b1e05f01d8da42a6e9888e920
2021-04-23 11:52:01 +00:00
Almaz Mingaleev
6be940f396 Do not show toggle for location tz detection in search.
It also makes setting in line with "Set time zone
automatically", which is rendered w/o toggle on search page.

Bug: 185906072
Test: manually verified that toggle is not shown
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceControllerTest"
Change-Id: Ie71572c4a9b9bd6adf3660556363331e2943fd5b
2021-04-23 10:29:58 +00:00
TreeHugger Robot
bd01ad938e Merge "Fix background inconsistency of the font size page in SUW" into sc-dev am: ea7b64a96d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14290949

Change-Id: I77701f6a34d957f2a6e808e1532ed190283424fb
2021-04-23 09:26:37 +00:00
TreeHugger Robot
ea7b64a96d Merge "Fix background inconsistency of the font size page in SUW" into sc-dev 2021-04-23 09:21:28 +00:00
TreeHugger Robot
5040e279b7 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev am: 47b254ad88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14111132

Change-Id: Iba01e91551978d629c974b9a235129cd0aaea736
2021-04-23 09:19:33 +00:00
TreeHugger Robot
47b254ad88 Merge "Fix bluetooth settings will broadcast to anywhere when some cases" into sc-dev 2021-04-23 09:11:28 +00:00
TreeHugger Robot
b67629f5ae Merge changes from topic "biometric_page" into sc-dev am: 3e6e4a1ad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14276566

Change-Id: I706279a35be0d7c11b1926fcb74f67d68320e874
2021-04-23 09:09:41 +00:00
Mill Chen
5962e3bea4 Combined biometric settings implementation am: 7edebeef7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140150

Change-Id: Id9aa983107826085edd174db27014a674590bb6c
2021-04-23 09:09:38 +00:00
TreeHugger Robot
3e6e4a1ad5 Merge changes from topic "biometric_page" into sc-dev
* changes:
  Update confirming credential flow for biometric settings
  Combined biometric settings implementation
2021-04-23 08:50:29 +00:00
Mill Chen
8843157b01 Update confirming credential flow for biometric settings
The combined biometrics settings has been integrating face and
fingerprint authentication together, so the confirming credential flow
has to be invoked before entering biometrics settings page.

Bug: 183449119
Test: manual
Change-Id: I3c0d059241cb10a254868c2e388c4d3b20305b10
2021-04-23 15:33:32 +08:00
Mill Chen
7edebeef7e Combined biometric settings implementation
There will be multiple biometrics authentications existing at the same
time, so we added a new page for multiple biometrics to control
biometrics settings.

Bug: 183449119
Test: manual test
Change-Id: I359082caf771e07dfd5b24973cb8a3cf372c1b30
2021-04-23 15:18:08 +08:00
Sunny Shao
2ba1ab2222 Fix background inconsistency of the font size page in SUW
- Apply to SUW provided theme.
- Use isSetupWizardDayNightEnabled to decide which device's SUW supports dark mode.

Fixes: 184901818
Bug: 186076332
Test: manual test
Change-Id: I44c5f8ee19dac58dea7f5543840659c08aad4a39
2021-04-23 15:12:11 +08:00
Christine Franks
23b55a9af4 Merge "Support vendor modes in color mode preference" into sc-dev am: 10da1de13e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14128858

Change-Id: Ifb3a89d234bed0e850695bb93e272d3ee5bea024
2021-04-23 06:45:04 +00:00
Christine Franks
10da1de13e Merge "Support vendor modes in color mode preference" into sc-dev 2021-04-23 06:31:18 +00:00
Santos Cordon
8dcffb88cf Use new getBrighntessInfo() API for brightness
The slider and settings need to use the new brightness
api so that:
1) It can work for mutiple-displays that support brightness
2) Can work with high-brightness mode which can dynamically
adjust the brightness min and max.

Bug: 168210311
Test: Verify that slider can go to 100% with HBM on or off.
Test: atest com.android.settings.display
Change-Id: I01029e211f64f0a8598b1388dd3bb535eb0beb69
2021-04-23 05:28:54 +01:00
YUKAI HUNG
abd7565bb2 Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev am: 81399d6fec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14281934

Change-Id: I4766849b966f04ef653137add44fcbe88aafb26f
2021-04-23 04:23:09 +00:00
YUKAI HUNG
81399d6fec Merge "Avoid add preferenc again if it already in the PreferenceGroup" into sc-dev 2021-04-23 04:02:44 +00:00
ykhung
5c23d65901 Avoid add preferenc again if it already in the PreferenceGroup
Bug: 177406865
Bug: 185187729
Test: make SettingsRoboTests
Test: make SettingsGoogleRoboTests
Change-Id: I69f5033c0a07d846c340b9871e69a2cdbe0bb2aa
2021-04-23 10:35:05 +08:00
TreeHugger Robot
110950243d Merge "Remove "See all" button" into sc-dev am: f05822549c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14283743

Change-Id: Icc8a2715e1c9d679cfbf8cc0786c66422919a86f
2021-04-23 00:40:17 +00:00
TreeHugger Robot
f05822549c Merge "Remove "See all" button" into sc-dev 2021-04-23 00:23:16 +00:00
Christine Franks
cd61dd3359 Support vendor modes in color mode preference
Bug: 161299146
Test: atest SettingsUnitTests:ColorModePreferenceControllerTest and
atest SettingsUnitTests:ColorModePreferenceFragmentTest

Change-Id: I76ed54bb444170d4b8935f8f12bed599a946aa14
2021-04-22 16:50:43 -07:00
Kevin Chyn
7920117a1a Do not auth in settings if UDFPS
Fixes: 185670313
Test: manual
Change-Id: I0ccc85aa05807f54a38ff69a81f87e6a63be9504
2021-04-22 14:44:25 -07:00
Yu-Han Yang
1170a08d43 Remove "See all" button
Bug: 180533061
Test: on device
Change-Id: I0a0f54e3ae248ec9c26a2118b70a52e9beecfdd9
2021-04-22 14:07:51 -07:00
Julia Reynolds
e6fbc5877e Add enterprise popup to notif lockscreen settings
Test: Robotests, manual with TestDPC
Fixes: 137638270
Change-Id: I22c492d1455cd0a3b6036333cd51a13d87d8a475
2021-04-22 14:55:26 -04:00
Evan Severson
7c4e9b2257 Merge "Update mic/camera toggles api" into sc-dev am: cbc3bc5acd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14193836

Change-Id: I20dc89d22968ab7fcfb8354b4cef60a2ceeb4282
2021-04-22 16:43:00 +00:00
Evan Severson
cbc3bc5acd Merge "Update mic/camera toggles api" into sc-dev 2021-04-22 16:38:35 +00:00
Yomna Nasser
214b17c77e Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev am: 7299387774
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14218034

Change-Id: Ib0547ae0787972d73a4370f5e071dcde9cadbda4
2021-04-22 16:25:44 +00:00
Yomna Nasser
7299387774 Merge "Handle invalid subIds in Enable2gPreferenceController." into sc-dev 2021-04-22 16:00:02 +00:00
Menghan Li
a23e53a3f6 Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev am: 09f6086bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14255419

Change-Id: I839d37f0c5d9779bf73ac0de26a3b787e01c6717
2021-04-22 11:36:11 +00:00
Menghan Li
09f6086bea Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev 2021-04-22 11:18:23 +00:00