Commit Graph

507 Commits

Author SHA1 Message Date
Matt Casey
39715d3023 Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev 2023-08-07 17:56:15 +00:00
mxyyiyi
be8407c566 Implement the battery tips cards.(1/2)
- Implement a tips card UI in Battery Usage.

[Screenshot]:
- Tips Card with thumbs-up/down feedback in dark mode
https://screenshot.googleplex.com/3nRCFYvLTWfiYYT
- Tips Card without feedback
https://screenshot.googleplex.com/B7QGRJZAHzgWpCP
- Tips Card in Force RTL layout
https://screenshot.googleplex.com/8crQdj8ao26pKpH
- Tips Card in light mode
https://screenshot.googleplex.com/885aVvZm8xmhK2S

[TODO]:
- Add accessibility
- Localization

Bug: 291689623
Test: Manual
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
Merged-In: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
2023-08-01 09:49:19 +00:00
Matt Casey
9a7ed87222 Remove dependency on ChooserActivity resources
Fork the needed resources.

Bug: 292222314
Test: mp sysuig, view wifi QR code screen
Change-Id: I69fabb8c293e8e8819d93a61df39549b9667c0fa
2023-07-31 14:17:40 +00:00
Jason Chang
c0f0b0ca1a Fix the “screen lock option” and password restriction view are
in the wrong position on PIN/Password/Pattern in the landscape mode.

1. Move the description position under the GlifLayout header
2. Move the position "Screen lock options" button under the
GlifLayout header

Bug: 272676038
Bug: 285271342

Test: manully test with reproducible steps:
STEPS TO REPRODUCE:
1. Go through the setup flow
2. Continue steps until “set pin” page
3. The “screen lock option” is in the wrong position

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.password.SetupChooseLockPasswordTest"

Change-Id: I24464e6b7e93f20abbeb59426919ed7fec5c7cbb
2023-06-29 07:11:42 +00:00
Angela Wang
a41640b76a Enlarges the size of the screen flash color buttons in Flash Notifications
The size of the screen flash color buttons are now 38dp x 38dp and it's recommended to make the height of these touch targets 48dp or larger.

Bug: 275265260
Test: runs Accessibility Scanner and checks the suggestions are gone
Change-Id: Ie2bef1a0ff976750f6258f7af3f28953c48b994f
2023-03-27 08:13:19 +00:00
Jason Chang
9522a44bb6 Merge "Fix the Fingerprint enrollment page's title text creates a truncate problem when it needs three lines on the R4 device" into udc-dev 2023-03-18 14:10:58 +00:00
Jason Chang
848973d300 Fix the Fingerprint enrollment page's title text creates a truncate
problem when it needs three lines on the R4 device

Add padding between title and lottie animation, and adjust UDFPS
enroll view top margin.

Bug: 269437675

Test: manually test,
1.Go to Go to Settings > Security > Fingerprint Unlock >
Set up Fingerprint Unlock > How to set up your fingerprint >
Touch & hold the fingerprint sensor ,
then to start enroll fingerprint.

2. Always keep the finger in the same position,
then let the title become a three line description
“Change the position of your fingerprint slightly each time”.

3. Check the UI if it has been fixed.

Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings
.biometrics.fingerprint.FingerprintEnrollEnrollingTest"

Change-Id: Ib330e9fbe01b959892f2f9007ce35f5ab107e42e
2023-03-18 03:40:45 +00:00
Matías Hernández
0882b04ed5 Delete stuff related to removed "Conversations that can interrupt" settings
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
2023-03-14 16:53:53 +01:00
Phil Weaver
64c23fc5cf Revert "Add discrete contrast UI slider in the setting"
This reverts commit fd3911ba29.

Reason for revert: Setting will be re-landed in developer settings. Not currently aligned with other accessibility features.

Change-Id: If896d87b0bd6d5e74422c1919e60d8717d28a1d0
2023-03-03 00:53:07 +00:00
yw.bae
f763c25c1e Implement Flash Notifications UI for Settings app.
Bug: 237628564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=CameraFlashNotificationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ColorSelectorLayoutTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsPreviewPreferenceTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ScreenFlashNotificationColorDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ScreenFlashNotificationColorTest
Change-Id: I0987590ddfcfd0873ec419db263f6a7eade81844
Signed-off-by: yw.bae <yw.bae@samsung.corp-partner.google.com>
Signed-off-by: Angela Wang <angelala@google.com>
2023-02-09 21:00:50 +08:00
Valentin Iftime
a3d905eed2 Add dimensions for notification channel panel am: 42ac382af5 am: 4b733b249f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21334700

Change-Id: I94425217f087d755babd9c27d4a058c0d6e99b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-08 17:14:45 +00:00
Valentin Iftime
42ac382af5 Add dimensions for notification channel panel
Removes dependency on output switcher dimens.
    Fix notification settings bottom sheet scroll in landscape.

Test: adb shell cmd notification post "Test notif" &
    adb shell am start -a android.settings.CHANNEL_NOTIFICATION_SETTINGS     --es android.provider.extra.CHANNEL_FILTER_LIST "sound"     --es android.provider.extra.CHANNEL_ID "shell_cmd"     --es android.provider.extra.APP_PACKAGE "com.android.shell"

Bug: 238845213
Change-Id: Iaf4b52b0aa8376c93ebc55fc005cdb55d2a9620e
2023-02-08 14:16:13 +00:00
Chengfei Tao
e5cebf9452 Merge "Accessibility toggle button small tappable area fix" into tm-qpr-dev am: b2c923fa54 am: 58c217dcb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152758

Change-Id: I647ea7a4c847aa3a8e0830c1a14091ace9523f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-07 03:20:43 +00:00
Chengfei Tao
08ac9c1246 Accessibility toggle button small tappable area fix
Revert part of the layout change from b/233835795 fix so that
the issue of small tappable area in b/265859032 is fixed while
we continue to look at a better fix for b/233835795

Test: Manually change different Display & Font size to test UI
Test: m RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.biometrics.face.FaceEnrollEducationTest"

Bug: 265859032

Change-Id: I90ba7cc11dc61380dfdf0c3bcd2c59a17b43ee0e
2023-02-02 15:14:28 +08:00
Aurélien Pomini
1849ca7259 Merge "Add discrete contrast UI slider in the setting" 2023-01-20 18:36:29 +00:00
Aurélien Pomini
fd3911ba29 Add discrete contrast UI slider in the setting
This slider is temporary and will be replaced by the final UI in the next couple weeks.

In this first version, the slider is added in Settings -> Accessibility -> Color and motion. It is discrete with three values.

The slider manipulates the setting currently named CONTRAST_LEVEL in Settings.Secure. This setting is ranging from [-1, 1] with a default value of 0. However, the three values of the slider correspond to the contrast values [0, 0.5, 1] respectively

Test: Manual: put a log before Settings.System.putFloatForUser, move the slider manually and verify the logs
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ContrastLevelSeekBar
Bug: 259091608
Change-Id: I2eaf751d6008ad20b3564dde2c0f4648cc6c8178
2023-01-19 15:28:12 +00:00
Diya Bera
c2a429f4f8 No scrolling required to see find sensor animation
Changed the string security_settings_sfps_enroll_find_sensor_message.
Changed the layout of the animation.

Test: Manually check the position of the animation
Fixes: 265023019
Change-Id: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
Merged-In: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
2023-01-18 17:07:49 +00:00
Diya Bera
bda3c06469 No scrolling required to see find sensor animation
Changed the string security_settings_sfps_enroll_find_sensor_message.
Changed the layout of the animation.

Test: Manually check the position of the animation
Fixes: 265023019
Change-Id: Iae3100009e4430fbff7abc4bc3c1d4b9ffca6638
2023-01-18 00:05:04 +00:00
Jason Chang
d2b71ce454 Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e am: 2cb8ea9496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210

Change-Id: Ia1132d870dfb24900234f4a9ffc0d46b846e8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 22:21:09 +00:00
Jason Chang
bfa35a7b1e Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev 2023-01-13 12:31:40 +00:00
Jason Chang
8c5bcaa374 (2/2) Fix settings face enrollment UI layout problem
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button

Bug: 260653042
Bug: 263065347

Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"

Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
2023-01-13 10:48:50 +00:00
lbill
43f0076830 2/ Define pattern view size by UX deck
1. Set biometric_auth_pattern_view_size: 348dp (portrait)
2. Set resilience size 248dp~348dp for landscape mode
   biometric_auth_pattern_view_(max_)size
3. Set 348dp size for sw410dp when display density < 560
   Set 248dp-348dp resilience size for sw410dp-land
4. Add sw392dp sw392dp-land with density 440 projects
5. Set sw600dp/sw720dp/sw800dp for large screen device
6. Reference dimen biometric_auth_pattern_view_size in style
7. Remove redundant dup AuthCredentialPatternContainerStyle
8. Remove max & min bounds from AuthCredentialPatternContainerStyle
9. Remove unused choose_lockscreen_min_height dimen
10. Reduce footerText min hight to reserve more space for pattern view

Bug: 234847272
Bug: 243008023
Bug: 243699695
Test: manual
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      ChooseLockPatternTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      SetupChooseLockPatternTest
Change-Id: Icfc2932279aa9e3a065030dbb7ff73f12ed6d081
Merged-In: Icfc2932279aa9e3a065030dbb7ff73f12ed6d081
2023-01-09 05:30:33 +00:00
Chaohui Wang
a45ecb8034 Clean up some UnusedResources detected by lint 8
Bug: 234570979
Test: Make Settings
Change-Id: Iaf044fdc4cfcf1eab172f0735c5c7f0330a46107
2022-12-02 14:59:44 +08:00
lbill
3bfefd16af 2/ Define pattern view size by UX deck
1. Set biometric_auth_pattern_view_size: 348dp (portrait)
2. Set resilience size 248dp~348dp for landscape mode
   biometric_auth_pattern_view_(max_)size
3. Set 348dp size for sw410dp when display density < 560
   Set 248dp-348dp resilience size for sw410dp-land
4. Add sw392dp sw392dp-land with density 440 projects
5. Set sw600dp/sw720dp/sw800dp for large screen device
6. Reference dimen biometric_auth_pattern_view_size in style
7. Remove redundant dup AuthCredentialPatternContainerStyle
8. Remove max & min bounds from AuthCredentialPatternContainerStyle
9. Remove unused choose_lockscreen_min_height dimen
10. Reduce footerText min hight to reserve more space for pattern view

Bug: 234847272
Bug: 243008023
Bug: 243699695
Test: manual
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      ChooseLockPatternTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\
      SetupChooseLockPatternTest
Change-Id: Icfc2932279aa9e3a065030dbb7ff73f12ed6d081
2022-11-28 18:52:20 +00:00
Grace Cheng
76902f4b7c Fix alignment of finger animation with progress bar
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
Merged-In: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:53:09 +00:00
Grace Cheng
415314113b Fix alignment of finger animation with progress bar
Makes progress bar opaque and fixes color codes accordingly, and adjusts
values to shift finger animation and progress bar for proper alignment

Test: Enroll finger in light and dark theme and observe alignment of
finger with progress bar
Fixes: 245819077
Change-Id: I26bea8e1870f08b413a4ec2a9e6e83015facd004
2022-09-20 16:13:14 +00:00
Chaohui Wang
6ae88c417f Clean up some UnusedResources detected by lint 3
Bug: 234570979
Test: Manual with Settings App
Change-Id: I73d18397b01a9967fd7acb94b133e7d5497a0854
2022-09-13 13:56:26 +08:00
Chaohui Wang
7fe7ef383e Clean up some UnusedResources detected by lint 2
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2421f1147ce8c9b09c2428355610a9089481d547
2022-09-10 17:34:11 +08:00
Chaohui Wang
28d838d5e7 Clean up some UnusedResources detected by lint
Bug: 234570979
Test: Manual with Settings App
Change-Id: I2ad634d9beba623a5cdcff015c9aa28d78525cb7
2022-09-09 16:51:12 +08:00
Grace Cheng
4a187e15d6 Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Fixes: 243813773
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
Merged-In: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-09-01 00:47:22 +00:00
Grace Cheng
219b28bb8d Implement SFPS guided enrollment for T6
Reduces perception of long enrollment process by introducing new enrollment layout and stages for SFPS. Also adds user feedback via new animated assets with dynamic colors, and all associated strings and a11y labels.

Test: Observe new guided enrollment process on T6
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 232024488
Fixes: 233091341
Fixes: 241165082
Fixes: 242218240
Change-Id: I1fa0b9349545586919eceeb9d05f365c2f2ec491
2022-08-31 20:15:55 +00:00
sayakiitg
efdedcdc15 Revamp SD card UX
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.

Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png

Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531

Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
(cherry picked from commit 9b432d54a6)
Merged-In: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-08-19 19:07:40 +00:00
Zaiyue Xue
284e049cc1 Switch Battery Usage Chart from V1 to V2.
Test: manual
Bug: 236101166
Change-Id: I9142c0d4e00dea3771777ba9aedeab07b635fa1a
2022-08-10 13:55:54 +08:00
Zaiyue Xue
b9bf92f5ae Add margin between battery daily and hourly charts
screenshot: https://drive.google.com/file/d/1vXL4XO9HezZ4fTJ5wh6Fi13oXf54yc9q/view?usp=sharing&resourcekey=0--k4_Qk4e9ELyENeAySlYFw

Bug: 236101166
Test: manual
Change-Id: Ib4f5705661d2799cc74f6a957ce715ebb93b28b8
2022-08-08 17:44:39 +08:00
Menghan Li
6fd05aa80a Merge "Unify the caption preference class naming" 2022-08-02 22:15:31 +00:00
Jason Chang
72a1fed542 Merge "Fix RTL issue on fingerprint setup screens in landscape mode" into tm-qpr-dev am: 7546b87a17 am: 0e7374b7ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19337646

Change-Id: I822db7f74147805a6cd51cf236d2acf1279df023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 08:44:09 +00:00
menghanli
e57125650d Unify the caption preference class naming
Bug: 197695932
Test: make RunSettingsRoboTests
Change-Id: Ice244442ad21e6d9f006d488992e9f58cf5c8fb0
2022-08-02 10:25:15 +08:00
Jason Chang
88c49e3257 Fix RTL issue on fingerprint setup screens in landscape mode
1. Add an RTL layout dimension for enrolling page.
2. Handling device rotation landscape 270/90 degrees with
layout dimension in LTR or RTL language.

Bug: 237104754

Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"

Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
2022-08-01 19:02:50 +08:00
Sayak Dutta
9e6c889abe Merge "Revamp SD card UX" 2022-07-30 13:04:25 +00:00
sayakiitg
9b432d54a6 Revamp SD card UX
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.

Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png

Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531

Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
2022-07-29 10:21:49 +00:00
Joshua Mccloskey
93f79d6774 Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19119801

Change-Id: Ibf89a7a3b58f076d694e2582ffcd950f5cc54142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 19:06:42 +00:00
Joshua McCloskey
69cc573b76 Add field to control margin in FaceEnrollIntro
Problem -> The require scroll mixin seems to scroll an entire device
length when a button click occurs. If you have page content
of 2x device_length + 10 pixels, a user will have to press the more
button twice to scroll this length. With the illustration_margin_bottom
field, devices can tune this parameter to allow the user to press
the more button once.

Fixes: 237474002
Test: Manual.
Change-Id: I9de2d74608260fe835870211a07b96249a8598f8
2022-06-29 19:07:44 +00:00
Avinash Vadlamudi
d23aba7042 Fix the Ephemeral guest mode UI bugs
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest

Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
(cherry picked from commit 9cf1d188a2)
2022-06-03 10:58:54 +00:00
Avinash Vadlamudi
9cf1d188a2 Fix the Ephemeral guest mode UI bugs
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest

Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
2022-06-02 15:38:46 +00:00
Jason Chiu
44aab7c55f Merge "Refine the homepage app bar layout" into tm-dev 2022-05-16 02:01:20 +00:00
Jason Chiu
8847c3186a Refine the homepage app bar layout
- Polish the app bar mask on homepage
- Move the Suggestion card to the position below the search box

Fix: 224435133
Fix: 230284145
Test: robotest, visual

Change-Id: I0a4fd86230fb773a28ca1d9799f3c631a81a11cb
2022-05-13 09:37:00 +00:00
Zoey Chen
4b345980c3 [Le Audio] Move BT QR code scanner from Settingslibs to Settings
Systemui memory regression, so we have to move the qr code activity back to Settings

Bug: 228031398
Test: manual
Change-Id: Ic30291e6d752c6c770c40e1329d9f95ceec8cca6
2022-05-12 15:23:22 +00:00
Chaohui Wang
ca4920090f Fix a11y label for LE Audio Battery
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.

After fix, "Left" & "100% battery" are grouped together.

Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
TreeHugger Robot
611db9e8be Merge "Remove loading spinner from Premium SMS access" into tm-dev 2022-04-29 02:30:14 +00:00
Mill Chen
5d33ca9120 Remove loading spinner from Premium SMS access
The loading spinner in the page is displayed by default, regardless of
whether or not how many apps are in the page. This change is trying to
remove the loading spinner from the page since this page doesn't have
many apps in it.

Bug: 222441974
Test: visual verify
Change-Id: I9b2b031122e6b6d521466ccf53e39185cfcab687
2022-04-22 13:41:45 +08:00