Commit Graph

1870 Commits

Author SHA1 Message Date
Vadim Tryshev 984187b0a1 Merge "Increasing wait time for loading model to 60s" into ub-launcher3-master 2019-10-16 00:08:22 +00:00
vadimt 4565739fb7 Increasing wait time for loading model to 60s
Bug: 142514365
Change-Id: I15e0ff8e2a721f7ffdefdf2eb02e114212dded3b
2019-10-15 17:06:41 -07:00
Pinyao Ting b3d3ca87dd temporarily disable a regression test to unblock merging to master
The test case testDragCustomShortcut was created initially to prevent future regression on custom shortcut (b/141568904), which was caused by ag/9342399.

Some times after ag/9342399 was reverted on ub-launcher3-master, a different error is causing custom shortcut to not working intermittently (b/141528961). Since this is different from b/141568904, it should not be a blocker to merging to master.

Bug: 141568904
Change-Id: Ia11e1ae44d0ef86c16876c002954aa662f1edbc8
2019-10-15 21:32:47 +00: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 4be6169d4e Merge "Fix test bug where launcher throws NPE because it isnt loaded yet." into ub-launcher3-master 2019-10-14 17:49:41 +00: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 4b5c1ef71b Adding support for intentionally leaking views.
Bug: 139137636
Change-Id: I923d1781daee9ae47eb306ee8fa3c44790c6993f
2019-10-08 17:04:26 +00:00
TreeHugger Robot 86017c9611 Merge "Removing access to LauncherModel.getCallbacks" into ub-launcher3-master 2019-10-08 16:26:12 +00:00
TreeHugger Robot fedd5f1fd7 Merge "Removing host deletion on startup and corresponding callbacks" into ub-launcher3-master 2019-10-07 18:28:44 +00:00
Vadim Tryshev 7949c5a7e4 Merge "Diagnosing anomalies prior to swiping up to Home" into ub-launcher3-qt-qpr1-dev am: c3a4819b8c
am: af754b9a9a

Change-Id: I9a65f1c85623f801adbd380c85a039b5c55526bf
2019-10-03 18:18:33 -07:00
Vadim Tryshev af754b9a9a Merge "Diagnosing anomalies prior to swiping up to Home" into ub-launcher3-qt-qpr1-dev
am: c3a4819b8c

Change-Id: Ifc6a781cea4dc38b58435314b8760e89b327446a
2019-10-03 18:11:32 -07:00
Vadim Tryshev c3a4819b8c Merge "Diagnosing anomalies prior to swiping up to Home" into ub-launcher3-qt-qpr1-dev 2019-10-04 00:48:34 +00:00
vadimt f4255c6c1b Dump view hierarchy before swiping to home am: 233afe98e9
am: 3878d3ef09

Change-Id: Ief39f3c713dd94b93b6dfa2f1e0732c810ba5d3a
2019-10-03 17:41:35 -07:00
vadimt 3878d3ef09 Dump view hierarchy before swiping to home
am: 233afe98e9

Change-Id: Ib67aa2247ae43f4e875deb07a9d8b53aa5e6f181
2019-10-03 17:35:28 -07:00
vadimt 43c3d2d40a Diagnosing anomalies prior to swiping up to Home
Bug: 141864547
Change-Id: I5f3814c6a90df85136484813ca4ee684da101016
2019-10-03 17:09:16 -07:00
Vadim Tryshev 35d9ac924c Merge "Logging the initial state for swiping up to home" into ub-launcher3-qt-qpr1-dev am: c49ec38140
am: f078975e9d

Change-Id: I7cff417f917643adb1835eb4b7ccad0e75cb22ce
2019-10-03 14:40:14 -07:00
Vadim Tryshev aef50a5985 Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev am: 7c09214298
am: 12de08a3b1

Change-Id: I34cf6e29d2ed39efabca6d43eaccf62763e67693
2019-10-03 14:39:58 -07:00
Vadim Tryshev f078975e9d Merge "Logging the initial state for swiping up to home" into ub-launcher3-qt-qpr1-dev
am: c49ec38140

Change-Id: If74c630902a212270bae1a58b2085d8a30d2343f
2019-10-03 14:33:31 -07:00
Vadim Tryshev 12de08a3b1 Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev
am: 7c09214298

Change-Id: If209a43004a41ca682473232789810a4d1828521
2019-10-03 14:33:04 -07:00
vadimt 1ac98548a7 resolve merge conflicts of 08776ada1e to ub-launcher3-qt-future-dev
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
Merged-in: I9a3b0f67ee874b5ec4ad67f41a46ec7876d19082
2019-10-03 20:58:15 +00:00
Pinyao Ting f2a3e79e76 Merge "correct naming and add comments for test case of custom shortcut." into ub-launcher3-qt-future-dev
am: 055c22e8e6

Change-Id: I64b7723a8ad9bbf9836b9b3c4d45add80b54107a
2019-10-03 11:04:37 -07:00
Pinyao Ting d7fdcab612 correct naming and add comments for test case of custom shortcut.
Bug: 141934188
Change-Id: I69ce5f05214df10e2a376ff68c713efe8874df15
2019-10-03 10:15:30 -07:00
Pinyao Ting d9bef1f3f0 include integration test for adding shortcut widget
am: d625e49552

Change-Id: Id0b8963f2c34355de97ddb4cbb1daf10d2f78e0c
2019-10-03 09:48:00 -07:00
Pinyao Ting d625e49552 include integration test for adding shortcut widget
this integration test help us catching app crashes when adding shortcut
widgets to the workplace. see b/141568904 for more context.

Bug: 141934188
Change-Id: I4d33d6127793efe2071d0d146aef24db6b676360
2019-10-03 07:46:50 -07:00
vadimt 233afe98e9 Dump view hierarchy before swiping to home
Bug: 141864547
Change-Id: Ifd444c4516f7f27b0dc19c0faa1d4c8716d2254a
2019-10-02 17:10:02 -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
Sunny Goyal b0adac23e0 Removing access to LauncherModel.getCallbacks
Bug: 137568159
Change-Id: Ic074dec6a8981a4b9aabf028cf3b878b532abb11
2019-10-02 14:27:40 -07:00
Sunny Goyal 01615a69d2 Removing host deletion on startup and corresponding callbacks
> Launcher deletes the phantom widget ids in loader

Bug:141376165
Change-Id: Icf0542535f194f9abc67e7190f34cb60f69e9f66
2019-10-02 12:08:26 -07:00
Sunny Goyal 1456522cab Merge "Removing static listeners from PackageInstallerCompat" into ub-launcher3-master 2019-10-02 18:27:45 +00:00
Vadim Tryshev c49ec38140 Merge "Logging the initial state for swiping up to home" into ub-launcher3-qt-qpr1-dev 2019-10-02 17:43:00 +00:00
Vadim Tryshev 7c09214298 Merge "Waiting until context menu goes away after attempting to close it." into ub-launcher3-qt-qpr1-dev 2019-10-02 02:00:28 +00:00
vadimt 7458d4aa4a Logging the initial state for swiping up to home
Change-Id: Iff2003f7e6dfe4072613b775722166dc5fec9e02
2019-10-01 18:40:24 -07:00
vadimt 8ecf1b3dd3 Waiting until context menu goes away after attempting to close it.
Bug: 141770616
Change-Id: I528072e830627d825906ce7c1e3dbb914e2c814e
2019-10-01 18:28:46 -07:00
Andy Wickham b9efb9ad71 Merge "Some cleanup for SwipeDetector." into ub-launcher3-qt-future-dev
am: d39f7b51c8

Change-Id: Ifadf65abe4239a703c3d15eddc6ebd51a405a5e9
2019-10-01 14:57:43 -07:00
Andy Wickham 769c795edf Some cleanup for SwipeDetector.
It is now organized as follows:
 - private constants
 - public constants
 - private final fields
 - private variable fields
 - constructors
 - public methods
 - private methods
 - public interface/abstract class

This is intended to be a functional no-op.

Bug: 141939911
Change-Id: Iad5a9b3b73b35641f8a4f1d52ada6adef3825c47
Tested: Built and sanity checked manually.
2019-10-01 14:38:56 -07:00
TreeHugger Robot 08776ada1e Merge "Waiting for Launcher model load in out-of-proc tests." into ub-launcher3-qt-qpr1-dev 2019-10-01 19:48:05 +00:00
vadimt 7371e4da68 Waiting for Launcher model load in out-of-proc tests.
Not doing this seems to have caused flakes.

Bug: 141770616
Change-Id: Ia9caf20e4a2d93298adf4249ca815ad79bced802
Merged-in: Ia9caf20e4a2d93298adf4249ca815ad79bced802
2019-10-01 19:18:14 +00:00
Vadim Tryshev f7a2971530 Merge "Waiting for Launcher model load in out-of-proc tests." into ub-launcher3-master 2019-10-01 18:43:24 +00:00
vadimt 542b7df7fd Waiting for Launcher model load in out-of-proc tests.
Not doing this seems to have caused flakes.

Bug: 141770616
Change-Id: Ia9caf20e4a2d93298adf4249ca815ad79bced802
2019-10-01 17:46:35 +00:00
Sunny Goyal 045b4fab76 Removing static listeners from PackageInstallerCompat
Bug: 141376165
Change-Id: I2b49d53a05a04c622ed5a7b723109a6cc230d230
2019-09-30 23:17:15 -07:00
Vadim Tryshev 67138875fa Merge "Not unlocking phone on the test start" into ub-launcher3-qt-qpr1-dev am: 872a380b59
am: 4c420047cf

Change-Id: I23f87d541771baa7ba3e5857999a5e5c96c301ce
2019-09-30 14:01:37 -07:00
Vadim Tryshev 4c420047cf Merge "Not unlocking phone on the test start" into ub-launcher3-qt-qpr1-dev
am: 872a380b59

Change-Id: I6e0831a2660459803eef6c755e4fcfc9f414c94f
2019-09-30 13:54:36 -07:00
Pinyao Ting d843673434 Merge "removed extra test protocol for unit test" into ub-launcher3-qt-future-dev
am: d8aef47393

Change-Id: I0d69c2ec0e3d693d4556314fd1b74dabd0a8cbd2
2019-09-30 13:54:36 -07:00
TreeHugger Robot d8aef47393 Merge "removed extra test protocol for unit test" into ub-launcher3-qt-future-dev 2019-09-30 20:46:15 +00:00