Commit Graph

39842 Commits

Author SHA1 Message Date
TreeHugger Robot eaccabb042 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9a682982a0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17231568

Change-Id: I3dd0f4f22cc48ec0e509b70ca209cf1276b167f1
2022-03-18 02:31:20 +00:00
TreeHugger Robot 2260059974 Merge changes from topic "presubmit-am-03e6d19cbcaa449ab324b779508f09b0" into sc-v2-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7933df7269
  Import translations. DO NOT MERGE ANYWHERE
2022-03-18 02:11:43 +00:00
TreeHugger Robot 9a682982a0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-03-18 02:10:33 +00:00
Bill Yi 8694741ed6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7933df7269
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17230759

Change-Id: I8876fb1bee4d42222d8ca79ef27f0ec754dbf60f
2022-03-17 02:59:52 +00:00
Bill Yi 7933df7269 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I480f37dd715c29100722f29e601013255513fb28
2022-03-17 02:59:43 +00:00
Bill Yi 4f56e1893f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 487a62c361
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17231568

Change-Id: Ied8dee7b48db9dc06cbe9410b5c981943a4b9890
2022-03-17 02:59:14 +00:00
Bill Yi 487a62c361 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I25ea0d6596cffa1269137572a2fe565da433926b
2022-03-17 02:59:04 +00:00
Jon Miranda 47399b76e6 Merge "Never look for matching view in All Apps when swiping up to go home." into sc-v2-dev am: 8f82208a5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17156660

Change-Id: I0787a0e03de45ff9c395e0d52f714101fffdf9c7
2022-03-15 18:40:20 +00:00
Jon Miranda 8f82208a5e Merge "Never look for matching view in All Apps when swiping up to go home." into sc-v2-dev 2022-03-15 18:13:29 +00:00
Jon Miranda ba3ca2f57f Merge changes from topic "presubmit-am-a0fe463985e8453c9c1e5b6ccc543c8b-sc-v2-dev" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Never look for matching view in All Apps when swiping up to go home. 2p: b2068f2eda
  Never look for matching view in All Apps when swiping up to go home.
2022-03-15 18:13:29 +00:00
Presubmit Automerger Backend 8e8638d83f [automerge] Add debug logs for bad launcher state. 2p: f6365d5b85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17161358

Bug: 223498680
Bug: 221658803
Bug: 223499269
Change-Id: I069cb98329c5e8b37beb5dce9e23bfa306276b52
Merged-In: I138a7ab031269009fa8ca492cd0bd48085aa4e68
2022-03-11 03:35:28 +00:00
Jon Miranda f6365d5b85 Add debug logs for bad launcher state.
Bug: 223498680
Bug: 221658803
Bug: 223499269

Test: manual
Change-Id: I138a7ab031269009fa8ca492cd0bd48085aa4e68
(cherry picked from commit 7ebe209c21)
Merged-In: I138a7ab031269009fa8ca492cd0bd48085aa4e68
2022-03-11 03:35:17 +00:00
Jon Miranda b35524b442 [automerge] Never look for matching view in All Apps when swiping up to go home. 2p: b2068f2eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17156660

Bug: 222124240
Change-Id: I13cde344a87a97b938ae067bec088361f45705f9
2022-03-10 20:31:17 +00:00
Jon Miranda b2068f2eda Never look for matching view in All Apps when swiping up to go home.
The swiping up gesture will never return an app in All Apps,
so we can ignore All Apps state in those cases.

This fixes an edge case where user swipes up and launcher state
is still in All Apps. This causes us to animate the icon to
where it would be in All Apps, even though by the time the
animation starts we are actually in Normal state.

Bug: 222124240
Test: open app from  all apps then quickly swipe up to go home
Change-Id: I756a870660a397d6629aec82e4f5ec4914ed0669
(cherry picked from commit b42e124f5b)
2022-03-10 20:31:11 +00:00
Xin Li 9551cc3f15 [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours am: f29e0a220b -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2013193

Change-Id: If6d6bda6e649e84c6ff11fe8e43d12bd8b4be274
2022-03-08 11:06:30 +00:00
Xin Li bf72e8be47 [automerger skipped] Merge Android 12L am: bac85d0348 -s ours am: 5f2987a89b -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2013193

Change-Id: I2881c5cf413f745e6817f4dde07ec4c04ff033c7
2022-03-08 11:03:46 +00:00
Xin Li f29e0a220b [automerger skipped] Merge "Merge Android 12L" am: 3a9bb04f93 -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2013193

Change-Id: I78e022b6fdbf96e31a7dd36ba6b2b68536b3906f
2022-03-08 10:21:41 +00:00
Xin Li 5f2987a89b [automerger skipped] Merge Android 12L am: bac85d0348 -s ours
am skip reason: Merged-In Icf0cc432ab3a97614b27efcf6fc9d18ea423a743 with SHA-1 11a0454879 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2013193

Change-Id: I4a23489651088697a78e911ea134bbdc34296bf6
2022-03-08 10:18:55 +00:00
Xin Li 3a9bb04f93 Merge "Merge Android 12L" 2022-03-08 06:51:46 +00:00
Xin Li bac85d0348 Merge Android 12L
Bug: 222710654
Merged-In: Icf0cc432ab3a97614b27efcf6fc9d18ea423a743
Change-Id: I478c152d8d5bc197a29253e7cfc8e6016e949a77
2022-03-08 00:19:18 +00:00
Brian Isganitis 718f8e7adb [automerger skipped] Merge "Remove popup container drag listener on close complete." into sc-v2-dev am: 1d4dc1ba91 -s ours
am skip reason: Merged-In I16515518c6d488b74450456306abbfff646ac11b with SHA-1 8aa4b05d22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16943984

Change-Id: I7b6c53de746bde1cc3c510233027653eed0eff44
2022-03-03 18:13:15 +00:00
Brian Isganitis 1d4dc1ba91 Merge "Remove popup container drag listener on close complete." into sc-v2-dev 2022-03-03 17:54:12 +00:00
Brian Isganitis 087e879b25 Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp
* changes:
  [automerge] Remove popup container drag listener on close complete. 2p: 8aa4b05d22
  Remove popup container drag listener on close complete.
2022-03-03 17:54:12 +00:00
TreeHugger Robot 50aba07a40 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e29216a55d -s ours am: 62edf72fa7 -s ours am: 0968761a4a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I94ba6232b0147cef4a1b3b2e064afe3ce2f1ae1c
2022-03-03 10:30:34 +00:00
TreeHugger Robot a550f0a2b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 703f64f7ab -s ours am: ceded819c7 -s ours am: 42e112382d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: Ie76c1e56d51489ae321aed44d1b334ae84e67974
2022-03-03 10:30:30 +00:00
TreeHugger Robot 7ccf7fd196 Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-qpr1-dev am: 6fc1f0fb5c am: e38b5e54eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: Iae7bf1986cbbbcec2a90b70b5ef369f677da91ec
2022-03-03 10:30:24 +00:00
Bill Yi 51ab466767 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17a9ba37d8 am: 705e77fc21 -s ours am: 06dd0d8c5a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I56ba4be362c43cd9fdad542bbb430d9d52dacc2c
2022-03-03 10:30:22 +00:00
TreeHugger Robot c7207f179e Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-qpr1-dev am: 4edfbf360a am: 8ba8fad707
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: I8f2fcb69ac47d430e03f449569990e7259e42d6c
2022-03-03 10:30:15 +00:00
Bill Yi a88b564ff0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc9382570a am: 4449ef542c -s ours am: 51e3221e96 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: If7ee9d0b613806877bd08b6df6bc9d66028a1637
2022-03-03 10:30:14 +00:00
TreeHugger Robot 93f92b26bd Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into sc-qpr1-dev am: c466421e1e am: 767c5093cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058106

Change-Id: I84518a7aeaf50845a49068892409e30de2dcfc33
2022-03-03 10:29:58 +00:00
Bill Yi 25c328b23f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10791cf6ad am: 213b02540a -s ours am: 2a12892dc7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058106

Change-Id: Ia73602f022dcdbdcb88945a712574f789044dbec
2022-03-03 10:29:57 +00:00
TreeHugger Robot 0968761a4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e29216a55d -s ours am: 62edf72fa7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I5dcc024cd36248d1ee3b19fe7ac9004736d09022
2022-03-03 10:09:57 +00:00
TreeHugger Robot 42e112382d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 703f64f7ab -s ours am: ceded819c7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: I30142d661058983e41e626febf896ce318432204
2022-03-03 10:09:47 +00:00
TreeHugger Robot e38b5e54eb Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-qpr1-dev am: 6fc1f0fb5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I6d7dbf0387552cbeca8fa000417017d07e714755
2022-03-03 10:09:36 +00:00
Bill Yi 06dd0d8c5a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17a9ba37d8 am: 705e77fc21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I7d5c24073f2e6917cc5e6ae7b6619c44eee2ce06
2022-03-03 10:09:34 +00:00
TreeHugger Robot 8ba8fad707 Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-qpr1-dev am: 4edfbf360a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: Ie1236802aff711614d5147ded7eb3ec85c26817f
2022-03-03 10:09:18 +00:00
Bill Yi 51e3221e96 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc9382570a am: 4449ef542c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: I43f2db5aac66cbb80bc21d293cbf569ed207e794
2022-03-03 10:09:15 +00:00
TreeHugger Robot 767c5093cb Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into sc-qpr1-dev am: c466421e1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058106

Change-Id: Ie17191cd65534a3f4141c0dd42a73043863969fd
2022-03-03 10:08:57 +00:00
Bill Yi 2a12892dc7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10791cf6ad am: 213b02540a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058106

Change-Id: I7a56d63a917c42a511a6cea6596184bde9308030
2022-03-03 10:08:53 +00:00
TreeHugger Robot 62edf72fa7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e29216a55d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17056089

Change-Id: I4a0250af5c6b6eaa742c4e0fc30eceb360ec73df
2022-03-03 10:08:33 +00:00
TreeHugger Robot ceded819c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 703f64f7ab -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057796

Change-Id: Idc8645a6d8eecec985884da6807218357c1daab0
2022-03-03 10:08:26 +00:00
TreeHugger Robot 6fc1f0fb5c Merge changes from topic "presubmit-am-0c24d9f255d6403d89a5c084b9bd0f1a" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 17a9ba37d8
  Import translations. DO NOT MERGE ANYWHERE
2022-03-03 09:33:56 +00:00
TreeHugger Robot e29216a55d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-03-03 09:33:56 +00:00
TreeHugger Robot 4edfbf360a Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc9382570a
  Import translations. DO NOT MERGE ANYWHERE
2022-03-03 09:13:15 +00:00
TreeHugger Robot 703f64f7ab Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-03-03 09:13:15 +00:00
TreeHugger Robot c466421e1e Merge changes from topic "presubmit-am-d74efe3712a04851a2e98ec622a5cf93" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10791cf6ad
  Import translations. DO NOT MERGE ANYWHERE
2022-03-03 08:55:17 +00:00
TreeHugger Robot 76ceddd35f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b3ce2ec153 -s ours am: 62f65fc668 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058110

Change-Id: Ie799e612038e0a67e9fd586ba1248eaf170b915f
2022-03-03 08:40:53 +00:00
Bill Yi 29bc01688b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9df81be06 -s ours am: 70f16515f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17058110

Change-Id: Ia23210a7deaf155e269a1c125fb6682f6882f56c
2022-03-03 08:40:51 +00:00
TreeHugger Robot ecbe1501a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 70d27327e9 -s ours am: 4affa0024d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057800

Change-Id: If80df6debc6e7cf3fa163b0b77dc187a37325c39
2022-03-03 08:40:45 +00:00
Bill Yi 10ad8cd887 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be2d610046 -s ours am: 7f6b62b30f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17057800

Change-Id: I02b7cbbea7a9ffa8a0feed9c625c08833a6bb1b9
2022-03-03 08:40:44 +00:00