Commit Graph

19452 Commits

Author SHA1 Message Date
Vadim Tryshev f8814d1c3c Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Ia3d518be4d57ee77adfded8f10fe87e134bbaba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 23:04:29 +00:00
Vadim Tryshev 1a18734f42 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I54871c0b6f0b970f68e1746d4b013e85a18f64d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:23:07 +00:00
Vadim Tryshev eb4303a374 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I015eb4e54795e95132c0dc62af278acccfde7009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:22:40 +00:00
Vadim Tryshev 1dbf04c62c Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I96ace6acf347f3e26803af4489f894684ac08416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:22:29 +00:00
Andy Wickham 64896f3098 Put the "floating" in ENABLE_FLOATING_SEARCH_BAR.
This means adding the search view to the drag layer, so it can
persist and animate across Launcher states (i.e. Home, All Apps,
Overview, Overview from App).

Some high level things:
 - LauncherState now has a flag indicating if the floating
   search bar should be visible, as well as a method indicating
   how high it should rest when the keyboard is not showing. By
   default the height is set negative if the flag is not present,
   so the search bar will rest off screen in that state.
 - LauncherState also has a new method indicating if the search
   bar should show as a pill when not focused. Currently this is
   done in phone portrait mode in all apps and overview.
 - SearchUiManager now has a method for gestures to hint that
   the search bar will be focused or unfocused soon, e.g. for
   the app -> overview case, we hint that it will be focused
   when crossing the threshold, and unfocused if retracting.
   This allows the search bar to animate during the gesture
   and take or release focus after the state change completes.
 - AllAppsTransitionController lets the apps panel translate in
   from the bottom of the screen, for example when coming from
   an app and we don't want to pop it in halfway up the screen.
   Instead it can slide in gracefully from behind the keyboard
   and floating search bar.
 - KeyboardInsetAnimationCallback can now notify listeners of
   keyboard alpha changes during controlled animations. And
   StateAnimationConfig has a new animation type to control
   the keyboard alpha during the all apps transition.
 - This new ANIM_ALL_APPS_KEYBOARD_FADE is used to pop the
   keyboard in at the threshold for going from an app to all apps.
   Note that its position moves linearly before this, so the
   search bar starts moving up accordingly before the keyboard
   alpha is non-0.

Fix: 266761289
Fix: 268845147
Fix: 267683921
Fix: 265849321
Fix: 266446733
Fix: 269301440
Bug: 275635606
Bug: 259619990
Bug: 261866704
Test: Manual with all the state transitions on phone and tablet
(also folding/unfolding foldable).
Flag: ENABLE_FLOATING_SEARCH_BAR, ENABLE_ALL_APPS_FROM_OVERVIEW
(latter just for the background app interpolator changes).

Change-Id: I6f06552e95747348a62260279626cf407bf145b0
2023-06-12 21:55:24 +00:00
Vadim Tryshev af641a6e80 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev 2023-06-12 21:49:39 +00:00
Saumya Prakash b932cf4b64 Update the strings in the gesture nav tutorial
Change the strings for the instructions and feedback for the gesture navigation tutorial to align with new UX changes.

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fix: 286547594
Test: Manually went through the redesigned tutorial and verified that
the new strings correctly show up. Also checked that the previous
tutorial remains unchanged.

Change-Id: I27a3e8c0f09e7755e6087ce5b004b687f229d153
2023-06-12 21:26:43 +00:00
Schneider Victor-tulias 7ebb54f24e Polish redesgined tutorial home and overview animations
- Added a 6th hotseat icon to the tablet and unfolded foldable
- not animating the previous task view when animating to hotseat from the home step
- updating the first hotseat icon's color and visibility at the correct times
- cross fading the animating task view and hotseat icon's color

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 283967613
Test: ran the tutorial on handheld, tablet and foldable with ENABLE_NEW_GESTURE_NAV_TUTORIAL true and false
Merged-In: I7a76646ca71502e924f45bba76d72be17d31249d
Change-Id: I7a76646ca71502e924f45bba76d72be17d31249d
2023-06-12 21:04:38 +00:00
Schneider Victor-tulias 1c2c5a58a2 Polish redesgined tutorial home and overview animations
- Added a 6th hotseat icon to the tablet and unfolded foldable
- not animating the previous task view when animating to hotseat from the home step
- updating the first hotseat icon's color and visibility at the correct times
- cross fading the animating task view and hotseat icon's color

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 283967613
Test: ran the tutorial on handheld, tablet and foldable with ENABLE_NEW_GESTURE_NAV_TUTORIAL true and false
Change-Id: I7a76646ca71502e924f45bba76d72be17d31249d
2023-06-12 21:03:30 +00:00
Brian Isganitis ca296e162f Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1 am: d0e61e3eef am: 6a5c91e503
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: I8ed462837fb86f51d805df70880490f7017b711e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:54:16 +00:00
Brian Isganitis 4337083b40 Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1 am: d0e61e3eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: I6140b46469c6e4251819afdd124bc869bceeadac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:07:50 +00:00
Brian Isganitis eb02259f3c Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1 am: af4d675429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: Idc307b3a98ed5f451fb2eca302185db2db4a2ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:00 +00:00
Brian Isganitis 6a5c91e503 Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1 am: d0e61e3eef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: Ibec41dd7c9dd71804f21071e5609238d68b54f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:05:39 +00:00
Saumya Prakash 08a2708739 Scale the gesture tutorial animation to work on smaller devices
The lottie animations in the gesture navigation tutorial would get cut
off due to having to crop them to smaller devices. This change uses a
matrix to correctly scale the animation such that the aspect ratio is
maintained.

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fix: 283969417
Test: Went through the tutorial on devices of different sizes and aspect
ratios and ensured that the lottie animation isn't cut off.

Change-Id: I4b4cc9e11a68daef29fa31d6a89a1c9006041937
2023-06-12 17:55:00 +00:00
Vadim Tryshev b5057c496a Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"
This reverts commit 1a2462914d.

Reason for revert: Likely culprit for b/286115393

Change-Id: I613ca9f62c5b9f43f2e3cd240e45bc1a0db0e661
2023-06-12 17:40:22 +00:00
Bill Yi 561174ddf6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5b1384ccf3339b162d07528db7103c14cf7bb44f
2023-06-12 10:26:18 -07:00
Bill Yi bbc1a03398 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I4a5bd1bf460e125f19c840a0d1c46d758282d0fc
2023-06-12 10:25:48 -07:00
Brian Isganitis f3186a083b Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: I1e74fc022373dfe46959023b9f5e0bea1be51fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:22:23 +00:00
Brian Isganitis af4d675429 Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: I91b041c9c3d721053da4137e0294788d4fa5f263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:21:39 +00:00
Brian Isganitis ead579cffc Merge changes If4669756,Ide702745 into udc-dev am: 77a40999e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23603557

Change-Id: Ia114dd066ac2fe36cdb06af80479aed240f76a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:21:32 +00:00
Brian Isganitis d478b1464e Support zero-state suggestions in Taskbar All Apps.
Test: manual
Bug: 216683257
Flag: ENABLE_ALL_APPS_SEARCH_IN_TASKBAR
Change-Id: I016d4e4e6a096ca4f5bd65fcda1bf24a444459f4
2023-06-12 17:19:16 +00:00
Brian Isganitis 77a40999e1 Merge changes If4669756,Ide702745 into udc-dev
* changes:
  Make sure FLAG_IN_APP is set when launching apps from keyguard.
  Report unstashed content insets for notification panel.
2023-06-12 16:51:37 +00:00
Saumya Prakash 8a4eb637cc Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521 am: 4522e5d2ec am: 1d73aa9da2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: I5e2f94c93b7204eb9fc3b50fa81c531bbfe9cdf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 00:34:07 +00:00
Saumya Prakash 7a69792b26 Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521 am: 4522e5d2ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: I0efd0da5bea9f4490b2688aaf295a320947eceea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:56:40 +00:00
Saumya Prakash 1d73aa9da2 Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521 am: 4522e5d2ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: Ia4093c65ff8eeb97d3d1952a6d2399123cf4490a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:52:33 +00:00
Saumya Prakash 534849d0de Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521 am: fc62eee373
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: I2cc5c608e92395c4cdf0db450fe16c93840bae5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:52:32 +00:00
Saumya Prakash 36671ba580 Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: I8312c00de4839e348eac747e7f2da18b1d672e67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:14:35 +00:00
Saumya Prakash fc62eee373 Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: Ic3514293cb7c94684b93b0bf811636b1a8cb5291
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:14:23 +00:00
Saumya Prakash 9c68e3637e Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev am: 372de4f521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23493333

Change-Id: Ib689779cdd7ac6de5eb61cff22d1967bc8cb10fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-11 23:10:23 +00:00
Saumya Prakash 372de4f521 Merge "Enforce the correct orientation for the gesture navigation tutorial" into udc-dev 2023-06-11 22:24:13 +00:00
Tracy Zhou 74ebb2f7f9 Merge "Guard TrackpadStatusBarInputConsumer with canStartSystemGesture" into udc-qpr-dev am: a6909d121a am: db6d5e186b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23620517

Change-Id: Iaeababcf8ff14429008d4b7d5714e03b76872466
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 21:20:28 +00:00
Tracy Zhou db6d5e186b Merge "Guard TrackpadStatusBarInputConsumer with canStartSystemGesture" into udc-qpr-dev am: a6909d121a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23620517

Change-Id: I5461b75f808f47a2aaad127fca120d26a87646c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-10 20:39:28 +00:00
Tracy Zhou a6909d121a Merge "Guard TrackpadStatusBarInputConsumer with canStartSystemGesture" into udc-qpr-dev 2023-06-10 20:00:15 +00:00
Jagrut Desai 768abdaf60 Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b am: 45263ef98a am: 289010894c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I9da792fce62215786f63152daab84b2b3aad353d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:49:53 +00:00
Randy Pfohl 7f66811a86 Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96 am: f076999f4e am: bf44d185e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: I8620bf03a40a53ccd94252d9155acc62ecc6fe39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:48:39 +00:00
Jagrut Desai 289010894c Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b am: 45263ef98a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I33da842c2bd0f5bf47cd377684776735ba917e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:25:59 +00:00
Jagrut Desai a2d86286fe Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b am: 45263ef98a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I9c8d22e27c3ec63047df5b9341e2541891b66ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:25:43 +00:00
Jagrut Desai 17ebcfcd10 Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b am: 32f2b2f075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I671cc8902fd3cf4088445faabfaa1f3fff8d950e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:25:39 +00:00
Randy Pfohl 95e5733a74 Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96 am: f076999f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: Ibe467441c347e73a317db7155f8bb162329b5633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:25:25 +00:00
Randy Pfohl bf44d185e8 Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96 am: f076999f4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: Ic6f4fd2a614d7121d720dbde1c4bf75130bc1d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:25:23 +00:00
Randy Pfohl c9b65f53fe Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96 am: 25b8fef133
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: I897b0ebe8c819b0d7cf6d9948e2ccc356a26d820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 23:24:05 +00:00
Jagrut Desai 59048639d4 Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I44856fb71d85b745d64ef65fc2d2f2c37d360f33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:42:19 +00:00
Jagrut Desai 32f2b2f075 Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I26f878b4c2631be85a6ae888f267768546995853
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:41:30 +00:00
Jagrut Desai c11b9cd90a Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev am: 2d5bb34b6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624910

Change-Id: I5bad0e4d77b2243ca1765abde4da84cb5a0dfc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:41:02 +00:00
Randy Pfohl ffa5a7daf2 Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: I690d8cf3cbed8b507dba828ea118fe020d176377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:40:51 +00:00
Randy Pfohl d55d75223b Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: Ic10e7de36a5811362f2c032090e5429c7eb2d4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:40:12 +00:00
Randy Pfohl 25b8fef133 Merge "Updating content description of taskview after latest update" into udc-dev am: 5e1ccf2e96
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623291

Change-Id: I9f8d1f397776b446dfdf018b853bfae37692b533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 22:39:53 +00:00
Jagrut Desai 2d5bb34b6b Merge "Set AccessibilityPaneTitle for taskbar view" into udc-dev 2023-06-09 22:26:39 +00:00
Randy Pfohl 5e1ccf2e96 Merge "Updating content description of taskview after latest update" into udc-dev 2023-06-09 22:06:41 +00:00
Saumya Prakash e2711c254a Enforce the correct orientation for the gesture navigation tutorial
The lottie animations used for the gesture navigation tutorial are
designed for specific orientations depending on the device. This change
ensures that users are in the correct orientation for their device. For large screen users in portrait mode, we display a prompt to rotate the screen.

Flag: ENABLE_NEW_GESTURE_TUTORIAL
Fix: 277781713
Bug: 276515961
Test: Manually went through the tutorial starting from both
orientations on handheld, foldable, and tablet to ensure that the prompt
was shown and hidden correctly. Also ensured that gestures cannot be
completed in the background while the prompt is being shown.

Change-Id: I86ae566721f240264177ad4ec7fc12e58d1b95cd
2023-06-09 21:41:07 +00:00