PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,369 Commits 1 Branch 0 Tags
ebb97daa573aceb677ae39b85ec7212d1649f08c
Commit Graph

121369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taran Singh
a6c79eb283 Merge "[Settings] Make scribe setting default_on and secure" into udc-dev 2023-03-29 07:28:33 +00:00
Avinash Vadlamudi
5e8769bcc5 Merge "[Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off" into udc-dev 2023-03-29 05:48:29 +00:00
TreeHugger Robot
f145881a7d Merge "Open the settings page for a specific physical keyboard" into udc-dev 2023-03-29 05:31:49 +00:00
TreeHugger Robot
c49b50845e Merge "Update theme transition for fingerprint in U" into udc-dev 2023-03-29 05:09:02 +00:00
Zoey Chen
cf88640701 [Settings] Remove the intent receiver due to the register exception 
Bug: 274899027
Test: atest SystemUIMicrobenchmark:android.platform.test.scenario.sysui.quicksettings
Change-Id: Ia19b91cfd1073f22180cc9679025447b4d5fecd9
 2023-03-29 04:57:08 +00:00
Zoey Chen
b1324b8753 Merge "[Settings] Start SettingsDumpService to dump the db log after the db is created." into udc-dev 2023-03-29 04:09:46 +00:00
David Liu
5c114b11bd Merge "Update flip camera for selfie gesture setting illustraion" into udc-dev 2023-03-29 04:05:16 +00:00
TreeHugger Robot
94d250162e Merge "Add service link when no providers are present" into udc-dev 2023-03-29 02:26:03 +00:00
TreeHugger Robot
8dc3e7752c Merge "Fix SpaActivity launched twice for App Info" into udc-dev 2023-03-29 01:10:34 +00:00
TreeHugger Robot
107690cb55 Merge "Correct the disable button text" into udc-dev 2023-03-29 01:08:01 +00:00
Bill Yi
31c51eb0d6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ida241a0f9ff5416920d158611a6547b81c0ce776
 2023-03-28 18:00:19 -07:00
Bill Yi
bc45b9f125 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If406f25ee072b3c2a778d2e007abecc99f06caf6
 2023-03-28 17:58:08 -07:00
Bill Yi
55e5d7a9c7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I508c40453d4c0e647a6d3664917bd7d9792ee3a9
 2023-03-28 17:55:51 -07:00
Bill Yi
113326ed83 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I278cdc816710d5eb2cf8fa3997d55aee0e3efa73
 2023-03-28 17:54:17 -07:00
Bill Yi
ea4029233f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f1d9147fb0f6fe06186b64516910d2c509a4ce9
 2023-03-28 17:53:19 -07:00
Bill Yi
71ac923b9e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9b2e5e99dedd51de896dc2a34814e0ef8b658595
 2023-03-28 17:51:47 -07:00
Bill Yi
ac1796011a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99912ab2402e8f08b599c8ad69252ba0c413f687
 2023-03-28 17:50:06 -07:00
Julia Reynolds
53a2145d73 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours am: 1519918e3c -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Iaaa6f3559c9e3002000d2d153a19be852c15c2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:48:26 +00:00
Julia Reynolds
1519918e3c [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours am: 812747f662 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Iec236411e347c5f11ae46a3fe339f402a34f0355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:12:41 +00:00
Becca Hughes
f9f3309fa0 Add service link when no providers are present 
Test: ondevice & atest
Bug: 273752971
Merged-In: Ia7080f5c44c2f59a386e00146b898228e5829988
Change-Id: Ia7080f5c44c2f59a386e00146b898228e5829988
 2023-03-28 22:51:33 +00:00
Julia Reynolds
812747f662 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: f1bd633fec -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I16d62672bad5e2fe6f7a392355f05d32eb7df2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:35:17 +00:00
Julia Reynolds
a51d23bf71 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours am: 592574f05d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Idaeea45cc46c829d0188b91675de8bb4163e8f25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:33:25 +00:00
Julia Reynolds
592574f05d [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I34532bbc1689a65d9d5cac6325956e4931ee7a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:03:48 +00:00
Julia Reynolds
f1bd633fec [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours am: 40bec70af8 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I3f18d0dfa27c9b8efd19e9f551605f7ff345c145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 22:01:10 +00:00
Julia Reynolds
40bec70af8 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours am: 82fcfa8da0 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I0c3f8af192ffa31af66955a27ef870122a04ce4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:46:08 +00:00
Julia Reynolds
82fcfa8da0 [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours am: 7c9190d25a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I78da1d627b1db61015124fbd3df59cd80376bbf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:16:39 +00:00
Julia Reynolds
33f3f4ec14 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours am: bb787882ef -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I34f5d58e0783230d0a6f8d96afd375bde94a7a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 21:13:17 +00:00
Julia Reynolds
7c9190d25a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours am: ceb2d0400a -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: Icb423063d82a05cfb734fd889f2799474f453c59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:43:18 +00:00
Julia Reynolds
bb787882ef [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours am: 135489a1d9 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ic3ea8057dd4ec225ef8464c579919a8feef75252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:41:25 +00:00
Julia Reynolds
ceb2d0400a [automerger skipped] Don't show NLSes with excessively long component names am: 79cb59e618 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 52a102cc2a is already in history

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

Change-Id: I6ab06a30496dffbfc038300866d0b3ca3c1d42a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:25:32 +00:00
Julia Reynolds
135489a1d9 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 94ef1c333f -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I53e932f4ab8997535abe729eb36d816c40b9145a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:14:52 +00:00
Julia Reynolds
521e233c51 [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours am: 8a344f301b -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Iec1626f7c6ac37a540ca2017998abd1d814a8e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:11:42 +00:00
Julia Reynolds
94ef1c333f [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: Ie295579d5360bdd8b35232e2233f8f572563357e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:46:09 +00:00
Julia Reynolds
8a344f301b [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours am: 7594f2deea -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I703bdb03adef5c11693b308a6e2f897417e43b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:45:07 +00:00
Weng Su
cc53f44d49 Revert "Disallow screenshot on Wi-Fi QR code settings" 
This reverts commit 950837b20f.

Reason for revert: The security issue is downgraded to NSI, remove the screenshot protection to rollback the original design.

Change-Id: Iecaf7e4e19dc3452a7d2aeaf32bf38619e760c76
 2023-03-28 19:30:11 +00:00
Julia Reynolds
7594f2deea [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours am: acb5e90d5d -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I22fe2da8599d3a5b002f6c145a15e71ed06634e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:20:42 +00:00
Julia Reynolds
acb5e90d5d [automerger skipped] [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a am: cbb6811219 -s ours 
am skip reason: Merged-In I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is already in history

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

Change-Id: I844c70ca3340a3800ca2b88b55094fdb9f111635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:08:05 +00:00
Alejandro Nijamkin
d2fb185677 Moves lock screen shortcuts summary loading to the background. 
To load the summary for the Settings > Display > Lock screen >
Shortcuts, we need to issue a binder/IPC call to query the content
provider that resides in the System UI process.

Previously, this was being done on the main thread. The thinking was
that it's critical to load this as soon as the Settings page is shown.
This results in ANRs, as per the attached bug.

The fix is to move the loading off the main thread and onto a background
thread.

Fix: 274788437
Test: unit tests updated
Test: manually verified that the summary is correct and that it updates
correctly after clicking on it, changing the lock screen shortcuts, and
going back

Change-Id: I41a5e883236de4f16c105f3930b8849538807f00
 2023-03-28 12:05:18 -07:00
Julia Reynolds
25665fe672 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087 am: f3216d6199 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Ia347aa1553301a35b2f45270dc9dcd6c43c9dc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:16:46 +00:00
David Liu
dcce76c04e Update flip camera for selfie gesture setting illustraion 
- Update illustration and support for lottie animation
- Support dark and light theme

Fixes: 210948498
Test: manually test - screenshots:
      - light: https://hsv.googleplex.com/4676803365961728
      - dark: https://hsv.googleplex.com/5105103477407744
Change-Id: I1d74f68f3f5079197c919ce405b789d863484fb8
 2023-03-28 18:06:07 +00:00
Julia Reynolds
f3216d6199 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 am: 9076122087 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I776ac765405be32ac29c0b164fd1ac4e506ecb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 17:36:26 +00:00
Julia Reynolds
cbb6811219 [automerged blank] Don't show NLSes with excessively long component names 2p: 52a102cc2a 
Blank merge reason: Change-Id I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571 with SHA-1 1f3969f615 is in history

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

Bug: 260570119
Change-Id: I5b2a0e7a53697962ea7f3b70891f70d687936332
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-28 16:56:20 +00:00
Julia Reynolds
52a102cc2a Don't show NLSes with excessively long component names 
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
Merged-In: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
 2023-03-28 16:56:07 +00:00
Julia Reynolds
9076122087 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: 1636440ed3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Id968cbebe67131d2b75bc4804721faaf7ebae377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:55:16 +00:00
Julia Reynolds
7bab275fa4 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f am: a39e960067 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I62ae4a927fc25c4ffbf2630654d3d041caead515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:51:14 +00:00
Julia Reynolds
1636440ed3 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I271dc0fe1a1c8bdeb6cebbda04167987f7916cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:25:16 +00:00
Julia Reynolds
a39e960067 Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc am: 0f7287271f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: Ie692fc30c4a91f1e318406a000eda9033ca1bcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 16:24:35 +00:00
Julia Reynolds
0f7287271f Don't show NLSes with excessively long component names am: 1f3969f615 am: 2e701b29dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290645

Change-Id: I65575bb2f0bf4b82498c523f8d0b4b76628e2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 15:53:58 +00:00
Avinash Vadlamudi
a4cf551d25 [Auto Pin Confirm]: Trigger PIN verification when auto confirm setting is being turned on or off 
- Fix the logic to set the pin_auto_confirm setting before triggering the password save workflow in ChooseLockPassword

Bug: 275385372
Test: atest AutoPinConfirmPreferenceControllerTest
Test: Manual Test
Change-Id: Id6774bc9afcd6d3161e023dc52911ae3e1f556c9
 2023-03-28 15:33:40 +00:00
Julia Reynolds
769bc5c7e0 Don't show NLSes with excessively long component names am: 90ced5d2ec am: d9604dbe15 am: cb2e6fba6d am: d15a84022e am: d152770e4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22290644

Change-Id: Ie08b73df9eaa822434a4ef1aa944e6050161cb33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 15:29:18 +00:00