ykhung
002a913e3b
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: I32d52c90f7970eab010864d19421a435b5f87869
2021-04-25 11:23:43 +00:00
ykhung
6ee911e468
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: I48fbc14d08f23122a917d44a39ec22a0a43eaf4f
2021-04-25 11:23:41 +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
c0e6912355
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: I40235ddc3762e6a13bd79abf80cfc591c6d4b50e
2021-04-24 15:59:28 +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
dc2d185e54
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: Ib142234e985e4030271bc150f762e172aeaaa33d
2021-04-24 13:15:31 +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
234be7401e
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: Ic65c3a89dd1b6b5c4a1b14bd93386d441be730bb
2021-04-24 00:53:49 +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
4717c47250
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: I1db90858e7000cc18ab40068a0b71395a6874c90
2021-04-23 20:29:36 +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
77fa05dc62
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: I1872255fcac53357986df39a1a98f7fa82fd3234
2021-04-23 19:36:21 +00:00
Chloris Kuo
b0ab98b92d
Merge "NAS setting onboarding string change" into sc-dev
2021-04-23 19:17:36 +00:00
TreeHugger Robot
6e66c255e0
[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: I84ee621d5609d107add87e3f739809ad21b7f5b3
2021-04-23 17:28:24 +00:00
Bill Yi
74a8df6cc1
[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: I75d04b3427d1b020245767653aa5c848d3b0a3ac
2021-04-23 17:28:21 +00:00
TreeHugger Robot
498cd06f02
[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: I3f4eba63e91036e84edf5c75addea1aa34eb224b
2021-04-23 17:28:12 +00:00
Bill Yi
e625b34beb
[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: Icc1091947385ac5a2a6ce02f298721641219ae63
2021-04-23 17:27:36 +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
7ca7996a11
[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: I3e8a445b2d76dba3b0905b5bd801041abcbc2c98
2021-04-23 16:55:25 +00:00
TreeHugger Robot
0caf72283a
[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: Ic8f7e2938547a7cb091a9fa9a80453d21b1e2b7d
2021-04-23 16:55:14 +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
f7682416b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-04-23 16:53:04 +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
883b81a164
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: I1f038032adaf46fe85436d58849b98b776c4c771
2021-04-23 15:03:09 +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
421693fdd3
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: Ie8b89d0afe3391285a354f2199bf28ad45826e7d
2021-04-23 12:02:40 +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
3610105af8
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: Ia9ee291c4f94262286c49baec745d7dab02c76d6
2021-04-23 11:52:03 +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
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
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
52fadc3573
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: I221eae9990a24d0fda82592f35c2778118292180
2021-04-23 09:28:18 +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
6ec9e24ffc
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: Id70444d201690e3761ed58411672dee486c5d51b
2021-04-23 09:19:57 +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
717f819218
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: Iffdcc3ea936efb24f207218dafe9dd485abc8b39
2021-04-23 09:09:54 +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