Bill Yi
4c0d862711
[automerger skipped] Import translations. DO NOT MERGE am: d6feab9fca -s ours
...
am: 638b36f628 -s ours
am skip reason: subject contains skip directive
Change-Id: I01b9bdb1cee0f13cddee3692eaa386f43192cc6b
2019-09-18 16:35:08 -07:00
Bill Yi
abaf436cb2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into ub-launcher3-qt-future-dev
...
am: 24790aa3c8 -s ours
am skip reason: subject contains skip directive
Change-Id: I984662cb4a83e8a9536da7799a2f317c6facbb24
2019-09-18 16:28:09 -07:00
Bill Yi
a7fd1427da
[automerger skipped] Import translations. DO NOT MERGE
...
am: 885dfb7134 -s ours
am skip reason: subject contains skip directive
Change-Id: I515adc3e8a0a534fde521ec1f0ff909b53c28057
2019-09-18 16:28:08 -07:00
Bill Yi
638b36f628
[automerger skipped] Import translations. DO NOT MERGE
...
am: d6feab9fca -s ours
am skip reason: subject contains skip directive
Change-Id: Ib1e67bd2313fe62b99abb44723d5654195cc227a
2019-09-18 16:28:08 -07:00
TreeHugger Robot
24790aa3c8
Merge "Import translations. DO NOT MERGE" into ub-launcher3-qt-future-dev
2019-09-18 23:18:38 +00:00
Sunny Goyal
3adf6ff5a2
Merging ub-launcher3-qt-qpr1-dev, build 5884665
...
Test: Manual
Bug:135864059 P4 [Live Tiles] Empty launcher
Bug:139137636 P2 Create memory tests for Launcher
Bug:139281702 P2 [Enterprise - Cloud DO] GSOC and Mobile Utilities launcher icons are in broken state
Bug:140837771 P1 Failing test: AddConfigWidgetTests and AddWidgetTests are failing
Bug:141024521 P2 Tapping nav bar during quick switch causes scroll animation to cancel and not resume
Bug:141184247 P1 Clear all button not present in fallback recents in 3-button mode
Change-Id: I99f4db995a2af5959d5be4182f4e47bb67c9cbc4
2019-09-18 13:53:36 -07:00
Tony Wickham
2e71b8351c
Update mIsBeingDragged in onTouchEvent(ACTION_DOWN) am: a0aee21fcd
...
am: c9c88ee0f1
Change-Id: I1d66b3173afd2ce3edffdbc89145707a58fcbe6e
2019-09-18 12:29:21 -07:00
Tony Wickham
c9c88ee0f1
Update mIsBeingDragged in onTouchEvent(ACTION_DOWN)
...
am: a0aee21fcd
Change-Id: I4e0b6c7e057421d7501f84f8c8e3544eab2b15de
2019-09-18 12:22:12 -07:00
Tony Wickham
a0aee21fcd
Update mIsBeingDragged in onTouchEvent(ACTION_DOWN)
...
The logic to keep mIsBeingDragged when touching down during a scroll
animation was in onInterceptTouchEvent(), which we were bypassing by
using onTouchEvent() directly. Now we update mIsBeingDragged on touch
down in both onInterceptTouchEvent() and in onTouchEvent().
Bug: 141024521
Change-Id: I77abd4c36f3ccee27e160c817dadb3923e6cfc06
2019-09-18 11:04:37 -07:00
Bill Yi
3cd719e63b
Import translations. DO NOT MERGE
...
Change-Id: I2a1cabf4bef377ad5fb37b3329c4532f4ea71c85
Auto-generated-cl: translation import
2019-09-18 10:53:13 -07:00
Bill Yi
d6feab9fca
Import translations. DO NOT MERGE
...
Change-Id: Idcab9c726488667be60b5ea153f974ae27ff971a
Auto-generated-cl: translation import
2019-09-18 10:45:45 -07:00
Bill Yi
885dfb7134
Import translations. DO NOT MERGE
...
Change-Id: I70e8f100eea4f162ebd27217ea885cc52f390e56
Auto-generated-cl: translation import
2019-09-18 10:42:11 -07:00
Tony Wickham
1d61043002
Merge "Allow scroll to clear all in 3 button+fallback mode" into ub-launcher3-qt-qpr1-dev am: 24fb1526e2
...
am: cdcfd98c05
Change-Id: Iecef9fc4fb5c1dd467581468f6b8edc5becc95fa
2019-09-18 08:18:42 -07:00
Tony Wickham
cdcfd98c05
Merge "Allow scroll to clear all in 3 button+fallback mode" into ub-launcher3-qt-qpr1-dev
...
am: 24fb1526e2
Change-Id: I59bf92b05d45c31705166e1211cf02ccbc348383
2019-09-18 08:12:41 -07:00
Tony Wickham
24fb1526e2
Merge "Allow scroll to clear all in 3 button+fallback mode" into ub-launcher3-qt-qpr1-dev
2019-09-18 14:54:20 +00:00
Jon Miranda
1fb549727f
Fix BindWidgetTests. am: 6ed680258e
...
am: 7cfab69b1c
Change-Id: Icaf64c61ccd354b41e5cd0ed84059147c157ad8b
2019-09-17 21:59:35 -07:00
Jon Miranda
7cfab69b1c
Fix BindWidgetTests.
...
am: 6ed680258e
Change-Id: Ifca5fc650f88bd18985f264ccf4d0c33698faf52
2019-09-17 21:52:57 -07:00
Tracy Zhou
5886a384ef
Make sure that live tile overlay is added only once. am: 757d62dcaa
...
am: b74d814c7c
Change-Id: I011c987997e0d4c355f7157a7c37a02e4e30b0d8
2019-09-17 20:36:28 -07:00
Tracy Zhou
b74d814c7c
Make sure that live tile overlay is added only once.
...
am: 757d62dcaa
Change-Id: I55c1bfbdbbacc7a9884ad3289120ff71f0ecb53f
2019-09-17 20:30:03 -07:00
Jon Miranda
6ed680258e
Fix BindWidgetTests.
...
Broken by change I03c31bb308fc496b9fc633c2fde23ae4568f8c44.
Bug: 139281702
Test: Ran BindWidgetTest with 8/8 successful.
Change-Id: I6a03744c9cd919316ff27b12c50acc70c91d47fa
2019-09-17 19:18:02 -07:00
Tony Wickham
0638249b3e
Allow scroll to clear all in 3 button+fallback mode
...
We weren't calling onSwipeUpToRecentsComplete(), which meant we kept the
disallowScrollToClearAll from prepareRecentsUi indefinitely.
Also don't update the icon scale if it is supposed to be scaled down, to
avoid it from scaling up and overlapping with the app window.
Fixes: 141184247
Change-Id: I49406764373e7121e289da7477dcbb58d0b98fd5
2019-09-17 15:10:33 -07:00
vadimt
8804a43d22
resolve merge conflicts of a24ed7267c to ub-launcher3-qt-future-dev
...
am: c708384087
Change-Id: I30c8c5b6541b7e5d149ae940513ea97269c61902
2019-09-17 14:44:33 -07:00
TreeHugger Robot
1cd69ab250
Merge "Adding recents test for 3P Launcher" into ub-launcher3-master
2019-09-17 21:18:19 +00:00
Sunny Goyal
ed83cf6df0
Adding recents test for 3P Launcher
...
Bug: 140749967
Change-Id: I3644822accfd229d1e46ca5e43ad827aef776787
2019-09-17 13:41:10 -07:00
TreeHugger Robot
1ac3640c86
Merge "Adding in missing changes to ub-launcher3-master." into ub-launcher3-master
2019-09-17 20:06:10 +00:00
vadimt
c708384087
resolve merge conflicts of a24ed7267c to ub-launcher3-qt-future-dev
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I89f3bcf309b10a359b12167474fcb3f93640787f
2019-09-17 13:03:18 -07:00
Vadim Tryshev
a24ed7267c
Merge "Support for tests that a leak is detected" into ub-launcher3-qt-qpr1-dev
2019-09-17 19:16:00 +00:00
Jon Miranda
935cfb8633
Key by both package and user for list of active install sessions. am: c1322b6ac8
...
am: bf7371e510
Change-Id: I7b18a068f88ec3aef84d04d80b54f6252230bbc8
2019-09-17 12:06:21 -07:00
Jon Miranda
bf7371e510
Key by both package and user for list of active install sessions.
...
am: c1322b6ac8
Change-Id: I112298649de8f9abd0898fdf4feda02395b7a31c
2019-09-17 12:00:03 -07:00
Jon Miranda
088b9c2f87
Adding in missing changes to ub-launcher3-master.
...
Manual merge marked as DO NOT MERGE: Id60ae2c08ec7aca6780fec1f873920f3857d598e
also including the subsequent fix I8ee6836d3a06f315518aa4829c8e2ddf8cf5f74d
that I had to Skip from the automerger since the first CL never made it in.
Change-Id: I5a4a39278010099dded8fe06e960c0397c49c0aa
2019-09-17 11:51:49 -07:00
vadimt
8c2ae545cf
Support for tests that a leak is detected
...
Bug: 139137636
Change-Id: Ib4f02d6b3798e3fdf3d8e5758c09d2b642404af5
Merged-in: Ib4f02d6b3798e3fdf3d8e5758c09d2b642404af5
2019-09-17 18:49:42 +00:00
Vadim Tryshev
66fca5f8f6
Merge "Support for tests that a leak is detected" into ub-launcher3-master
2019-09-17 18:43:06 +00:00
Jonathan Miranda
903abfc48f
Merge "Support defining X column layout for all apps as a display option." into ub-launcher3-qt-future-dev
...
am: 315732e524
Change-Id: I1c47d689fbec052859d5fdbfcf8d10b07ddd0202
2019-09-17 11:25:21 -07:00
Jon Miranda
c1322b6ac8
Key by both package and user for list of active install sessions.
...
This fixes the bug where items are left on the home screen for the wrong
user.
Bug: 139281702
Change-Id: I03c31bb308fc496b9fc633c2fde23ae4568f8c44
2019-09-17 11:20:35 -07:00
vadimt
4e4e4da66a
Support for tests that a leak is detected
...
Bug: 139137636
Change-Id: Ib4f02d6b3798e3fdf3d8e5758c09d2b642404af5
2019-09-17 18:17:10 +00:00
Jonathan Miranda
315732e524
Merge "Support defining X column layout for all apps as a display option." into ub-launcher3-qt-future-dev
2019-09-17 18:14:29 +00:00
Pinyao Ting
f7e9b051b5
Merge "Revert "support scroll backward to minus one screen via voice/switch access"" into ub-launcher3-qt-future-dev
...
am: 4ca6449e39
Change-Id: Id11261547476ef4f43dfda5cbf63f1e30cae936f
2019-09-17 10:30:14 -07:00
TreeHugger Robot
4ca6449e39
Merge "Revert "support scroll backward to minus one screen via voice/switch access"" into ub-launcher3-qt-future-dev
2019-09-17 17:14:46 +00:00
Pinyao Ting
3ad4ace203
Revert "support scroll backward to minus one screen via voice/switch access"
...
This reverts commit d5af944f41 .
Reason for revert: Test failure on master that might be related to this code change.
Change-Id: I269bf5b0a6505da291e1ff4ed181a851268d6ed8
2019-09-17 16:58:07 +00:00
Pinyao Ting
2cfa8dc020
Merge changes from topic "cache-shortcut-image" into ub-launcher3-qt-future-dev
...
am: 570d9a1e9c
Change-Id: I3182c90a69d1c93daf8d33cfe7f15f613ac972fd
2019-09-17 09:54:17 -07:00
Pinyao Ting
570d9a1e9c
Merge changes from topic "cache-shortcut-image" into ub-launcher3-qt-future-dev
...
* changes:
fix the issue update handler tries to cache a shortcut without valid bitmap.
Revert "Revert "cache shourtcut image""
2019-09-17 16:47:26 +00:00
Pinyao Ting
388a2122b1
Merge "support scroll backward to minus one screen via voice/switch access" into ub-launcher3-qt-future-dev
...
am: 6462a44935
Change-Id: I686c2204c4229a1027924bca11c048408ff80315
2019-09-16 20:51:13 -07:00
Samuel Fufa
b5a16812a6
Merge "Add Logs to track app uninstall and icon removal" into ub-launcher3-qt-future-dev
...
am: 2b06908252
Change-Id: I638ad5d2f48a577503b8925253152e0a9b42ab6d
2019-09-16 20:50:55 -07:00
Tracy Zhou
2141c39be5
Make sure that live tile overlay is added only once. am: 6b272369e7
...
am: c1711c65ea
Change-Id: I3c87118d1b72bc7107d4bbeb8537c52a13062c18
2019-09-16 20:50:34 -07:00
Pinyao Ting
0651614984
Merge "Revert "cache shourtcut image"" into ub-launcher3-qt-future-dev
...
am: 3463d1c5f9
Change-Id: Ic71994e9567e023666fb435c989c19362b41861f
2019-09-16 20:50:17 -07:00
vadimt
25f9eb1e64
Fully qualifying @Ignore am: b1ccbd9def
...
am: c563ec22ef
Change-Id: I2c6fb106418f1d7fc1f2641dca497282855402fd
2019-09-16 20:49:58 -07:00
Vadim Tryshev
764bb788b6
Merge "Disable failing widget tests" into ub-launcher3-qt-qpr1-dev am: 90f4536ae3
...
am: a8a23bd745
Change-Id: I204ce821f8e10dcc95e71f0228965ca40fc4989c
2019-09-16 20:49:41 -07:00
Pinyao Ting
e9957523db
[automerger skipped] Fix the issue deep shortcuts cannot be added to workspace via voice/switch access am: 39216c1533 -s ours
...
am: 3f2cc47303 -s ours
am skip reason: change_id Ie54d9c738fc51445f3aa49458ff4fc1dd6e4fc67 with SHA1 8a739f9511 is in history
Change-Id: I085984d4d887a8a89c4a163c53a365d91a85ae58
2019-09-16 20:49:23 -07:00
Vadim Tryshev
667e8cb74a
Merge "Fixing widget tests" into ub-launcher3-qt-qpr1-dev am: de5e5afae5
...
am: 91261e38d9
Change-Id: I5f034b7f3664ded275394561bb20a666d40e1681
2019-09-16 20:49:02 -07:00
Jon Miranda
6bba27f195
[automerger skipped] Fix failing test testPromiseIcon_addedFromEligibleSession. am: d6ae55d968
...
am: f1ce0f31ab -s ours
am skip reason: SHA1 f1ce0f31ab skipped by user jonmiranda
Change-Id: I5bfc823c2e73b0278bf1cee0292f12581e85df36
2019-09-16 20:48:40 -07:00