Bill Yi
5656818c36
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd74e5e99c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058111
Change-Id: I9ce5382b8ec40b9a080a878002a1aaa787bfe58f
2022-03-03 07:56:15 +00:00
TreeHugger Robot
45f7def991
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3fa1f04d83 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058105
Change-Id: If1cc0e2d2cf78cb4e8a03a00d180ed5defd34cb7
2022-03-03 07:56:08 +00:00
Bill Yi
28411773df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c57229d4c0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058105
Change-Id: Ibee751979d6b9989cf5c588069022469cac74d36
2022-03-03 07:56:06 +00:00
Bill Yi
ff34f66188
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bf37866067 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057801
Change-Id: I783bdd50f0613b05bce712f82f0279b4d2cb7f40
2022-03-03 07:56:00 +00:00
TreeHugger Robot
947cb3c437
[automerger skipped] Merge "Passing in the launch cookie for widget broadcast trampolines" into sc-v2-dev am: ba297c19c2 -s ours
...
am skip reason: Merged-In Ibfe9e5232317837f3111459212a4b016b5828ef4 with SHA-1 c519538bca is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16968688
Change-Id: I5a03736cde2a24eeba1c8420ab936b4e02a48c23
2022-03-03 07:55:54 +00:00
TreeHugger Robot
3fa1f04d83
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-03-03 07:39:28 +00:00
Bill Yi
dd74e5e99c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5ef1dcb01818ee0a85a3dbe46dd92f21caab3a5c
2022-03-02 19:25:24 +00:00
Bill Yi
c57229d4c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If881db80f5ac6599b60a439e8aaa0bdd71784b65
2022-03-02 19:23:30 +00:00
Bill Yi
bf37866067
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie305e6a08bf74c0302f843d72786222a519bdf7b
2022-03-02 19:21:36 +00:00
TreeHugger Robot
3bd7bbe47a
Merge changes from topic "widget_launch_cookie-sc-v2-dev" into sc-v2-dev-plus-aosp
...
* changes:
[automerge] Passing in the launch cookie for widget broadcast trampolines 2p: c519538bca
Passing in the launch cookie for widget broadcast trampolines
2022-02-28 19:11:10 +00:00
TreeHugger Robot
ba297c19c2
Merge "Passing in the launch cookie for widget broadcast trampolines" into sc-v2-dev
2022-02-28 19:11:10 +00:00
Sunny Goyal
c6aadf8a74
[automerge] Removing unnecessary AM.getTasks() call on every touch 2p: 8e5a164e05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17005155
Bug: 220906427
Change-Id: Iedf1d7086d1f9ee1ae167f2a975612de9c84521c
2022-02-24 17:41:01 +00:00
Sunny Goyal
8e5a164e05
Removing unnecessary AM.getTasks() call on every touch
...
Bug: 220906427
Test: Verified on device
Change-Id: I58ed22c4d6069f10198ec30ec02fa8c2f7c55cbe
(cherry picked from commit d2ec834fac )
2022-02-24 17:40:54 +00:00
Presubmit Automerger Backend
a6118187c2
[automerge] Passing in the launch cookie for widget broadcast trampolines 2p: c519538bca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16968688
Change-Id: I233643ee87042f59a104848d5b6e38a6ac3fa3a2
Merged-In: Ibfe9e5232317837f3111459212a4b016b5828ef4
2022-02-21 23:08:06 +00:00
Selim Cinek
c519538bca
Passing in the launch cookie for widget broadcast trampolines
...
The launch cookie can now be transfered via the broadcast
Fixes: 220290671
Test: add Photos widget, return properly to widget
Merged-In: Ibfe9e5232317837f3111459212a4b016b5828ef4
Change-Id: Ibfe9e5232317837f3111459212a4b016b5828ef4
2022-02-21 23:07:57 +00:00
TreeHugger Robot
f9ef6e3b3c
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f am: 0fb7fa4e30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: Ia620f88c81b7b8bac48380c8826ab97b06918ed5
2022-02-18 20:03:55 +00:00
Bill Yi
6e50b9b331
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours am: a4af3f6730 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I605aa9c140a68df68dda359176006f9aef3eee2d
2022-02-18 20:03:53 +00:00
TreeHugger Robot
0fb7fa4e30
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I2bf6582bd4fdbb647a3795a8e1311995a3e3f2e8
2022-02-18 19:42:33 +00:00
Bill Yi
a4af3f6730
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c am: 42320fef47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: If8754802299a1eaa1483e0b92adc1d99753d45dd
2022-02-18 19:42:32 +00:00
TreeHugger Robot
ae4b713b2f
Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 19:13:51 +00:00
Bill Yi
a366112254
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours am: f1fb56fd9a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: Ib63abd485ac98a54bd69c65cd7f97f80148dc75d
2022-02-18 18:00:38 +00:00
Bill Yi
f1fb56fd9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 634ddc934f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939771
Change-Id: I9fae140c49c790cb2af8e55bf6022df95252d0e7
2022-02-18 17:39:38 +00:00
TreeHugger Robot
85c63814dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 129c510583 -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: I2c8e49c36f6ec332d33ba0b6938409406a35ae98
2022-02-18 17:12:47 +00:00
TreeHugger Robot
129c510583
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-02-18 17:07:55 +00:00
TreeHugger Robot
780a5e3a11
Merge changes from topic "presubmit-am-7647861324994509ba7d86b8c26dd400" into sc-v2-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 98fda41b31
Import translations. DO NOT MERGE ANYWHERE
2022-02-18 17:07:55 +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
Bill Yi
634ddc934f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1a4cc201486cc623554b6169e59f00e31f17542a
2022-02-18 09:23:37 +00:00
Bill Yi
42320fef47
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a2ba15674c
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16939770
Change-Id: I71673719797ca397b6a1ab9ece1f7ffb735c2521
2022-02-18 09:23:08 +00:00
Bill Yi
a2ba15674c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I90d6a4aacc6b554740d489cc7e7689b632c9a2eb
2022-02-18 09:22:58 +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
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
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
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
Winson Chung
144b0504ad
Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev
2022-02-16 19:12:27 +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
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
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
Xin Li
2f4f77fdbc
[automerger skipped] Merge SP2A.220305.012 am: 11a0454879 -s ours
...
am skip reason: Merged-In I51cb81718a489ad7568c5e05ace0b3dbc6ca5443 with SHA-1 0077caa15d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16872102
Change-Id: Ife61a6188c19b497fda7df645caa549e4d90835a
2022-02-15 00:14:51 +00:00
Xin Li
11a0454879
Merge SP2A.220305.012
...
Bug: 219523960
Merged-In: I51cb81718a489ad7568c5e05ace0b3dbc6ca5443
Change-Id: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743
2022-02-14 20:06:39 +00:00
Xin Li
75cf4399c8
[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: bbd9e79bf2 -s ours
...
am skip reason: Merged-In Iec90538bf8dd18fede035d7f548a71b757d2356c with SHA-1 88c671ee71 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16845246
Change-Id: I37bb26275648a1835ef15bfb2b9175c60df6e504
2022-02-14 18:03:27 +00:00
Xin Li
bbd9e79bf2
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
...
Bug: 214455710
Merged-In: Iec90538bf8dd18fede035d7f548a71b757d2356c
Change-Id: Icfcc0dcab0a30472a6faff67e67e364386b98d41
2022-02-11 07:28:32 +00:00
TreeHugger Robot
5cf55827da
Merge "Adding ripple effect to the "All Apps tab" buttons." into sc-v2-dev am: 3ba95852f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16359044
Change-Id: I01ee5a75a82798c002798d91538ecee0d455277b
2022-02-11 02:25:05 +00:00
TreeHugger Robot
3ba95852f3
Merge "Adding ripple effect to the "All Apps tab" buttons." into sc-v2-dev
2022-02-11 02:11:50 +00:00