Bill Yi
f708cf5d4c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours am: e3b977fa95 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: Ib9e219ed7793d60e1352bdd176f4a3d26d14fe0f
2022-02-18 17:26:26 +00:00
Jon Miranda
1e8217110e
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours am: b67b56d76f -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: Ic9e5404a9479d8e05399d4fd7cb4d31d87e4d21e
2022-02-18 17:26:19 +00:00
Presubmit Automerger Backend
4adfd45fcb
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours am: ff5e621397 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: Id1f47f7845b0924f8f494ec0b0aefd54a7981f73
2022-02-18 17:25:22 +00:00
Bill Yi
e3b977fa95
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31 am: 90db95d8e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I9ad21ee59f43b1b16875ae8096c63b20c5729687
2022-02-18 17:13:13 +00:00
Jon Miranda
b67b56d76f
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours am: 6f3f8252c2 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I4460c587ac75231760382617175f132635d2a9e7
2022-02-18 17:04:21 +00:00
Presubmit Automerger Backend
ff5e621397
[automerger skipped] [automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c am: 233f9fc731 -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 b2670d2051 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I100075fa063d26f87316be5b41b237283ad81ad1
2022-02-18 17:04:16 +00:00
Jon Miranda
6f3f8252c2
[automerger skipped] Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev am: 90cac2cd9b -s ours
...
am skip reason: Merged-In Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c with SHA-1 35d294387c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Change-Id: I89f3df27c4571f78673b8ee89b848ae1051d312a
2022-02-18 17:01:29 +00:00
Jon Miranda
90cac2cd9b
Merge "Init FloatingIconView properties before fetching drawable. & Make sure properties are reset when recycled." into sc-v2-dev
2022-02-18 16:39:04 +00:00
Bill Yi
90db95d8e7
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939772
Change-Id: I954b8ac2dd7af307ac69b17f5d0d5750d5a362fc
2022-02-18 09:24:25 +00:00
Bill Yi
98fda41b31
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie685cf732f6d413b10232c12c0b2faea1469b723
2022-02-18 09:24:16 +00:00
TreeHugger Robot
49141ccf2e
Merge "Revert "Clear all DragView in onSaveInstanceState""
2022-02-17 20:45:46 +00:00
Tracy Zhou
a2215455da
Merge "Correct order of split action buttons"
2022-02-17 19:13:26 +00:00
Thales Lima
73087f4b2c
Merge "Stop using bottom inset in preview"
2022-02-17 15:28:09 +00:00
Thales Lima
83b345338b
Stop using bottom inset in preview
...
We are not using the bottom inset (navbar) in Launcher anymore, so we should not use it in preview as well.
Fixes 205284107
Test: manual
Change-Id: Iefd71b3cbe8e738c4559716af8c85015ba7c3c41
2022-02-17 13:35:41 +00:00
Tracy Zhou
0551313a9b
Correct order of split action buttons
...
Fixes: 219988163
Fixes: 217965089
Test: https://screenshot.googleplex.com/8LNMBeEQhMVnDSm
Change-Id: I760c0b8085069181d9a1cdc582ac7d58a08f4724
2022-02-17 00:14:50 -08:00
TreeHugger Robot
369ae1aaf4
Merge "Re-enable bulk icon loading"
2022-02-16 23:58:30 +00:00
Presubmit Automerger Backend
233f9fc731
[automerge] Init FloatingIconView properties before fetching drawable. 2p: 35d294387c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16908749
Bug: 207389002
Change-Id: I3815ebc0a26f61950d03b63a011dce9e42adb036
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:54 +00:00
Jon Miranda
35d294387c
Init FloatingIconView properties before fetching drawable.
...
& Make sure properties are reset when recycled.
This fixes the bug that causes BubbleTextView drawable not to get set.
Bug: 207389002
Test: locally disable loading AdaptiveIcons, ensure BubbleTextView
drawable always gets drawn for closing animation
Change-Id: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
(cherry picked from commit b2670d2051 )
Merged-In: Ifdbf3e733e27918c57a5e9b23e5a11b65f8f338c
2022-02-16 23:23:44 +00:00
András Klöczl
a29eed894f
Merge "Fix two panel tapl test dragging issue"
2022-02-16 22:47:47 +00:00
Vinit Nayak
b374beda80
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev am: a75f2ce2d2 am: 9475a6d6c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: I2c02aadb4d8cd6e7ede1579bd8e986d7de8685ab
2022-02-16 21:53:44 +00:00
Vinit Nayak
9475a6d6c3
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev am: a75f2ce2d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: Ic7c7ca77ed75c4eef40eac325d7cc1fc3e78eb1e
2022-02-16 21:43:53 +00:00
Vinit Nayak
afd9bfebe1
Merge changes from topic "presubmit-am-a8c798abe8b24577a107553295b8cd0f" into sc-v2-dev-plus-aosp am: 0dffbfcba6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828919
Change-Id: I0e30b14ef15fde94a27369f3c76f975c8272736f
2022-02-16 21:43:27 +00:00
Vinit Nayak
a75f2ce2d2
Merge "Add null check for null task in getItemInfo()" into sc-v2-dev
2022-02-16 21:23:47 +00:00
Vinit Nayak
0dffbfcba6
Merge changes from topic "presubmit-am-a8c798abe8b24577a107553295b8cd0f" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add null check for null task in getItemInfo() 2p: 73c6288038
Add null check for null task in getItemInfo()
2022-02-16 21:23:47 +00:00
Schneider Victor-tulias
76d56ee5a1
Re-enable bulk icon loading
...
Bug: 195674813
Test: manual
Change-Id: I8cc02cb8648797e55a83bbb184ed2cd5088a1626
2022-02-16 12:23:34 -08:00
Winson Chung
daf801c69e
[automerger skipped] Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev am: 144b0504ad -s ours am: aa2161ba53 -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 7faaffa56a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: I7af7fcbb2fca9ea87e3f73f9e976d1613768ca4a
2022-02-16 19:32:53 +00:00
Winson Chung
aa2161ba53
[automerger skipped] Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev am: 144b0504ad -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 7faaffa56a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: I1b6a0ed933a11473744d2d6b8cabffc3765bb983
2022-02-16 19:32:40 +00:00
Presubmit Automerger Backend
66dcc4be32
[automerger skipped] [automerge] Prevent lingering divider animators in AbsSwipeUpHandler 2p: 7faaffa56a am: 21e44c56bb -s ours
...
am skip reason: Merged-In I078a7d0f22c2ef2ba847796ec79e740c789ce1ae with SHA-1 26031b0dd2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Change-Id: Ia44c549d11847f5fc38537935a0da57996f78fd5
2022-02-16 19:32:40 +00:00
Schneider Victor-tulias
ee9a54b470
Merge "Fix blank workspce icons on Launcher data refresh."
2022-02-16 19:31:33 +00:00
Winson Chung
144b0504ad
Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev
2022-02-16 19:12:27 +00:00
Vinit Nayak
95686cd9be
Merge "Ensure starting split animation scale is always 1"
2022-02-16 18:49:40 +00:00
TreeHugger Robot
64162f1e05
Merge "Update TAPL object hierarchy in preparation for Taskbar TAPL tests"
2022-02-16 18:20:06 +00:00
TreeHugger Robot
b63aad9de8
Merge "Use correct text size for settings collapsed toolbar in landscape."
2022-02-16 18:01:39 +00:00
Presubmit Automerger Backend
21e44c56bb
[automerge] Prevent lingering divider animators in AbsSwipeUpHandler 2p: 7faaffa56a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16693066
Bug: 213403679
Change-Id: I628b14fb01461a103dd0cdd7168835197a28f1c5
Merged-In: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
2022-02-16 17:13:58 +00:00
Winson Chung
7faaffa56a
Prevent lingering divider animators in AbsSwipeUpHandler
...
- Refactor the util method to create the animator and track the existing
animation in AbsSwipeUpHandler to be able to cancel it if another call
to change the visbility comes in. Note that this doesn't address
the case where the launch animation overlaps with swipe up (though that
hopefully shouldn't happen in normal usage)
Bug: 213403679
Test: Tap in the gesture space while split
Change-Id: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
Merged-In: I078a7d0f22c2ef2ba847796ec79e740c789ce1ae
2022-02-16 17:13:48 +00:00
TreeHugger Robot
19fff8cb74
Merge "Do not theme icons when the original view is not themed."
2022-02-16 17:13:10 +00:00
Andras Kloczl
659cfbe1f6
Fix two panel tapl test dragging issue
...
It seems if the dragging target position's X coordinate is 0
then there is a weird bug in portrait mode.
Test: atest TwoPanelWorkspaceTest
Bug: 197631877
Change-Id: I7d8702b06e5ed396814339080f8e814e9f8a6a65
2022-02-16 13:47:50 +00:00
Tony Huang
b39ef58493
Merge "Refactor startIntentAndTaskWithLegacyTransition"
2022-02-16 03:45:02 +00:00
Brian Isganitis
860e675abe
Merge "Remove popup container drag listener on close complete."
2022-02-16 03:33:49 +00:00
TreeHugger Robot
770bd08b6b
Merge "Reverse order of long-press menu."
2022-02-15 23:49:15 +00:00
TreeHugger Robot
940e5c7328
Merge "Cover thumbnail view instead of TaskView for split animation"
2022-02-15 23:22:32 +00:00
Brian Isganitis
6f1bd180f0
Use correct text size for settings collapsed toolbar in landscape.
...
Test: Manual
Fix: 213919433
Change-Id: I159015f425ae615d0abac076f04a100057a7237f
2022-02-15 15:12:02 -08:00
Evan Rosky
0a2f5b0baa
Merge "Switch pip to fixed-rotation in shell transitions"
2022-02-15 22:34:34 +00:00
TreeHugger Robot
da762c6ba3
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev am: a6c2e3f263 am: 949f9763bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: I85480ddb976bf34f2759ddbd6ad8f8a235716ae9
2022-02-15 22:33:42 +00:00
TreeHugger Robot
949f9763bb
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev am: a6c2e3f263
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: Ibec0c5987cecc92827896f41031f2359010955dd
2022-02-15 22:33:08 +00:00
TreeHugger Robot
451e468678
Merge changes from topic "presubmit-am-cc24ad26c93446a690f8a34ffde58aa3" into sc-v2-dev-plus-aosp am: 3a6a78f7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16828915
Change-Id: Icfc37fdb5858352e77628959ed7e627712620cdd
2022-02-15 22:32:43 +00:00
TreeHugger Robot
a6c2e3f263
Merge "Add null check for mRemoteTargetHandles for side task launch" into sc-v2-dev
2022-02-15 22:12:28 +00:00
TreeHugger Robot
3a6a78f7b0
Merge changes from topic "presubmit-am-cc24ad26c93446a690f8a34ffde58aa3" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Add null check for mRemoteTargetHandles for side task launch 2p: 90e0fe3923
Add null check for mRemoteTargetHandles for side task launch
2022-02-15 22:12:27 +00:00
Schneider Victor-tulias
d6279ae641
Update TAPL object hierarchy in preparation for Taskbar TAPL tests
...
See design at: go/taskbar-tapl-tests
Test: Ran tests remotely
Bug: 215218813
Change-Id: I1c2ceac8954973ea3ae5b2f797fdfb96ba7a6ec4
2022-02-15 13:33:26 -08:00
Brian Isganitis
8350fbdc39
Reverse order of long-press menu.
...
Test: Manual
Bug: 219777079
Change-Id: I161f10a5e7491aaa3926eba714ae2b46a10a2e62
2022-02-15 13:31:40 -08:00