Commit Graph

348 Commits

Author SHA1 Message Date
Raman Tenneti ab98166c36 AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and Presubmit verify.

Change-Id: I44e903046dd4cd9c7c07872fc56a8d552eb09522
2020-08-04 00:35:03 +00:00
TreeHugger Robot 707727b6ae Merge "Creating UI tests for overview action buttons." into ub-launcher3-rvc-qpr-dev am: bf84725855 am: 8c10f6801f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12242419

Change-Id: I3cd8c26f5e774c5d54683c21006060d2d19fdf19
2020-07-31 21:54:17 +00:00
Sreyas bf103f16b1 Creating UI tests for overview action buttons.
Change-Id: Ie6298064a068dc978ca33fb64e1856c3ba2a8cb1
2020-07-31 13:20:08 -07:00
Sunny Goyal 8b74cc761b Moving all-apps predictions to Launcher model
Predictions are loaded and managed by Launcher model and follow
the model lifecycle. They are then bound to the callback which
handles the UI

Bug: 160748731
Change-Id: I4a3ea0698d80fafe94afb4ce66ffa7f4a6a91c68
2020-07-29 13:07:52 -07:00
vadimt 4bc691b988 Removing workarounds for a fixed bug
Bug: 148422894
Change-Id: Ic6faa173ac5f28c8656daf68ac8304563264afdd
2020-07-13 20:02:13 -07:00
Hyunyoung Song 0b51b916b0 Merging from ub-launcher3-rvc-dev @ build 6617269
Bug: 150504032
Test: manual, presubmit on the source branch
https: //android-launcher.teams.x20web.corp.google.com/merge/ub-launcher3-rvc-dev_master_6617269.html
Change-Id: I2a168bfa8e3979ade26ab1d3cddbbae84cf79590
2020-06-22 18:53:39 -07:00
vadimt 8914c51660 Workaround for activity manager crashing when trying to start an app
It flakes when one of the tests starts calculator while there zero
activities in the system.

Bug: 143488140
Change-Id: Id9d350f0de8a83eb50e35e9efa4226b8d45ca641
2020-06-20 01:12:50 +00:00
vadimt d8e5660b13 Fixing broken tests on 2 and 3 button devices.
Bug: 143488140
Change-Id: I30886da129825b800984baa08742ac4dfcf4a599
2020-06-17 10:19:51 -07:00
TreeHugger Robot 9354de6c91 Merge "Attempt to workaround a leak on Taimen" into ub-launcher3-rvc-dev 2020-06-16 20:58:39 +00:00
Miranda Kephart efdc4e2318 Merging from ub-launcher3-rvc-dev @ build 6595814
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6595814.html

Change-Id: I4be85d0e52cc3cb8801012a7313a269851680c8b
2020-06-16 20:52:28 +00:00
vadimt 6a3de331af Attempt to workaround a leak on Taimen
It's a flake.
It was likely caused by enabling fallback tests, and we don't know
what's leaked and why.

Bug: 143488140
Change-Id: I0d0c88ac9b0de316861f16ba023a596c1f39cde4
2020-06-16 20:21:49 +00:00
vadimt f6a179d3ae Remove a comment that a line of code is a workaround
Bug: 157099707
Change-Id: I417df10735438caf6fd7fd5833817b5c43a1e856
2020-06-15 10:19:15 -07:00
vadimt 01bb8125b0 Enable FallbackRecentsTest
With some temporary workarounds.

Bug: 143488140

Change-Id: Id1ed2d06fd3265a6aa7f98d2900733f580359944
2020-06-12 15:12:37 -07:00
Pinyao Ting 8020bf2f4b Merging from ub-launcher3-rvc-dev @ build 6577335
Bug: 150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_6577335.html

Change-Id: Ie1f44dd646088759fef66251fe9e5f584b804d73
2020-06-10 21:54:11 +00:00
vadimt 454de304d0 Workaround for an activity leak
We were told that showing NexusLauncherActivity should suppress the
leak.

Bug: 157099707
Change-Id: I9988ac4a20609e5b25ddc4a90bedf891d45e69da
2020-06-08 15:16:15 -07:00
Adam Cohen e557bac0a1 Merging from ub-launcher3-rvc-dev @ build 6552182
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6552182.html

Change-Id: I795aafd151c6ce53077e1aebb97567eedd84f274
Merged-In: I795aafd151c6ce53077e1aebb97567eedd84f274
2020-06-03 20:28:44 +00:00
Sunny Goyal b396864072 Fixing loadTasksInBackground called twice on swipe up
Bug: 157644889
Change-Id: Ia4413ea878f8ba731fbb7a8f61b7c0c0050f3811
2020-06-01 15:12:32 -07:00
Winson Chung 6e0d05fc41 Merging from ub-launcher3-rvc-dev @ build 6492476
Bug: 150504032
Test: manual, presubmit on the source branch
    x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6492476.html
Change-Id: I96b36965f7b471eb77aa78a8b923ed9298e8a02f
2020-05-13 23:22:18 +00:00
Vinit Nayak b9522d334a Infer launcher rotation when initializing RecentsOrientedState
fixes: 154776599
Change-Id: I9b95f7f96836a974be0fd1236547efb4b405fda5
2020-05-11 11:23:49 -07:00
Vinit Nayak 77762fdf4f Merge "Revert "Disabling flaky test until fix is found"" into rvc-dev 2020-05-08 20:41:16 +00:00
Vinit Nayak 1be8a17986 Revert "Disabling flaky test until fix is found"
This reverts commit fdaa12d028.

Reason for revert: Should be fixed with ag/11252279

Bug: 150958400
Change-Id: Ia61462239ad5d8aba502bc8513d685046c1a1361
2020-05-08 20:41:01 +00:00
Santiago Etchebehere 82902c0da6 Merging from ub-launcher3-rvc-dev @ build 6436292
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6436292.html

Change-Id: I28d6ec42b7a6a8e779abb306cc29c9801910206f
2020-04-27 22:40:31 -07:00
TreeHugger Robot d73d39b45a Merge "Makeshift analog of Strictmode leak detector" into ub-launcher3-rvc-dev 2020-04-23 03:22:31 +00:00
vadimt b3e8ae8230 Makeshift analog of Strictmode leak detector
Strictmode leak detector is still a goal, but we might not be able to
achieve it in R. Strictmode has several framework-side bugs that perhaps
hide Launcher-side strictmode violations, while the time to fix
everything is limited, and new leaks get introduced all the time.

For now, implementing a check that is slightly more relaxed than
Strictmode, but still ensures the absence of leaks. I’ll keep
eliminating Strictmode violations as well as keep strengthening the
makeshift checker conditions until we’ll be able to enable Strictmode in
continuous testing.

I’m disabling Strictmode checks for now so that they don’t generate
unnecessary hprof dumps, but leaving the code dealing with strictmode.

Bug: 139137636
Change-Id: Ib10136b0d4e9892f70a19cd052ae5a54cf0a4efb
2020-04-22 19:00:12 -07:00
Sunny Goyal 34ff8cb3c1 Adding common code for instrumentation and robolectric tests
Change-Id: Ia338f0565868bb174ef5f6721924944792866be6
2020-04-20 14:42:30 -07:00
Vinit Nayak b20995ba8e Merge "Disabling flaky test until fix is found" into rvc-dev 2020-04-17 06:24:44 +00:00
Vinit Nayak fdaa12d028 Disabling flaky test until fix is found
TaplTestsQuickstep.testAllAppsFromHome

Bug: 150958400
Change-Id: I333a5f21652a5a8fc7bb90387b6bd0c81ac56330
2020-04-16 18:24:49 -07:00
Hyunyoung Song 19a6022ae4 Merging from ub-launcher3-rvc-dev @ build 6396980
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-dev_rvc-dev_6396980.html

Change-Id: If639a1565ce5c4af36d7bce3701b0d1d77fedec0
2020-04-15 15:49:20 -07:00
Sunny Goyal e396abf502 Moving model data structures to a separate file
Change-Id: I77ad7a5219e72d2e0d6c1803de2ac3ed6a65a8f7
2020-04-09 13:20:39 -07:00
Adam Cohen df83c9026d Merging from ub-launcher3-master @ build 6356169
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_6356169.html

Change-Id: Ife6c578d9a1e212eccdf3cf9a0cd838132eb90f5
2020-04-03 18:34:45 +00:00
vadimt 0dd1bd1113 TAPL: Verifying activity start/stop events
It also turned out that Pilfer event seems to come in a
non-deterministic order relative to the events from the Main and TIS
sequences. So I moved it to its own sequence.

Change-Id: Ie4ea5865afd900bebbd8287dad2372c94dce8ad5
2020-03-27 10:23:33 -07:00
Winson Chung 5bee1f934b Merge "Revert^2 "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev 2020-03-17 23:24:32 +00:00
Winson Chung c18b7a4b04 Revert^2 "Merging from ub-launcher3-master @ build 6294827"
70a76a61bf
Bug: 151611270
Change-Id: I16e0afcda998d2b1293ff47a66d5562fa4da77dc
2020-03-17 20:51:09 +00:00
vadimt bd0955dfd7 Using cmd overlay enable-exclusive to switch nav modes
Bug: 151598694
Change-Id: I7df6b7538f7233163868065b866b610c45dc7b46
(cherry picked from commit ccf083dc7d)
2020-03-17 00:10:21 +00:00
vadimt ccf083dc7d Using cmd overlay enable-exclusive to switch nav modes
Bug: 151598694
Change-Id: I7df6b7538f7233163868065b866b610c45dc7b46
2020-03-16 12:43:10 -07:00
Anthony Stange 70a76a61bf Revert "Merging from ub-launcher3-master @ build 6294827"
Revert "Merging from ub-launcher3-master @ build 6294827"

Revert "Merging from ub-launcher3-master @ build 6294827"

Revert "Merging from ub-launcher3-master @ build 6294827"

Revert "Merging from ub-launcher3-master @ build 6294827"

Revert submission 10673936-merge_ub-launcher3-master_6294827

Reason for revert: b/151611270
Reverted Changes:
I38a587a1b:Merging from ub-launcher3-master @ build 6294827
I74ae8bea8:Merging from ub-launcher3-master @ build 6294827
I115742e03:Merging from ub-launcher3-master @ build 6294827
Iceb1e8523:Merging from ub-launcher3-master @ build 6294827
Ie242e3907:Merging from ub-launcher3-master @ build 6294827
I609b18fdd:Merging from ub-launcher3-master @ build 6294827

Change-Id: I96f08492cb92e2f670375269423d8b45a81312cf
2020-03-16 15:24:15 +00:00
Vinit Nayak 8674a882f6 Merging from ub-launcher3-master @ build 6294827
Bug:150504032
 Test: manual, presubmit on the source branch
 x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6294827.html

Change-Id: I74ae8bea8c64f116ca7663569cc0e9569f506ca5
2020-03-16 06:14:18 +00:00
Vadim Tryshev 9099dfcfb7 Merge "Test tweaks for the memory activity recreation test" into ub-launcher3-master 2020-03-06 18:36:05 +00:00
Vinit Nayak 8f03c5c1ce Merging from ub-launcher3-master @ build 6269120
Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6269120.html
Change-Id: I17d430abf3804e30d5d76628c2a4e693d4f1d700
2020-03-06 03:50:15 +00:00
TreeHugger Robot d26618acba Merge "Enabling testQuickSwitchFromApp after causes of flakiness were fixed" into ub-launcher3-master 2020-03-05 18:56:07 +00:00
vadimt f6385576d5 Disabling testToast on virtual devices
Bug: 150303529
Change-Id: Ie523b79468f37e9edbd50f77db4d358e6713a463
2020-03-04 18:49:52 -08:00
vadimt 04b90c0fcb Test tweaks for the memory activity recreation test
Speeding up switching navigation mode by switching from latch
(which is not fired) to polling. I'll figure out later why the latch
doesn't work.

Bug: 139137636
Change-Id: I28a9b2b9a3882919fd2a3280b9804afe1b44a46e
2020-03-04 17:36:29 -08:00
vadimt 99f8a99463 Enabling testQuickSwitchFromApp after causes of flakiness were fixed
Bug: 143285809
Change-Id: Ie0c20bfdb04276adf349e90bf6826c89e9fbb5e3
2020-03-04 10:52:22 -08:00
Vadim Tryshev d4fb87e265 Merge "Disabling failing test" into ub-launcher3-master 2020-03-02 21:39:58 +00:00
vadimt c8bae0ab71 Disabling failing test
Change-Id: I5989ce406c66834b77ff4bd073cd3ad92df9fda2
2020-03-02 13:35:55 -08:00
Mehdi Alizadeh 3210c06687 Merging from ub-launcher3-master @ build 6248758
Test: manual, presubmit on the source branch
http: //x20/teams/android-launcher/merge/ub-launcher3-master_6248758.html
Change-Id: I1c64ab220493793ba10cbbecf38a4df8381d8a54
Bug: 150504032
2020-02-29 01:52:25 +00:00
Vadim Tryshev d8995a6fda Merge "Revert "TAPL: Verifying activity start/stop events"" into ub-launcher3-master 2020-02-28 22:29:47 +00:00
Vadim Tryshev 3dd64ca3a8 Revert "TAPL: Verifying activity start/stop events"
This reverts commit 1186700c9a.

Reason for revert: Fails in the lab

Change-Id: I6715a058c76d96752b904331968b46a07ce93f85
2020-02-28 22:28:16 +00:00
Zak Cohen 23ceafe3d5 Merge "TAPL tests - make all apps in overview checks less fragile." into ub-launcher3-master 2020-02-28 21:21:36 +00:00
Zak Cohen dc24231e4f TAPL tests - make all apps in overview checks less fragile.
Tests that check for all apps in overview mode were only checking for
actions being enabled. This isn't sufficient logic, two button mode also
uses all apps.

Centralize the check for all apps.

Test: local tapl tests
Change-Id: If1bf98019e6f1aea8f7967883aba6780743e9d6b
2020-02-28 11:59:33 -08:00
Vadim Tryshev 64a932ed2a Merge "TAPL: Verifying activity start/stop events" into ub-launcher3-master 2020-02-28 19:22:32 +00:00
Zak Cohen eecb258cc7 Merge changes from topic "enable" into ub-launcher3-master
* changes:
  Overview Actions - Enable by default.
  TAPL test update - don't run all apps in overview tests with actions.
2020-02-27 19:48:51 +00:00
vadimt 1186700c9a TAPL: Verifying activity start/stop events
It also turned out that Pilfer event seems to come in a
non-deterministic order relative to the events from the Main and TIS
sequences. So I moved it to its own sequence.

Change-Id: I5851aafb6d04398c5727712eaf8561916a30c4c5
2020-02-27 11:12:35 -08:00
Zak Cohen fe935dfbc1 TAPL test update - don't run all apps in overview tests with actions.
Overview actions removes the all apps from overview. Don't run the tests
that depend on these.
Ultimately need to add more tests for the actions.

Test: tapl local
Change-Id: I2471d10af7bc03a40a94f99aa16354b85bdb3ad7
2020-02-25 15:09:12 -08:00
vadimt 1779a38290 Using StrictMode to detect activity leaks
Change-Id: I615f641897d57be0cd31be944796c6931ef9ab00
2020-02-25 14:46:27 -08:00
vadimt b79614cc93 Performing a check for a crashed Launcher process for each UI test 2020-02-25 02:28:32 +00:00
Jon Miranda 98e484548c Merging from ub-launcher3-master @ build 6219992
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6219992.html

Change-Id: Iff1e0d32b4ded4cb51c91c187d85f128b92157ca
2020-02-19 13:11:10 -08:00
vadimt 3a49aa090f Enable testQuickSwitchFromApp after fixing what caused it to fail
Bug: 143285809
Change-Id: Ic7895ab7d4ef3ab207fc77184eb53f0f6d8e9b23
2020-02-13 16:14:15 -08:00
vadimt 047812a906 Remove test testPressRecentAppsLauncherAndGetOverview
It tests UiDevice.pressRecentApps(), which we don't use, so we don't
need to test it.

Bug: 131115533
Change-Id: I3a1b31f3b8368e3c848c888a5a27577faa940832
2020-02-11 19:15:59 -08:00
vadimt c71db98747 Increasing nav mode settlement timeout as an attempt to workaround nav
mode mismatch bug.

Bug: 148422894
Change-Id: I1295c1415a308ec461d302c9973309f4de77f984
2020-02-07 10:34:59 -08:00
Hongwei Wang 51c6fdf7c3 Merging from ub-launcher3-master @ build 6188107
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6188107.html

Change-Id: I84c1ea301508ba5f0f3d337a423cea8e61832c0d
2020-02-06 15:03:07 -08:00
Winson Chung 85cd51e0e2 Merge "Remove workaround for starting app" into ub-launcher3-master 2020-02-04 21:43:49 +00:00
Winson Chung dd14633250 Remove workaround for starting app
Bug: 141580748
Change-Id: I7760bc0ee07db6798153ff33566b48fcb3c39651
2020-02-04 19:06:55 +00:00
vadimt 3908a50ce1 Disable testQuickSwitchFromApp test due to test failures
Bug: 143285809
Bug: 148865178
Change-Id: I9ac955d9b1ea057258b65b65c5bc813441c1161f
2020-02-04 18:42:56 +00:00
vadimt db185f6b3e Enabling quick switch test
Now that 2 underlying bugs are fixed

Bug: 143285809
Change-Id: Ie85177830def6e6ee72688f7dbb15ebef9c5ae48
2020-01-31 17:27:46 -08:00
TreeHugger Robot ed6aa18992 Merge "Making setActiveOverlay and getCurrentOverlayPackage public" into ub-launcher3-master 2020-01-30 23:39:45 +00:00
vadimt 4809121c02 Making setActiveOverlay and getCurrentOverlayPackage public
These will be used by memory tests

Bug: 139137636
Change-Id: I213966e8a0443b122412a4fd9fc6415870db2c05
2020-01-30 02:39:26 +00:00
TreeHugger Robot 0618d689e8 Merge changes from topic "state-supplier" into ub-launcher3-master
* changes:
  Translate recents slightly while dragging after pausing
  Two-zone model: swipe up from nav bar vs above it
  Change LauncherState to Supplier<LauncherState> in tests
2020-01-29 03:06:04 +00:00
Tony Wickham 8a054061ef Change LauncherState to Supplier<LauncherState> in tests
This prevents the test from statically initializing LauncherState and
all its static dependencies, which might lead to runtime exceptions in
out-of-proc tests.

Change-Id: I0e4e09dfb31a8b256c2c0c0b3d1d2ecd0cc92230
2020-01-28 18:07:33 -08:00
vadimt fcaab044a3 Avoid confusing errors "Launcher pid should be 0" when test setup fails
Change-Id: Ic5e8114a0f86d1a08738785c4098645e59a24975
2020-01-24 14:30:40 -08:00
Vadim Tryshev 8cf7b03cad Merge "Adding auto-investigation of one more flake" into ub-launcher3-master 2020-01-23 20:17:33 +00:00
vadimt 29d8b54957 Disabling events checks for successful gestures by default
Launcher tests will still perform checks upon every gesture completion.

All tests using tapl will still use events for diagnostics if the
gesture fails.

The benefit is that system health and other platform tests won't have to
use expensive logcat, and moreover, wait seconds for the events to
appear in logcat because of buffering in logcat.

Change-Id: I3b5a0965d9432144d0c4a8b40ebe2fa89b19a689
2020-01-22 19:16:32 -08:00
vadimt 2c6316be46 Adding auto-investigation of one more flake
Reshuffling the tests to make the investigator the outmost rule and run
the code that throws the original exception inside the investigator.

Change-Id: I714717a9b616862db5ce59116138ba7ea6ceb971
2020-01-21 19:06:59 -08:00
Adam Cohen 6b9595f607 Merging from ub-launcher3-master @ build 6150369
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6150369.html

Change-Id: Ia79497c0a9f03cf6ad9e9daa58ed34c02a36e879
2020-01-22 01:10:38 +00:00
vadimt d8827bad12 Verifying that Launcher didn't crash in TaplTestsQuickstep
TaplTestsLauncher3 already do this

Change-Id: I17fe638b81cbef4cf5230a6bd49b165e4f9e7855
2020-01-16 17:28:43 -08:00
vadimt 252d012ed0 TAPL: Verifying some interactions with system
Investigation of TAPL failures, especially flakes is complex, partially
because it’s hard to tell whether it’s Launcher who is wrong or the
system.

We need to introduce a framework that looks at Launcher interaction with
the system and reports when interactions deviate from the expected
course, and who made the first wrong step.

This is first, proof-of-concept CL.

It analyzes long-press events. We had multiple cases when long-presses
didn’t happen or happened unexpectedly.

Launcher registers the events, TAPL retrieves and compares against the
sequence of expected regular expressions. This diagnostic is used when
something fails and at the end of public methods.

Change-Id: I07aa3a027267c03422c99c73ccd8808445c55fe8
2020-01-15 13:31:18 -08:00
Tracy Zhou b8e78bf4e6 Merging from ub-launcher3-master @ build 6094789
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6094789.html

Change-Id: Iebd789eadfae2930807cc28373c2e1765f70e481
2019-12-23 12:24:35 -08:00
vadimt 2eb48498b4 Improving navigation mode switch rule and around
Logging assertion failures.
Modifying waits for condition to avoid timing out the whole test if the
iteration takes too long in favor of failing with an actionable diag.

Bug: 145985438
Change-Id: Ie32d93e1548ce6ec64c38449eb1be1287ff9cf56
2019-12-12 15:10:52 -08:00
vadimt 165a507a35 Disabling fallback tests
Improving state events accounting hasn't completely solved flakiness.
I've noticed that swiping up in 0-button mode sometimes doesn't open
Overview.

Bug: 143488140
Change-Id: I660885ed556aa2953c17d491fde267734b95890b
2019-12-10 02:06:16 +00:00
vadimt bdaa179b92 Consistently checking state change messages
Checking for events whenever Launcher sends them.
Checking for correct events (final events, not for events from
intermediate state changes).

This should simplify diagnosing of bugs involving TAPL.
This is also supposed to fix Fallback overview tests.

Bug: 143488140
Change-Id: If053ed808ec71bf2b652ab680be5bdfe9ff8cbb9
2019-12-09 12:33:39 -08:00
Hyunyoung Song e2fe62eea8 Merging from ub-launcher3-master @ build 6048063
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6048063.html

Change-Id: Ieee38cc301364f96cf252b2387142b0aa1b75317
2019-12-04 00:42:32 -08:00
vadimt 7410808085 Removing a workaround to make NevigationModeSwitchRule pass on CF
Change-Id: I7b7cabc098f17c99406032e186a4ee363273f0a9
2019-11-19 18:04:13 -08:00
Hyunyoung Song 73b84ce47f Merging from ub-launcher3-master @ build 6018909
Test: manual, presubmit on the source branch
http://x20/teams/android-launcher/merge/ub-launcher3-master_6018909.html

Change-Id: I8a1e20d0b175f03a1a05c81749f07ab5314e872a
2019-11-19 17:12:13 -08:00
vadimt cbc9bffd7e Disabling FallbackRecents tests
Even though they don't block presubmit, the fact that they are failing:
1. Causes sheriffs no not notice other issues;
2. Would block switching to 24hr fix-it policy and Quarterdeck.

Bug: 143488140
Change-Id: I95e3e15b69e0487946919f3f6889e286a1fae141
2019-11-14 17:23:52 -08:00
TreeHugger Robot dc0c224030 Merge "Reattributing disabled tests to a more relevant bug" into ub-launcher3-master 2019-11-13 01:30:15 +00:00
vadimt b0a14e96ae Removing temporary tweaks to make tests pass in presubmit
Now that we have a more reliable build of CF

Bug: 142828227
Change-Id: Ib385443048b6ccd9e1eb3372dc39947536f948bd
2019-11-11 09:23:28 -08:00
vadimt 3435f69d1a Reattributing disabled tests to a more relevant bug
Bug: 143488140
Change-Id: I8af35c66293517a3ba7cae583e5c3bff883865d7
2019-11-08 14:50:57 -08:00
vadimt 272a541ab9 Disable failing test testQuickSwitchFromApp
Bug: 143285809
Change-Id: I7df5a1deb74aabf0f874e969a57aba471902747f
2019-11-05 18:26:29 -08:00
vadimt 09ce192b4e Not treating "Screen is empty" as an anomaly in NavigationModeSwitchRule
It's an acceptable state when Launcher just starts under
 instrumentation.

Change-Id: Ia6eb2550effbd9236bb955e0c0e04416fc5fa506
2019-11-05 11:30:35 -08:00
vadimt 137f5b62ac Improve diags when system errors cause failing Launcher tests
Now, for example, we won't diagnose a locked phone as a
"home button not showing in 3-button mode", even though it's technically
correct.

Change-Id: Ibdfa0741af7ff8545a811f6702dda74dc6c31c2e
2019-11-04 14:50:22 -08:00
Tony Wickham bc42d64c85 Fix testQuickSwitchFromApp
Instead of starting getAppPackageName() and relying on it being our Test
Pin Item activity, instead launch our own test activities with the
FLAG_ACTIVITY_MULTIPLE_TASK and FLAG_ACTIVITY_NEW_DOCUMENT flags.

Test:
- Locally run testQuickSwitchFromApp() from Android Studio
- flake -oop -t com.android.quickstep.TaplTestsQuickstep#testQuickSwitchFromApp

Bug: 140252765
Change-Id: Ie137261ce65bfd3dd39df78d57784854a026e967
2019-10-23 23:42:19 +00:00
vadimt ad81b816f0 Step 4 from the plan below:
1. Skip all tests that fail in inproc mode on CF (this CL)
2. Observe postsubmit and make sure no inproc tests are failing or too
flaky on CF
3. Enable presubmit
4. Switch to skipping tests from step 1 only for inproc presubmit;
they'll start failing in postsubmit
5. Gradually make all tests pass and not flaky and enable them back on
presubmit

Bug: 142828227
Change-Id: I0092d6b92b0358866f8cbf9e00dbe3fabe23703d
2019-10-17 17:52:29 -07:00
Tracy Zhou b6af1d0efc Merging ub-launcher3-master, build 5945220
Test: Manual
Bug:123904290 P2 Remove magic constants from TAPL
Bug:130294785 P3 Can no longer long press to open settings in hotseat area
Bug:131115553 P2 Enable CacheDataUpdatedTaskTest tests
Bug:134712476 P4 Add Duo contact to home screen, icon froze and vanished while over home screen
Bug:136278866 P2 Temporary workarounds to make tests pass on Cuttlefish
Bug:136829198 P2 Scrolling Overview During Quickswitch causes switch with weird animation
Bug:137568159 P4 Refactor LauncherCallback to support multiple clients
Bug:137777105 P1 Make clearcut launcher logging feature parity with westworld logging
Bug:137851409 P4 Jank during swipe up due to inflation
Bug:138620399 P1 Quick switch flicker / artifacts
Bug:139016518 P2 [PinnedStackController] Move shelf offset into sysui
Bug:139137636 P2 Create memory tests for Launcher
Bug:139258979 P2 Switch to the screenshot mode when then system passes ThumbnailData back upon RecentsAnimation cancelation
Bug:139259253 P2 Transform multiple app surfaces during app open animation from overview
Bug:139439373 P2 Live tile should switch to screenshot before finishing recents animation
Bug:139828243 P2 Create a prototype for Overview screenshot actions with a SystemUI plugin
Bug:139888225 P2 Convert custom widget into plugins
Bug:139913027 P2 [a11y] App title in Widget list shouldn't be actionable by a11y methods. (It would cause Pixel launcher crash.)
Bug:139917483 P1 [B1C1][Dec19_QPR][CTS_Verifier_10_r1]Pixel launcher crash observed in Device owner test-> Lock Task UI
Bug:139941530 P2 Lab-only Flake: Launcher switches to All Apps after pressing Recents button
Bug:140212732 P2 [PO Cable] Strange launcher behavior after restore
Bug:140242324 P2 Cache shortcutInfo icons in Launcher
Bug:140246642 P4 Add binder tests for launcher interactions
Bug:140311911 P2 Flake in Launcher tests: java.lang.AssertionError: Stable state != state: OverviewState, LauncherState
Bug:140406263 P2 [a11y] Unable to scroll to the left of the main Home screen to Display google app by Voice access or Switch access.
Bug:140539007 P3 After apply the wallpaper on wallpaper picker, the screen will stay on wallpaper picker about 2 second
Bug:140626334 P4 Pass wallpaper SC to launcher for animation during launch and swipe up
Bug:140635319 P1 [Flaky test] testPromiseIcon_addedFromEligibleSession failing due to NPE on Launcher#getStateManager
Bug:140786694 P2 [A11y]No talkback feedback when long pressing on an app at home screen
Bug:140935140 P1 Launcher force close observed while accessing app info shortcuts.
Bug:141260670 P3 Drag and drop preview doesn't match the destination grid size
Bug:141262820 P3 [Grid] icon badge size should scale as the grid size changes
Bug:141265063 P2 Long press on homescreen in between icons doesn't bring up home settings
Bug:141275518 P2 Test WellbeingTests.testPauseAppFromOverview flakes on Cuttlefish
Bug:141315387 P1 [Failing test] 3P launchers + 2 button mode: failed goToOverviewFromHome and goToOverviewFromApp
Bug:141376165 P2 Remove static initializations in Launcher
Bug:141390432 P1 [Failing test] TaplTestsLauncher3 in 2-button mode
Bug:141517004 P1 FallbackRecentsTest.goToOverviewFromHome Failure
Bug:141522764 P1 DefaultLayoutProviderTest failures
Bug:141523101 P1 TaplTestsQuickstep#testAllAppsFromHome,testAllAppsFromOverview failures
Bug:141524555 P1 FallbackRecentsTest.testOverview flake
Bug:141576561 P2 Fix FlagOverrideSampleTest inside robolectric test
Bug:141576665 P2 AddWorkspaceItemsTaskTest broken
Bug:141577881 P2 FileLogTest broken
Bug:141579810 P1 ViewInflationDuringSwipeUp test failures
Bug:141580748 P2 FallbackRecentsTest#testOverview failure
Bug:141697444 P1 TaplTestsLauncher3#testWidgets test failure
Bug:141770616 P2 Flake: Can't find a launcher object; selector: BySelector [RES='\Qcom.google.android.apps.nexuslauncher:id/deep_shortcuts_container\E'] (visible state: AllApps),
Bug:141772190 P2 Flake: Context menu is still visible afterswiping up to home
Bug:141864547 P2 calendar-stable sometimes fails dialog dismissal on cuttlefish
Bug:141886704 P2 Use app targets to determine input consumer instead of launcher state
Bug:141934188 P2 Automation Test for adding widget automatically
Bug:141939911 P3 Clean up SwipeDetector
Bug:141986013 P2 Update all apps fade interpolators
Bug:142068081 P1 Quick Switch touch swipe dropped, flicker ensues
Bug:142120338 P2 Gmail app (work profile) icon not drawing
Bug:142148773 P2 grid size should not affect widget padding in WidgetsRecyclerView
Bug:142351228 P1 public void testSwipeUp_with_list_widgets() is failing for merge CL
Bug:79868152 P3 Fade out caret with workspace and back in when in Overview
Bug:136282913 P1 Swipe up from Assistant Fulfillment Card Jank
Bug:138473688 P4 Home settings can't be dismissed by swipe up
Bug:140252765 P2 Audit Gesture Nav tests (including Back and Quick Switch)
Bug:141568904 P1 NPE: Pixel launcher crash is observed when adding Directions widget
Bug:142514365 P1 Failing test AddWidgetTest.testDragIcon
Bug:142803200 P1 Broken binder tests

Change-Id: I811537cc8d406f0acd9fa45daddae4da79ffff12
2019-10-16 22:46:01 -07:00
vadimt 3680357a67 Preparing to enabling Inproc launcher tests as presubmit
The plan:
1. Skip all tests that fail in inproc mode on CF (this CL)
2. Observe postsubmit and make sure no inproc tests are failing or too
flaky on CF
3. Enable presubmit
4. Switch to skipping tests from step 1 only for inproc presubmit;
they'll start failing in postsubmit
5. Gradually make all tests pass and not flaky and enable them back on
presubmit

Bug: 142828227
Change-Id: I6ea3d53771503e8fd968555bb2e4cb1be10d83ef
2019-10-16 17:35:18 -07:00
Tony Wickham 6b62f28ef9 Fix quick switch test gesture in landscape 2-button mode
am: a0f77c4449

Change-Id: I998081a53a94ff3b1559a7e77d4d470056cfab00
2019-10-15 21:20:24 -07:00
Tony Wickham a0f77c4449 Fix quick switch test gesture in landscape 2-button mode
It should swipe from the bottom right to top right when the nav bar is
on the right, rather than from the bottom left to bottom right.

For now, disable testQuickSwitchFromApp() because it seems to have
other failures as well.

Bug: 140252765
Change-Id: I1f4989f3ea5456c18bb9cbf42ea4b157cee500d7
2019-10-15 17:30:47 -07:00
Tracy Zhou b67a15ddd9 Revert "Merging ub-launcher3-master, build 5938524"
This reverts commit 7cb721fa81.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I10ebd177cc98be896282147df481b05f28241758
2019-10-15 20:51:51 +00:00
TreeHugger Robot 6c12641bee Merge "Unifying various tracing calls" into ub-launcher3-master 2019-10-14 22:29:59 +00:00
Sunny Goyal 17c72fbb60 Unifying various tracing calls
Change-Id: Iedf6662ad1d7281b850bdc43b3a1e373ce535ac6
2019-10-14 14:23:19 -07:00
Tony Wickham 2f767469ae Merge "Add tests for quick switch from an app and home" into ub-launcher3-qt-future-dev
am: 7a2076e3ab

Change-Id: Id525dae6616757688ccf0e203fefeb9bd6ef08ff
2019-10-14 12:20:37 -07:00
Tony Wickham 1e73e320b7 Add tests for quick switch from an app and home
Bug: 140252765
Change-Id: I5621b614ae2d8cd3db03cae818cf8b8c1c6cb20f
2019-10-14 11:51:19 -07:00
TreeHugger Robot d2b03972f5 Merge "Suppress ViewInflationDuringSwipeUp test." into ub-launcher3-master 2019-10-14 18:10:34 +00:00
Zak Cohen eb27edffc2 Suppress ViewInflationDuringSwipeUp test.
Test is failing and blocking drop.
Only failing on TH, passing locally.
Tracked in b/141579810

Bug:141579810
Change-Id: Iadf8098cad22835b026984c0a9ea5122054b484b
2019-10-14 10:55:15 -07:00
Winson Chung c062580b5a Wait for the task to be in recents before validation
- There are two issues:
  1) Currently the system does not add the task to the task list until
     the activity starting the task has been resumed (to be fixed in a
     follow up platform CL). When the three activities are started in
     sequence, it's possible for one of the activities to not reach the
     resumed state leading to an unexpected number of recent tasks the
     next time it's fetched.
  2) When swiping up, it may take time for getTasks to return and call
     applyLoadPlan, so try and wait until the task views have had a
     chance to be applied before continuing.
  3) Use the launcher activity tracker instead of activity rule since it
     will return the same activity even after the activity is destroyed
- Move the margin handling to the caller instead of the scroll method

Bug: 141580748
Change-Id: I2b7634f5ac6869ba4b369b3bd60e0f63747c0f0b
2019-10-11 17:10:38 -07:00
Winson Chung c039634c25 Workaround for failing test & fix scrolling in tests
- Workaround issue where instrumentation will fail to finish an activity
  causing the activity to linger longer than expected (leading to issues
  with ordering of static resources like the app widget host registration)
- Fix calculation for scrolling the screen, the previous calculation
  would result in the gesture starting at the left gesture margin due
  to rounding which can trigger a back action instead of the desired
  scroll

Bug: 142351228
Change-Id: I34bdb471030518d2b983cac2badd4d8b0e7d571b
2019-10-10 17:31:38 -07:00
TreeHugger Robot f31dab5e02 Merge "Removing static instance of LauncherAppsCompat and unnecessary wrapper classes" into ub-launcher3-master 2019-10-08 18:49:36 +00:00
vadimt 7f791a868d Increasing wait time for navigation mode switch. am: d230af4e09
am: 4f56803bd0

Change-Id: I0dfc2072d6ea810cb023b61ac5a4e8f29786d261
2019-10-04 18:10:56 -07:00
vadimt 4f56803bd0 Increasing wait time for navigation mode switch.
am: d230af4e09

Change-Id: Ia5150735244249dd76c1993ff588036e4f18402b
2019-10-04 18:03:17 -07:00
vadimt d230af4e09 Increasing wait time for navigation mode switch.
Sometimes this fails in Cuttlefish.

Change-Id: Ifa2ffed5165625d51441fc3b203185fc55f7d53f
2019-10-04 17:12:26 -07:00
Sunny Goyal e7b00128c7 Removing static instance of LauncherAppsCompat and unnecessary wrapper classes
Bug: 141376165
Change-Id: I8c1f1ab7d83ec50fe9c7bf39960ef9c360025ec7
2019-10-02 16:20:22 -07:00
Vadim Tryshev 6254e5e246 Merge "Deprecating LauncherInstrumentation constructor with parameter" into ub-launcher3-qt-qpr1-dev am: dd079691c1
am: 1430f132f3

Change-Id: If494e30957893c4e3414ebdbd274601d16a66a98
2019-09-27 13:28:18 -07:00
Vadim Tryshev 1430f132f3 Merge "Deprecating LauncherInstrumentation constructor with parameter" into ub-launcher3-qt-qpr1-dev
am: dd079691c1

Change-Id: I7419be6416f26274bf03abfd84eedef20fd6f084
2019-09-27 13:21:46 -07:00
vadimt 2611d79f69 Deprecating LauncherInstrumentation constructor with parameter
Change-Id: I779b4a8fde2db73cced8133f12d1356ad0b8729e
2019-09-27 12:00:09 -07:00
Vadim Tryshev c86abf0ed0 Merge "Removing temporary checks that tests are running on AVD" into ub-launcher3-qt-qpr1-dev am: 6929199c8a
am: ec1ae481d4

Change-Id: I3cf67561ae50575486db5360d0139ff916c5dfaf
2019-09-24 18:24:50 -07:00
Vadim Tryshev ec1ae481d4 Merge "Removing temporary checks that tests are running on AVD" into ub-launcher3-qt-qpr1-dev
am: 6929199c8a

Change-Id: Iaa6200f0371a4deca630194ac8ecfcfc04313750
2019-09-24 18:18:19 -07:00
Vadim Tryshev 6929199c8a Merge "Removing temporary checks that tests are running on AVD" into ub-launcher3-qt-qpr1-dev 2019-09-25 00:56:05 +00:00
vadimt 926e29f8b6 Removing temporary checks that tests are running on AVD
Bug: 136278866
Change-Id: I2b7b63b7745936ea84b7cba599e21d954b682ba5
2019-09-24 17:19:51 -07:00
Sunny Goyal 599e95bdde Fixing some tests
> Adding retry to fallback recents tests
> Fixing provider test after provider name change
> Fixing AllApps icon detection when there is no more scroll available

Bug: 141390432
Bug: 141523101
Bug: 141517004
Bug: 141524555
Bug: 141522764
Change-Id: I425638d20c053206134835dabde819f16160f035
2019-09-24 15:10:06 -07:00
vadimt bba8c98de3 Removing "Failed to get system health diags" message from fallback tests
am: 9b1c168273

Change-Id: I4528370073f0258e5f0276dfb1d71dae9816ddea
2019-09-24 13:13:12 -07:00
vadimt 9b1c168273 Removing "Failed to get system health diags" message from fallback tests
Now getting diags though the test process that has right permissions.

This doesn't fix other failures in fallback tests.

Bug: 141517004
Change-Id: Ibba5f0471a83525a64544c62dbe82ab3e11712cd
Merged-in: Ibba5f0471a83525a64544c62dbe82ab3e11712cd
2019-09-24 19:31:35 +00:00
vadimt 6096451dbf Removing "Failed to get system health diags" message from fallback tests
Now getting diags though the test process that has right permissions.

This doesn't fix other failures in fallback tests.

Bug: 141517004
Change-Id: Ibba5f0471a83525a64544c62dbe82ab3e11712cd
2019-09-24 19:30:02 +00:00
Sunny Goyal 8f90d5da8a Adding test to check view inflation during swipe up
Bug: 137851409
Change-Id: Ic8e6f0b3c667051b921d1d4fad03c94122ee92e9
2019-09-20 15:36:02 -07:00
Sunny Goyal 3d56046ff8 Fixing some tests for 2-button mode
Bug: 141315387
Change-Id: I66db3e790f5fbe6bc30999ed599cce03874509be
2019-09-20 10:40:14 -07:00
Sunny Goyal ed83cf6df0 Adding recents test for 3P Launcher
Bug: 140749967
Change-Id: I3644822accfd229d1e46ca5e43ad827aef776787
2019-09-17 13:41:10 -07:00
Vadim Tryshev c698c0cdbb Merge "Adding a test method to get a Launcher object when it becomes non-null" into ub-launcher3-qt-qpr1-dev
am: b34f951e7e

Change-Id: Id63a1df1aef2f35b0f6cdb0f8ab851163c8140c9
2019-09-09 14:17:20 -07:00
vadimt cf61e16a2c Adding a test method to get a Launcher object when it becomes non-null
Change-Id: I1c56777c87827b5edf1c7f55ad9639321e598311
2019-09-04 19:02:54 -07:00
Vadim Tryshev 72fddba837 Merge "Enabling debug tracing for all UI tests" into ub-launcher3-qt-qpr1-dev
am: 846656f138

Change-Id: Ie40cc1d55d40ffefe6c1b2d3588b03ff92d2cb38
2019-09-04 12:37:40 -07:00
vadimt 0ce38af957 Enabling debug tracing for all UI tests
Change-Id: I434ee378baf35de955c8a589b8380e1751e4107a
2019-09-03 17:16:34 -07:00
vadimt 0d6f41bef2 Saving screenshots for failures in NavigationModeSwitchRule
am: f13eaa0242

Change-Id: I9a3b4e93491a02263fd90640b3cc9d55aeb41703
2019-08-23 20:56:08 -07:00
vadimt 7468bbd2d4 Adding debug tracing for All Apps appearing instead of Overview
am: 197ae725a0

Change-Id: Iab3642e2dcb4f766d490a88aa7a481a1117b98a3
2019-08-23 20:01:22 -07:00
vadimt f13eaa0242 Saving screenshots for failures in NavigationModeSwitchRule
Change-Id: I732076a5eb14b181f560024e2780e2012a81fd95
2019-08-23 14:18:32 -07:00
vadimt 197ae725a0 Adding debug tracing for All Apps appearing instead of Overview
Bug: 139941530
Change-Id: Ia9827c6edd48c559e9602e1e37de83293517ad5e
2019-08-23 12:11:00 -07:00
Sunny Goyal 6fe3eec95c Moving various common executors to a single location
Change-Id: I44bca49b8adb6fa22c3b48d10f674e42c28d792c
2019-08-20 14:36:17 -07:00
Vadim Tryshev f24ae74cd2 Merge "Extending the list of test owners" into ub-launcher3-qt-qpr1-dev
am: 1cbdcb2961

Change-Id: I5f01dc9b50cc33499bd9cb88913157802656cd52
2019-08-16 10:56:32 -07:00
vadimt a81be5003c Extending the list of test owners
Otherwise, changes in tests would require my-only approval.

Change-Id: Ia957a28a5a8e55dc2ee4efdf9a46c91511d3e611
2019-08-14 17:18:45 -07:00
Winson Chung 02a9aec015 Skip tests for overlays that don't exist on device am: 0ef10a458d
am: 6439337cee

Change-Id: I14243ecbda7ade7c1e7db9794bc22a533cc6dd73
2019-07-25 18:01:03 -07:00
Winson Chung 0ef10a458d Skip tests for overlays that don't exist on device
Bug: 138401738
Bug: 138227387
Change-Id: If661fd342e1382915485bccdf6ae2c9e77a92bc4
2019-07-26 00:09:43 +00:00
Vadim Tryshev 46d0c36cc6 Merge "NavigationModeSwitchRule: log exception before 'finally'" into ub-launcher3-qt-r1-dev
am: 2870df0776

Change-Id: I37cbd53aaa575915374e41d9535a6d7cf21b72d2
2019-07-25 13:11:45 -07:00
vadimt 7593dc995b NavigationModeSwitchRule: log exception before 'finally'
Change-Id: I158105da467e2759fec6fa5d8acd582b2e95f7c5
2019-07-25 12:16:31 -07:00
vadimt 443f05052c Merge "Adding debug tracing" into ub-launcher3-qt-r1-dev
am: 8578309f1b

Change-Id: If2f3b4d4a849e94449c4b06a567c12610547fc61
2019-07-23 17:28:32 -07:00
vadimt cd7b00853b Adding debug tracing
Bug: 138251824
Change-Id: Ibe3de964aeacbf83fd46cc53fda7d15c9401fe4d
2019-07-23 16:49:48 -07:00
Vinit Nayak 15abc500ea Refactor RecentTasksList ctor to be testable
Made ctor accept more arguments so we can
pass in mock objects for unit testing.

Test: Created RecentsTasksListTest.java, passes
adb shell am instrument -w -r -e debug false -e \
class 'com.android.quickstep.RecentTasksListTest' \
com.google.android.apps.nexuslauncher.tests/androidx.test.runner.AndroidJUnitRunner

Fixes: 135687618
Change-Id: Iffda661e9d5329a2a403060bde674ab81e4e720e
2019-07-23 11:49:19 -07:00
Tony 22e5235556 Merge "Fix overshoot velocity in 2-button landscape mode" into ub-launcher3-qt-r1-dev
am: 160134e0b1

Change-Id: I921f30bbb37736d9519413b2803f5e0a6480748c
2019-07-16 10:55:51 -07:00
TreeHugger Robot 160134e0b1 Merge "Fix overshoot velocity in 2-button landscape mode" into ub-launcher3-qt-r1-dev 2019-07-16 17:38:05 +00:00
Tony 5818f9b3c5 Fix overshoot velocity in 2-button landscape mode
Now we use the velocity towards the middle of the screen
(e.g. x when in landscape) instead of always using y.

Test: testBackground with @PortraitLandscape

Bug: 135567630
Change-Id: I77ab6bdf0d556475a6c182ae91914a718a81e1c4
2019-07-12 18:02:09 -07:00
Vadim Tryshev 3f19964537 Merge "Simplifying switching to home for some tests" into ub-launcher3-qt-r1-dev
am: 08159a5b08

Change-Id: If5fc0ad9ec33b18445778cc1f91f469eac1ed565
2019-07-12 13:29:42 -07:00
vadimt d91cec72fe Simplifying switching to home for some tests
Change-Id: I696d0267a2c36a18080396657bed07f7b1654a7d
2019-07-12 12:26:08 -07:00
Vadim Tryshev a3da30f671 Merge "Temporary workarounds to make tests pass on a virtual device" into ub-launcher3-qt-r1-dev
am: e46f9e5cf3

Change-Id: Ib221d9c201f2b396b138631d8548d1862d2e7643
2019-06-28 14:33:47 -07:00
vadimt 83d5eef5a5 Temporary workarounds to make tests pass on a virtual device
Bug: 136278866
Change-Id: I198cb4cdf94c2b1151b4b7249ae10dbcaa99a4fd
2019-06-28 13:12:58 -07:00
Vadim Tryshev 1d20c1a65a Merge "Taking screenshots for local tests for FallbackRecentsTest" into ub-launcher3-qt-dev am: 8a532e0bec
am: bcad1107d6

Change-Id: I9b86799a01a18826343feaac1394697739dcd7ec
2019-06-25 17:29:34 -07:00