38abfe1ea5
Merge "Move back to end of screen on keyguard" into sc-v2-dev am: c5ae15b481 am: 08b57cd012
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15986998
Change-Id: Idb49286c7bdc5e27fbe09ab064020964e22face2
2021-10-07 15:18:15 +00:00
08b57cd012
Merge "Move back to end of screen on keyguard" into sc-v2-dev am: c5ae15b481
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15986998
Change-Id: I8d6381fecfddfebfc5d7a3e9f67a3901b97f1180
2021-10-07 15:05:24 +00:00
c5ae15b481
Merge "Move back to end of screen on keyguard" into sc-v2-dev
2021-10-07 14:49:47 +00:00
788123ae8e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours am: b431ad7ad9 -s ours am: d527b4e66a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Ib400a9b1b1d3ff67842625eafbb7be4381306365
2021-10-07 14:23:47 +00:00
dcc566be5e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours am: d5527cf152 -s ours am: a71ebd3676 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I1b4216e9784922087b1c59c6a33b31dd82a36f7f
2021-10-07 14:23:42 +00:00
9b20e82088
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 7f19dccedc -s ours am: 1881145608 -s ours am: b04ceb673e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I5dcf2a51f963d77c55719914189588c1a58b4ea2
2021-10-07 14:23:13 +00:00
d527b4e66a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours am: b431ad7ad9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Ibadfe3db945cfa682d3007d9790d73890d8bce59
2021-10-07 14:08:39 +00:00
a71ebd3676
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours am: d5527cf152 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I657dead2aee4466f272350d97d0320567fd47094
2021-10-07 14:07:56 +00:00
b04ceb673e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 7f19dccedc -s ours am: 1881145608 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Icfb3cd47a32fbc6cc42da49a3c580df4708d1e28
2021-10-07 14:07:42 +00:00
b431ad7ad9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I1828cb7f9bc5392ce8ff01e38c76013bc0351a36
2021-10-07 13:59:11 +00:00
d5527cf152
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 90f1a4e085 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Ic43b56e2e2cef7d7026b1805a4dfa1e8215fd40d
2021-10-07 13:59:11 +00:00
1881145608
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 am: 7f19dccedc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Ida7225fd19b24bef27e239d9593e7cefc4182ee3
2021-10-07 13:58:43 +00:00
d16d3af112
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-10-07 13:44:56 +00:00
f832ccb395
Merge changes from topic "presubmit-am-30bae53b3005475dac73c84cda39e318"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30e4e6d8a85239122b4f30
2021-10-07 13:44:49 +00:00
b69477114f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b01c390299 -s ours am: 68685e617d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997530
Change-Id: Ibff54280ba194fc7d31015067226d4461031f75e
2021-10-07 09:04:33 +00:00
51e1670536
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 27d9bc556e -s ours am: 3e9a56b96c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997590
Change-Id: I46db3658ad1021efd247a1c3a7987ab2b3a8dfcc
2021-10-07 09:04:11 +00:00
68685e617d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b01c390299 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997530
Change-Id: I9505cf7ca6be3160966c6487e5831dc9daa437af
2021-10-07 08:51:54 +00:00
3e9a56b96c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 27d9bc556e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997590
Change-Id: Ie6f7bb0aecdeeff685c5fbbcc918e9fa7fcf298e
2021-10-07 08:51:24 +00:00
1f90841df5
Merge "[OneSearch] Log events with timestamp into logcat for debugging." into sc-v2-dev am: 137dd35d26 am: 1816c9d1b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15975400
Change-Id: I236ac5aa3539cd349a10822f9901d0e62116ac35
2021-10-07 08:43:15 +00:00
b01c390299
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-07 08:40:56 +00:00
27d9bc556e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-07 08:40:51 +00:00
1816c9d1b2
Merge "[OneSearch] Log events with timestamp into logcat for debugging." into sc-v2-dev am: 137dd35d26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15975400
Change-Id: I59676fdf7a8ee0bbeda31f1e7ac691ef0275a161
2021-10-07 08:29:59 +00:00
137dd35d26
Merge "[OneSearch] Log events with timestamp into logcat for debugging." into sc-v2-dev
2021-10-07 08:03:57 +00:00
a08e806e25
Move back to end of screen on keyguard
...
* Animate it back into position after user unlocks
* Re-create taskbar on layout direction change so
PropertyHolders are recreated to take into account
new values
Fixes: 199852418
Test: Tested w/ password + pin for gesture + 3 button
Change-Id: Ie7f16f737a8fc12328c05d7628d0e3ae09fc08ca
2021-10-06 18:09:15 -07:00
f11ecb7f59
[OneSearch] Log events with timestamp into logcat for debugging.
...
Bug: 199289915
Test: example log: https://paste.googleplex.com/5741834610409472
Change-Id: I24b2e68b36cb897ae3e6ccc38cf0561d38af6751
2021-10-06 15:20:47 -07:00
ae17b47a45
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc2c034f706e3c7afda44aaa1f76bad6571b5066
2021-10-06 21:36:48 +00:00
513a60cdc2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I40d86c2f147e60939fd428ff277a63c7a75f0e3c
2021-10-06 21:35:04 +00:00
d39c46fa36
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30 2p: e4e6d8a852
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I29fd30cf15aa2fb31dfc76c38c74303374940a53
2021-10-06 21:33:57 +00:00
90f1a4e085
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: If745478a901821ee58e1598bebd3d0f7fbdd7333
2021-10-06 21:33:53 +00:00
7f19dccedc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: I6be47ca3cfb175423022626cad2d9073f50dee07
2021-10-06 21:33:52 +00:00
e4e6d8a852
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 39122b4f30
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15997482
Change-Id: Ib4163ec8bb18cbbabf55ea73870e1affda2cfa92
2021-10-06 21:33:52 +00:00
39122b4f30
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9179a69632df6353981c85d3b7613211f4b7ab78
2021-10-06 21:33:38 +00:00
3ec748654e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I86b517b1fa0abfc0f14c6ffc7edcd98c14552647
2021-10-06 21:31:18 +00:00
c310a6f930
Merge "Fix issues with starting new recents animation before previous onRecentsAnimationStart" into sc-v2-dev am: f9d2082cf3 am: cdb2df88bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15988588
Change-Id: I761d29cd74d833e259da29f422dd0bc9e144ff0c
2021-10-06 17:59:03 +00:00
cdb2df88bd
Merge "Fix issues with starting new recents animation before previous onRecentsAnimationStart" into sc-v2-dev am: f9d2082cf3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15988588
Change-Id: I2a2f4c65e2cfc2649d5c590e7aa855b79f1f4b28
2021-10-06 17:48:39 +00:00
f9d2082cf3
Merge "Fix issues with starting new recents animation before previous onRecentsAnimationStart" into sc-v2-dev
2021-10-06 17:36:45 +00:00
0e60eddf61
Merge "Remove workaround for unrotated gesture monitor (3/3)"
2021-10-06 17:18:05 +00:00
a85e762a62
Merge "Reset state after split launch animation finishes" into sc-v2-dev am: 6ab0d1e7be am: c8b7fef784
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15986152
Change-Id: I8e71fbbb5344205209065a5c94a215db4020ba2a
2021-10-06 01:24:27 +00:00
66ed0ff23e
Fix issues with starting new recents animation before previous onRecentsAnimationStart
...
- Fix logic for canceling animation for continued quick switch, so that this case (starting a new gesture before onRecentsAnimationStart() of the previous gesture) instead goes to the STATE_FINISH_WITH_NO_END flow.
- Update the end target so that we go to that state instead of always overview state if swipe was past the halfway threshold when we call endLauncherTransitionController(). This is specifically so we don't use OverviewInputConsumer on the second gesture, given the first one was canceled and didn't actually go to overview.
- GestureState#isRecentsAnimationRunning() now checks for STATE_RECENTS_ANIMATION_STARTED rather than _INITIALIZED, to be consistent with its javadoc and TaskAnimationManager#isRecentsAnimationRunning(). This also ensures we can correctly calculate continued quick switch (see above).
- Call cleanUpRecentsAnimation() before creating a new one in TaskAnimationManager. This ensures that the previous listener doesn't immediately cleanup the new gesture when it gets onRecentsAnimationCanceled() due to the new recents animation starting.
Test: swipe to home twice from the app, locally ignoring the onRecentsAnimationStart() from the first one, and ensure the second one responds normally
Bug: 193851085
Change-Id: I76e27c96b54293805546c0d6c82e77f975c69d7a
2021-10-05 18:14:51 -07:00
c8b7fef784
Merge "Reset state after split launch animation finishes" into sc-v2-dev am: 6ab0d1e7be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15986152
Change-Id: Iac00a062f0f3531fa1d59cb2e2ade6b17e7cb73c
2021-10-06 01:14:28 +00:00
6ab0d1e7be
Merge "Reset state after split launch animation finishes" into sc-v2-dev
2021-10-06 00:56:48 +00:00
565c5ed6e2
Merge "Add TAPL test that dismissing focused task causes next task to become focused." into sc-v2-dev am: 1bf753f7a6 am: e77cae7f0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15947750
Change-Id: I9c7cac5e73845ed4f08d2d518e661891188a0ce6
2021-10-06 00:45:44 +00:00
e77cae7f0d
Merge "Add TAPL test that dismissing focused task causes next task to become focused." into sc-v2-dev am: 1bf753f7a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15947750
Change-Id: Id67d2342b0715896faa6832e59116b6ea42fcf05
2021-10-06 00:26:54 +00:00
1bf753f7a6
Merge "Add TAPL test that dismissing focused task causes next task to become focused." into sc-v2-dev
2021-10-06 00:14:46 +00:00
1dab5fafb4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours am: 88eca11997 -s ours am: 5a52ae1edc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: I7f4a256aa95dc93898d77ffb606ee3db5134aac5
2021-10-05 23:40:17 +00:00
64be6a2e96
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours am: 5992971500 -s ours am: c99718ccac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: I075c9ee93e92033b0dada2372775d56fe90241ed
2021-10-05 23:39:08 +00:00
5a52ae1edc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours am: 88eca11997 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: I4a442bd2fb293063f802faf7a1fc12889e5d5454
2021-10-05 23:28:50 +00:00
c99718ccac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours am: 5992971500 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: Idbf1380cb4e9f45f11c66dce215439e967f87054
2021-10-05 23:28:14 +00:00
5992971500
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: I5ffa865b4a08fe755ea0036d9d8fce6c79baface
2021-10-05 23:14:11 +00:00
88eca11997
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: ae6e81587c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15976911
Change-Id: I0b5a4df2571878937bd5d72e5850d1489acdce4e
2021-10-05 23:14:08 +00:00
Vinit Nayak
Bill Yi
TreeHugger Robot
Becky Qiu
Tony Wickham