Commit Graph

831 Commits

Author SHA1 Message Date
Nataniel Borges
939039c698 Merge "New CUJ: Swipe pip window to bottom center to close" into sc-dev am: 5e3c95bf79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13534125

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1a40f07b011a9f04b106468e8d4ad7729ceb089
2021-02-26 16:28:54 +00:00
Nataniel Borges
ca35310221 New CUJ: Swipe pip window to bottom center to close
Share the assertions between close with dismiss and close with swipe.

Bug: 172037252
Test: atest WMShellFlickerTests:PipCloseWithSwipe WMShellFlickerTests:PipCloseWithDismissButton
Change-Id: I03904f1de78d3204f9bdd0d6207ec4947f1404dd
2021-02-26 14:41:17 +01:00
Mark Renouf
1036ee23b2 Merge "Long screenshots framework update and API unhide" into sc-dev am: 20bd3d4935
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13429309

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic631f8c1d77c92d590865783881f2de61bad6566
2021-02-26 13:19:38 +00:00
Mark Renouf
20bd3d4935 Merge "Long screenshots framework update and API unhide" into sc-dev 2021-02-26 13:06:47 +00:00
Nataniel Borges
68b352e073 Merge "Promote stable app pairs tests" into sc-dev am: 31182d2383
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690791

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37dabcb945c00c95e08542cadb3efc904a2fc7f6
2021-02-26 13:01:08 +00:00
Nataniel Borges
89a044e3d0 Merge "Promote stable Pip tests" into sc-dev am: 62d88aac30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13704747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iced50d0d947c7ca091af7c9682b1c5af69c767c9
2021-02-26 13:00:51 +00:00
Nataniel Borges
31182d2383 Merge "Promote stable app pairs tests" into sc-dev 2021-02-26 12:46:12 +00:00
Nataniel Borges
62d88aac30 Merge "Promote stable Pip tests" into sc-dev 2021-02-26 12:46:08 +00:00
Nataniel Borges
99fae22459 Merge "New CUJ: Pip window moves when opening all apps" into sc-dev am: 470a4a95e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13518731

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e12f9a3571d3f2398e728ac16c1256ce8d79afd
2021-02-26 09:44:54 +00:00
Nataniel Borges
470a4a95e5 Merge "New CUJ: Pip window moves when opening all apps" into sc-dev 2021-02-26 09:34:06 +00:00
Nataniel Borges
7729077c66 Promote stable Pip tests
Promote stable postsubmit and flaky tests to presubmit

Test: atest FlickerTests
Bug: 171049720
Change-Id: I44aba59aaac9912848d287cf3cbea36e868a33e5
2021-02-26 10:14:32 +01:00
Lyn Han
55c5219533 Merge "Fix bubble flyout alignment for right-side stack" into sc-dev am: 27b5e90577
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e9e67b15c5a93174cf333f029acf27266cec98f
2021-02-26 00:18:31 +00:00
Lyn Han
27b5e90577 Merge "Fix bubble flyout alignment for right-side stack" into sc-dev 2021-02-25 23:50:34 +00:00
Mark Renouf
8f1b73e183 Long screenshots framework update and API unhide
This change includes a series of API review changes. The most
significant update is the addition of cancellation signals to
API methods where needed.

Renames some internal classes and interfaces to support the
API changes and to simplify tests and improve quality.

Test: numerous presubmits
Bug: 175830670
CTS-Coverage-Bug: 180419562
Change-Id: I9b1b950a2779fc902ecf4d6394e3c35171926700
2021-02-25 23:02:17 +00:00
Nataniel Borges
52eb6ffa55 Promote stable app pairs tests
Promote stable postsubmit and flaky tests to presubmit

Test: atest WMShellFlickerTests
Bug: 171049720
Change-Id: I7eff620e56b6c2ccf2704ffbf1576b766cbe4403
2021-02-25 22:09:23 +01:00
Nataniel Borges
6306b61682 New CUJ: Pip window moves when opening all apps
Bug: 174238224
Test: atest WMShellFlickerTests:PipMovesInAllApps
Change-Id: I31304a462f78bc435b395207b76efc707e316d4b
2021-02-25 21:55:12 +01:00
Hongwei Wang
b3b3c40f19 Merge "Fixes autoEnterPip transition from landscape" into sc-dev am: 9bdee79a47
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13677959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07b097bed269c7663c460b839a3dcedade7d28e6
2021-02-25 20:26:06 +00:00
Hongwei Wang
9bdee79a47 Merge "Fixes autoEnterPip transition from landscape" into sc-dev 2021-02-25 19:50:01 +00:00
Nataniel Borges
157cd54b97 Merge "Updates flicker documentation and improve naming" into sc-dev am: a32ef5bd2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13641706

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice7b865d894127c4cef94482836d6e80ac7fdbd1
2021-02-25 14:44:01 +00:00
Louis Chang
3dc3185216 Merge "Rename Stack to Task related terms (7/n)" into sc-dev am: 09f52aa440
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13468207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52b3df66c6b6dd517f35fd34ac877264a272c47d
2021-02-25 14:38:13 +00:00
Jason Chang
c4c8ffc938 Merge "Fix the wallpaper app cannot display into full screen when in one-handed mode" into sc-dev am: b33721641e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13416446

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62f4a5272993b38a62dee26da5e76863ec31b763
2021-02-25 14:35:54 +00:00
Chris Li
069d96e777 Merge "DisplayContent rotateBounds not keeping same physical position for 180" into sc-dev am: 7ff46d7137
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13620025

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If699ff02c6a3f5f082b854f0d1f450b11b63dd1a
2021-02-25 14:35:21 +00:00
Jerry Chang
0053333452 Merge "Make stage split divider non-interactive while showing IME" into sc-dev am: 3ea9673b74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5de932925852f27bd19895612f498b1b52fab8a3
2021-02-25 14:34:35 +00:00
Nataniel Borges
a32ef5bd2a Merge "Updates flicker documentation and improve naming" into sc-dev 2021-02-25 12:33:34 +00:00
Louis Chang
09f52aa440 Merge "Rename Stack to Task related terms (7/n)" into sc-dev 2021-02-25 04:58:24 +00:00
Louis Chang
7efc57797c Rename Stack to Task related terms (7/n)
- Renaming PinnedStack to PinnedTask
- Renaming DockedStack to DockedTask

Bug: 157876447
Test: presubmit
Change-Id: I51c10564647ed0d46eddc0c51a1ee06eef897e43
2021-02-25 04:57:26 +00:00
Jason Chang
b33721641e Merge "Fix the wallpaper app cannot display into full screen when in one-handed mode" into sc-dev 2021-02-25 02:55:13 +00:00
Chris Li
7ff46d7137 Merge "DisplayContent rotateBounds not keeping same physical position for 180" into sc-dev 2021-02-25 02:40:34 +00:00
Jerry Chang
3ea9673b74 Merge "Make stage split divider non-interactive while showing IME" into sc-dev 2021-02-25 00:51:14 +00:00
James O'Leary
2b416cd6c2 Merge "Revert^2 "[framework] Integrate new quantizers"" into sc-dev am: 7edf52d602
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13688547

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b0263b3b455044636b5a6ff8b322cfc13397760
2021-02-24 22:14:15 +00:00
James O'Leary
7edf52d602 Merge "Revert^2 "[framework] Integrate new quantizers"" into sc-dev 2021-02-24 21:59:47 +00:00
Lyn Han
5b449f56d0 Fix bubble flyout alignment for right-side stack
Fixes: 172490423
Test: send updates on left/right side in portrait/landscape
     => see that flyout is positioned correctly
Change-Id: I3dd84f467f17e8429a0ba2cc23f45e8c89474557
2021-02-24 13:04:00 -06:00
Bob Badour
09bb301158 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev am: 745e7ee830
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13670655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f4106acdb1594a0bcee65c9689fce32eaa65628
2021-02-24 18:57:53 +00:00
Lyn Han
08bb6f8b78 Merge "Reorder bubbles without animations on collapse" into sc-dev am: 26e6b76d99
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13665681

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6989ec6fdc8c8f18b8e5c157c5898d0e898d05b
2021-02-24 18:57:15 +00:00
Bob Badour
745e7ee830 Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into sc-dev 2021-02-24 18:43:29 +00:00
Lyn Han
26e6b76d99 Merge "Reorder bubbles without animations on collapse" into sc-dev 2021-02-24 18:38:37 +00:00
Lyn Han
95089b6d65 Reorder bubbles without animations on collapse
Fixes: 180045233
Test: select different bubble while expanded, collapse stack
     => see that newly selected bubble is on top of stack
     => no weird animations like in b/178499353
Change-Id: I6d95763a4dd08fd8d1e30dd93131ff27b4fd7c2c
2021-02-24 18:38:13 +00:00
Jerry Chang
d331097396 Make stage split divider non-interactive while showing IME
Redirect IME inset control to wm shell during multi-window split. And
register IME position listener to make divider bar non-interactive while
IME showing.

Bug: 179262787
Test: manual check
Test: atest WMShellUnitTests
Change-Id: Ia83a29c823962221aedb1cc317928f6b4b7ddcae
2021-02-25 02:27:27 +08:00
Hongwei Wang
c241580de5 Fixes autoEnterPip transition from landscape
Fixes included in this change
- PiP bounces back to fullscreen. The animation direction is not cleaned
  up after animation finishes and when display rotation callback
  happens and calls into PipTaskOrganizer#onMovementBoundsChanged, it
  accidentally invokes the onTaskVanished. Therefore, this does not
  happen on the first try but following attempts.
- PiP window offsets to the bottom caused by duplicated display changed
  callbacks, bail early if we know for sure the DisplayLayout objects
  are identical. Also, when display rotation callback happens, the
  PipBoundsState#getNormalBounds is still in landscape though the
  internal rotation has been set in PipController#startSwipePipToHome.

Known issue
- PiP window flickers at the end of the transition, will track in
  different bug.

Video: http://rcll/aaaaaabFQoRHlzixHdtY/hAdwMhKMaYTylRcnW24Utg
Bug: 179721427
Bug: 179718773
Test: repeatedly enter PiP from landscape with autoEnterPip, see video
Change-Id: I77c6f441563bc54720b9ef2952526691c495a777
2021-02-24 10:10:12 -08:00
James O'Leary
9d3ad10eb9 Revert^2 "[framework] Integrate new quantizers"
96169052c4

Change-Id: Idefcf279b9fedeeaa29f75e705adfb60f0ad5c8a
2021-02-24 17:09:06 +00:00
Nataniel Borges
6fa330e7fd Updates flicker documentation and improve naming
- Updates documentation to all subject methods.
- Standardize names between Layers and WindowStates subjects.

Bug: 162923992
Test: atest FlickerTests
Change-Id: I24ba3faa014cec1c4ee7ed42aa06044616890a53
2021-02-24 17:21:54 +01:00
Chris Li
29f24a134c DisplayContent rotateBounds not keeping same physical position for 180
Rotation_90 + rotation_90 is different from the result of rotation_180
with the current implementation. Should also take care of rotation_180.

Fix: 180751251
Bug: 173124775
Test: atest WmTests:DisplayContentTests
Test: atest WMShellUnitTests:DisplayLayoutTest
Test: atest FrameworksCoreTests:RotationUtilsTest
Change-Id: Ia1c87409b4c4cc412c3fd89e58d08b6ae2069fd0
2021-02-23 17:34:26 -08:00
Lucas Dupin
8a092cc39a Merge "Revert "[framework] Integrate new quantizers"" into sc-dev am: e36c4de103
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13679700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b1f05562c2c46aba8f541179c6004634b5c890
2021-02-24 01:23:45 +00:00
Lucas Dupin
e36c4de103 Merge "Revert "[framework] Integrate new quantizers"" into sc-dev 2021-02-24 01:00:49 +00:00
James O'Leary
96169052c4 Revert "[framework] Integrate new quantizers"
Revert "[sysuig] Integrate Monet color extraction to theme algorithm"

Revert submission 13554372-kahuna

Reason for revert: Colors on some wallpapers shifted, and Lucas found a couple big reasons why, would rather revert a revert tomorrow than fix forward today
Reverted Changes:
I2c3df9f71:[sysuig] Integrate Monet color extraction to theme...
I0fc60a134:[framework] Integrate new quantizers

Change-Id: I7eb8e4fde243bf62e8c750f88028db0a427560b5
2021-02-24 00:33:02 +00:00
Bob Badour
d59495855e [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  apct-tests/perftests/contentcapture/Android.bp
  apct-tests/perftests/inputmethod/Android.bp
  apex/appsearch/Android.bp
  apex/appsearch/framework/Android.bp
  apex/appsearch/service/Android.bp
  apex/appsearch/testing/Android.bp
  apex/jobscheduler/service/jni/Android.bp
  apex/media/service/Android.bp
  cmds/abx/Android.bp
  cmds/uinput/Android.bp
  cmds/uinput/jni/Android.bp
  core/tests/GameManagerTests/Android.bp
  core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp
  core/tests/batterystatstests/BatteryStatsViewer/Android.bp
  core/tests/devicestatetests/Android.bp
  libs/WindowManager/Shell/tests/flicker/Android.bp
  libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/Android.bp
  libs/androidfw/fuzz/cursorwindow_fuzzer/Android.bp
  native/android/tests/activitymanager/UidImportanceHelperApps/Android.bp
  native/android/tests/activitymanager/nativeTests/Android.bp
  packages/SettingsLib/BannerMessagePreference/Android.bp
  packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
  packages/SettingsLib/EmergencyNumber/Android.bp
  packages/SettingsLib/FooterPreference/Android.bp
  packages/SettingsLib/MainSwitchPreference/Android.bp
  packages/SettingsLib/TopIntroPreference/Android.bp
  packages/SettingsLib/UsageProgressBarPreference/Android.bp
  packages/overlays/AccentColorAmethystOverlay/Android.bp
  packages/overlays/AccentColorAquamarineOverlay/Android.bp
  packages/overlays/AccentColorBlackOverlay/Android.bp
  packages/overlays/AccentColorCarbonOverlay/Android.bp
  packages/overlays/AccentColorCinnamonOverlay/Android.bp
  packages/overlays/AccentColorGreenOverlay/Android.bp
  packages/overlays/AccentColorOceanOverlay/Android.bp
  packages/overlays/AccentColorOrchidOverlay/Android.bp
  packages/overlays/AccentColorPaletteOverlay/Android.bp
  packages/overlays/AccentColorPurpleOverlay/Android.bp
  packages/overlays/AccentColorSandOverlay/Android.bp
  packages/overlays/AccentColorSpaceOverlay/Android.bp
  packages/overlays/AccentColorTangerineOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationHoleOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationTallOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationWaterfallOverlay/Android.bp
  packages/overlays/DisplayCutoutEmulationWideOverlay/Android.bp
  packages/overlays/FontNotoSerifSourceOverlay/Android.bp
  packages/overlays/IconPackCircularAndroidOverlay/Android.bp
  packages/overlays/IconPackCircularLauncherOverlay/Android.bp
  packages/overlays/IconPackCircularSettingsOverlay/Android.bp
  packages/overlays/IconPackCircularSystemUIOverlay/Android.bp
  packages/overlays/IconPackCircularThemePickerOverlay/Android.bp
  packages/overlays/IconPackFilledAndroidOverlay/Android.bp
  packages/overlays/IconPackFilledLauncherOverlay/Android.bp
  packages/overlays/IconPackFilledSettingsOverlay/Android.bp
  packages/overlays/IconPackFilledSystemUIOverlay/Android.bp
  packages/overlays/IconPackFilledThemePickerOverlay/Android.bp
  packages/overlays/IconPackKaiAndroidOverlay/Android.bp
  packages/overlays/IconPackKaiLauncherOverlay/Android.bp
  packages/overlays/IconPackKaiSettingsOverlay/Android.bp
  packages/overlays/IconPackKaiSystemUIOverlay/Android.bp
  packages/overlays/IconPackKaiThemePickerOverlay/Android.bp
  packages/overlays/IconPackRoundedAndroidOverlay/Android.bp
  packages/overlays/IconPackRoundedLauncherOverlay/Android.bp
  packages/overlays/IconPackRoundedSettingsOverlay/Android.bp
  packages/overlays/IconPackRoundedSystemUIOverlay/Android.bp
  packages/overlays/IconPackRoundedThemePickerOverlay/Android.bp
  packages/overlays/IconPackSamAndroidOverlay/Android.bp
  packages/overlays/IconPackSamLauncherOverlay/Android.bp
  packages/overlays/IconPackSamSettingsOverlay/Android.bp
  packages/overlays/IconPackSamSystemUIOverlay/Android.bp
  packages/overlays/IconPackSamThemePickerOverlay/Android.bp
  packages/overlays/IconPackVictorAndroidOverlay/Android.bp
  packages/overlays/IconPackVictorLauncherOverlay/Android.bp
  packages/overlays/IconPackVictorSettingsOverlay/Android.bp
  packages/overlays/IconPackVictorSystemUIOverlay/Android.bp
  packages/overlays/IconPackVictorThemePickerOverlay/Android.bp
  packages/overlays/IconShapeHeartOverlay/Android.bp
  packages/overlays/IconShapePebbleOverlay/Android.bp
  packages/overlays/IconShapeRoundedRectOverlay/Android.bp
  packages/overlays/IconShapeSquareOverlay/Android.bp
  packages/overlays/IconShapeSquircleOverlay/Android.bp
  packages/overlays/IconShapeTaperedRectOverlay/Android.bp
  packages/overlays/IconShapeTeardropOverlay/Android.bp
  packages/overlays/IconShapeVesselOverlay/Android.bp
  packages/overlays/NavigationBarMode2ButtonOverlay/Android.bp
  packages/overlays/NavigationBarMode3ButtonOverlay/Android.bp
  packages/overlays/NavigationBarModeGesturalOverlay/Android.bp
  packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/Android.bp
  packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/Android.bp
  packages/overlays/NavigationBarModeGesturalOverlayWideBack/Android.bp
  packages/overlays/OneHandedModeGesturalOverlay/Android.bp
  packages/services/CameraExtensionsProxy/Android.bp
  services/core/java/com/android/server/speech/Android.bp
  services/musicrecognition/Android.bp
  services/searchui/Android.bp
  services/smartspace/Android.bp
  services/tests/PackageManagerServiceTests/host/libs/IntentVerifyUtils/Android.bp
  services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
  services/tests/PackageManagerServiceTests/host/test-apps/IntentVerifier/Android.bp
  services/tests/PackageManagerServiceTests/host/test-apps/IntentVerifierTarget/Android.bp
  services/tests/PackageManagerServiceTests/host/test-apps/UsesStaticLibrary/Android.bp
  services/tests/PackageManagerServiceTests/unit/Android.bp
  services/tests/inprocesstests/Android.bp
  services/tests/mockingservicestests/jni/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  services/texttospeech/Android.bp
  services/translation/Android.bp
  tests/BatteryStatsPerfTest/Android.bp
  tests/FlickerTests/test-apps/Android.bp
  tests/Input/Android.bp
  tests/SilkFX/Android.bp
  tests/SurfaceViewBufferTests/Android.bp
  tests/UpdatableSystemFontTest/Android.bp
  tests/UpdatableSystemFontTest/testdata/Android.bp
  tests/benchmarks/internal/Android.bp
  tools/powerstats/Android.bp
  tools/processors/intdef_mappings/Android.bp
  tools/xmlpersistence/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I1b8d155a26a1a589a38abedea5f7f366e00346c6
2021-02-23 13:18:34 -08:00
James O'Leary
a8bc221e63 Merge "[framework] Integrate new quantizers" into sc-dev am: c7d315947d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13553700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4db79eb69b8a2fb619d04b7b7b9ef2320655ad0
2021-02-23 20:25:01 +00:00
James O'Leary
c7d315947d Merge "[framework] Integrate new quantizers" into sc-dev 2021-02-23 20:20:39 +00:00
Nataniel Borges
953bde5925 Merge "Use FlickerParametersRunnerFactory" into sc-dev am: cd9b08647a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13619725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04cff6b557b1401f068fd3f91871bcd63d460c71
2021-02-23 19:37:33 +00:00
Nataniel Borges
c39b644471 Use FlickerParametersRunnerFactory
JUnit4 Parameterized runner allows us to create custom UseParametersRunnerFactory classes. Flicker now uses this method for better compatibility with Flaky Failure FingerPrinting and Crystalball

Bug: 162923992
Test: atest FlickerTests
Change-Id: Iac3e9972b39fb96bf7fe85beac16728c5947766b
2021-02-23 16:06:17 +01:00