Xin Li
302b01f8e2
Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
...
Bug: 248070379
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
Change-Id: Ib8c6441f2165784804a1863bcfce6b05d20ecfd3
2022-10-06 12:22:57 -07:00
Milton Wu
328be58b48
Do not show 2nd FingerprintErrorDialog
...
When fingerprint enrollment is stopped because of credential timeout, it
pops a FingerprintErrorDialog, and this error dialog triggers
onWindowFocusChanged(), and the 2nd FingerprintErrorDialog is shown. To
fix this case, checking mIsCanceled flag do nothing in
onWindowFocusChanged() method.
On the first dialog, the 'Try again' button relaunch activity with new
Intent, and it causes that activity result fails to pass back to caller.
To fix this bug, add FLAG_ACTIVITY_FORWARD_RESULT on new Intent to pass
result back.
Bug: 248165760
Test: Manually test credential timeout behavior and dialog buttons
Test: Manually test enrollment process has been cancelled for scenarios,
like "Swipe down Notification Shade" and "Recents"
Test: robo test for FingerprintEnrollEnrollingTest
Change-Id: I4441ba026db9b594f1d6184280668a374126a2fb
2022-10-06 15:40:51 +08:00
Alice Kuo
ba98d1839f
[automerger skipped] Remove A2dp offload disabled and LE audio offload enabled combination am: 6ecbe4c18e
-s ours
...
am skip reason: Merged-In I9ebe26c6a8058798ea654523ad1405a8447268b8 with SHA-1 7cc845026c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20126030
Change-Id: I53940a801940e9dc2cd189a56ef1f256a6abd75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 04:30:08 +00:00
Alice Kuo
6ecbe4c18e
Remove A2dp offload disabled and LE audio offload enabled combination
...
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
as well
Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
(cherry picked from commit 7cc845026c
)
2022-10-06 10:35:03 +08:00
Xin Li
b59986a3f0
[automerger skipped] Merge "Merge TP1A.221005.003" am: 2af8366306
am: ec0cf19aad
-s ours
...
am skip reason: Merged-In Ia825853dde2e966e3d390cecfbe1a99f6439d31e with SHA-1 5e785a2d99
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893
Change-Id: I68ff599414f5230a31efc34d80bdf6808c25727c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-06 00:32:43 +00:00
Xin Li
ec0cf19aad
Merge "Merge TP1A.221005.003" am: 2af8366306
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893
Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 22:39:29 +00:00
Xin Li
2af8366306
Merge "Merge TP1A.221005.003"
2022-10-05 22:20:14 +00:00
Treehugger Robot
ff788fa9b9
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
am: bf19bf23a5
am: b969c8a4c7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I011b9815444d73b85b470db94d0bb53f5479c51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 17:54:58 +00:00
Treehugger Robot
b969c8a4c7
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
am: bf19bf23a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: Ibae8540c83dbabec5cf5bfa96ddaab3219ec5b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 17:26:59 +00:00
Treehugger Robot
bf19bf23a5
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
am: fe38c3c91e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I3db9d784789e88ee04f50f040eb3741a87768640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 16:59:01 +00:00
Treehugger Robot
fe38c3c91e
Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358
Change-Id: I4ecfd48d3e62eeaf01452283111d2ddaf7acb29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-05 16:26:25 +00:00
Treehugger Robot
bcde51cf09
Merge "Remove A2dp offload disabled and LE audio offload enabled combination"
2022-10-05 16:04:05 +00:00
Alice Kuo
7cc845026c
Remove A2dp offload disabled and LE audio offload enabled combination
...
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
as well
Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
2022-10-04 23:48:11 +08:00
TreeHugger Robot
add2b37f3e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a94259a716
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103197
Change-Id: I10a095b1d0668e1797f12dd81acfcc7dee3ad54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-04 02:05:10 +00:00
Bill Yi
a4d4bc1df3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130ca8d869
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103197
Change-Id: Ib6ded72a3def852b217e1fa160ad06a6d62e0f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-04 02:04:50 +00:00
Bill Yi
97410f46bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad1d5c5080
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20103196
Change-Id: I18054ae8f2f5210e7e044136154ac184c447fa47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-04 02:04:28 +00:00
TreeHugger Robot
a94259a716
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-10-04 01:45:21 +00:00
Bill Yi
130ca8d869
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic1d704580d378aceba24a558590c41bf16b97b07
2022-10-03 13:19:00 -07:00
Xin Li
f51d201af3
Merge TP1A.221005.003
...
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
2022-10-03 13:17:48 -07:00
Bill Yi
ad1d5c5080
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16b0a52db27e52e07af91f9a7b88796c5bbec9c8
2022-10-03 13:16:02 -07:00
Tsung-Mao Fang
8b8d3b45f9
Guard FallbackHome activity behind permission
...
An attacker can launch FallbackHome of the Settings app
to reset unlock time. This would prevent the device from
sleeping because it runs the following code:
PowerManager#userActivity().
However, running PowerManager.userActivity() requires
android.permission.DEVICE_POWER or android.permission.USER_ACTIVITY.
So, let's add a permission to guard this activity.
Test: Rebuilt a rom and see no side effect.
Bug: 246543238
Change-Id: I23a1e352f76cbec3e8c07a1b58b94615f2779121
(cherry picked from commit f5062c2df8
)
2022-10-03 06:37:46 +00:00
TreeHugger Robot
7b435b6111
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa
-s ours am: 353daaa2f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I1ecf75b27f5ed85648f2d4dd26ccbedb8adbc399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 08:23:48 +00:00
Bill Yi
7a3ba54d23
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9
-s ours am: 567c6dd3ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: Ib340ffec431f5a77e5b181830192ec9516c8d8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 08:23:25 +00:00
TreeHugger Robot
1f0962c3c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa
-s ours am: db09b990a0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: Ic00f62d2e84db365ddfcd3eb0d629c1da51f1de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 08:21:26 +00:00
Bill Yi
02fa63e2fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9
-s ours am: 0aca2c219d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I81058835048aa75939c95147f0a8b71dc19584bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 08:21:09 +00:00
TreeHugger Robot
353daaa2f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: Ia73419f75f327782d073cefa48ad1d65a87e9b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:35 +00:00
TreeHugger Robot
db09b990a0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:31 +00:00
Bill Yi
567c6dd3ca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I0c47748f2ea5d2e6691937acee6c91d96bcc5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:12 +00:00
Bill Yi
0aca2c219d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086810
Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-10-02 07:26:20 +00:00
Bill Lin
6b763d1999
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179
Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev
2022-09-30 23:54:31 +00:00
Bill Yi
ba331be678
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: 148f0a8591
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I59052a6cddf76148650c3def3f875a3c7f3650ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:40:34 +00:00
Bill Yi
6c8ff68ac2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 6cf6175ec3
-s ours am: 3a2a9c27a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I6b48eeedb2292e93045ca38617113ee3ccb62e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:17:07 +00:00
Bill Yi
e6d49db2fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: e7722ef90c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib5f00df6d8bf3d9543a1d41c96af4f8a1ee7b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:08:39 +00:00
Bill Yi
148f0a8591
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I07f8debb98eeee861b53234a5e1ea81d22e24a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:57:39 +00:00
Bill Yi
e7722ef90c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ice33ed5798d03b887d2d0feb637ddeb37223c7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:56:21 +00:00
Bill Yi
3a2a9c27a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 6cf6175ec3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Iaa63d8f87752e9f593cc5f79a4d87116a86f6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:48:01 +00:00
Bill Yi
4bf99a1f0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I494de493df292a1ae0cb827d75b1a3458f4c65b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:46:53 +00:00
Bill Yi
6cf6175ec3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib3d599dccb4076c42bc05cfbdec0036e72ec9177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:44:09 +00:00
TreeHugger Robot
2525056f1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 12a1ed5662
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: Iea8b7d3d8ac230245faf4d58b3692ed99702dcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 18:44:32 +00:00
Bill Yi
6ba4170976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: I4d9fc13a34443adb3241eab58c2e8f9d2c770169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 18:44:20 +00:00
TreeHugger Robot
12a1ed5662
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-30 18:14:33 +00:00
Grace Cheng
b20a0ed55f
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev am: c6d9164dd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083885
Change-Id: Iea3e8fd7e16fdd4af2b9a2bde3ea5991e3fabffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 17:34:25 +00:00
Grace Cheng
c6d9164dd4
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev
2022-09-30 17:05:30 +00:00
Milton Wu
9f070ee9c1
overridePendingTransition in FingerprintSettings
...
When FingerprintSettings got correct activity result from ConifrmLock or
ChooseLock, and ready to add first fingerprint automatically, it shall
set sud_slide_next_in and sud_slide_next_in in
overridePendingTransition.
Bug: 249981049
Test: Manually credential in FingerprintSettings
Change-Id: If63441cf1a72c30d558e9f50a0aada36a08b211d
2022-09-30 13:43:35 +00:00
lbill
39175b2f87
Do not override SUW Glif theme when onApplyThemeResource() callback
...
1. Accodring to settings & setupdesign lib theme architecture
Only force apply sytle SetupWizardPartnerResource for current
activity/contextThemeWrapper is sufficient, override GlifV3Theme
again will cause incorrect resource mapping of private attributes.
2. Set Theme_AlertDialog style for AlertDialog in for Material design
- FingerprintEnrollEnrolling
- FingerprintEnrollFindSensor
3. Add test for AlertDialog theme, and fix broken test cases
Fixes: 245684949
Bug: 249789759
Bug: 248994476
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: manual in SUW enroll UDFPS tips lottie view showing expectedly
Test: manual in SUW enroll UDFPS landscape showing correct layout
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollFindSensorTest
Change-Id: I17cbf26e38318e6681ba124d23bf86317a0f1e1d
2022-09-30 04:58:28 +00:00
Bill Yi
3ce9e908f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb582089c3601dcd3dc8e5c47d36da97b0be9c0d
2022-09-29 18:57:44 -07:00
Bill Yi
cf54fdb73b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I095695f0dfaf97b6944010e51b3b1463c3b7fbb0
2022-09-29 18:54:45 -07:00
Bill Yi
e289b0f368
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
2022-09-29 18:51:56 -07:00