Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,951 Commits 1 Branch 0 Tags
ab4e189c582de43cffe81ae9c7227552269d6f1b
Commit Graph

81951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chloris Kuo
99ed186650 Merge "NAS setting onboarding string change" into sc-dev am: b0ab98b92d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14268599

Change-Id: I72c3d19cb78e2e0507dc732ec5cd5c953a80b876
 2021-04-23 19:33:28 +00:00
Chloris Kuo
b0ab98b92d Merge "NAS setting onboarding string change" into sc-dev 2021-04-23 19:17:36 +00:00
TreeHugger Robot
ace841e0a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours am: 9f5f9bc960 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547

Change-Id: Ia8b6cc22ee9824aca763061a6b2f680805ce521c
 2021-04-23 17:28:21 +00:00
Bill Yi
d9ff7d4813 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours am: 4e9da6061d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546

Change-Id: I8c0f829bf6325e6a4a66698dbde564c42dc8b2ff
 2021-04-23 17:27:59 +00:00
TreeHugger Robot
e7c67bafc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours am: bed3b3f0d6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924

Change-Id: Id7d7d66f8e0e46e7d251bb7b7de98bff7e4cb647
 2021-04-23 17:27:41 +00:00
Bill Yi
472cfd26b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours am: d7726af0d1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545

Change-Id: I7dbd5ab0244c08c7fc48f961303aa2fac0eb84b1
 2021-04-23 17:27:10 +00:00
TreeHugger Robot
9f5f9bc960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours am: be34fd7ec5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547

Change-Id: I626e49c4ddce9a2410b4e7f2f4a89df47e341819
 2021-04-23 17:19:14 +00:00
Bill Yi
4e9da6061d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours am: b63c84d427 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546

Change-Id: I9db0d41fb1d64fdfcba7b172f7ea6fd039cfa2cb
 2021-04-23 17:18:15 +00:00
TreeHugger Robot
bed3b3f0d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f7682416b6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14294924

Change-Id: Id7417778176b4fe4fcecb558ea94a4f5fd0026da
 2021-04-23 17:07:55 +00:00
Bill Yi
d7726af0d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 700eca8b5f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295545

Change-Id: I3092aed10393846f2becc03c781ad2ad48102142
 2021-04-23 17:07:07 +00:00
TreeHugger Robot
dcfbd36abd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f92d565f22 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295608

Change-Id: Ia330a01ba3b646c0d8350eb82de0b76753e0a78e
 2021-04-23 16:55:15 +00:00
TreeHugger Robot
be34fd7ec5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75de88c1d6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295547

Change-Id: I697cc38f78e22b125a9b041933125761408c9107
 2021-04-23 16:55:10 +00:00
Bill Yi
b63c84d427 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7201890895 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295546

Change-Id: I8b23a0c3bed86312eb39801637497f1b18c7e135
 2021-04-23 16:55:05 +00:00
TreeHugger Robot
dbeb8728c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 45a5592fd7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14295606

Change-Id: I22dc20b37955b13799ab5ade7189e89a42dadab0
 2021-04-23 16:54:44 +00:00
TreeHugger Robot
f7682416b6 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-23 16:53:04 +00:00
TreeHugger Robot
291385e776 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-23 16:46:41 +00:00
TreeHugger Robot
3358ed3ca0 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-23 16:42:38 +00:00
TreeHugger Robot
f92d565f22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-23 16:41:57 +00:00
TreeHugger Robot
75de88c1d6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-23 16:37:19 +00:00
TreeHugger Robot
45a5592fd7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-23 16:35:48 +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
Bill Yi
57e1df0472 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I29641778b72b6cf79af347767d69495bea56e07c
 2021-04-23 11:42:52 +00:00
Bill Yi
ee5b17c8a1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I380ead0cca8c7c3204019cb27c34f2033e8aec97
 2021-04-23 11:39:04 +00:00
Bill Yi
87c38148d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I055bcbb06e11c7241ed3cac9d80f332fd6569d18
 2021-04-23 11:35:31 +00:00
Bill Yi
85860acefb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81bb5447f3b0622749e42bd560b1e02d67deb4da
 2021-04-23 11:33:54 +00:00
Bill Yi
83921b7427 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1cdc0d542f75078c9e53d9a2cdc5fd1af12d23d8
 2021-04-23 11:30:58 +00:00
Bill Yi
7201890895 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic5cc7bbb24715e6845f855156e63d3518e274d6b
 2021-04-23 11:27:37 +00:00
Bill Yi
700eca8b5f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I51f96d5f1e2778626013b66df73ff8efe2acfb84
 2021-04-23 11:24:40 +00:00
Bill Yi
45cdde1f2d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I09f34dc32792b83f2fa937488ca042e0c0dbc1b1
 2021-04-23 11:21:18 +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