Commit Graph

13960 Commits

Author SHA1 Message Date
Treehugger Robot e77beeec48 Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05 am: d693b1406a am: 2b22bb33ff am: 98c9b74c7d am: c2e38c6f70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489

Change-Id: I3968d7ee0573e3579f4d40f4baefcfecdbc23600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 14:39:28 +00:00
Treehugger Robot c2e38c6f70 Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05 am: d693b1406a am: 2b22bb33ff am: 98c9b74c7d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489

Change-Id: I836623f2723d10437fde126ab18cb32f707247b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 14:04:55 +00:00
Treehugger Robot 98c9b74c7d Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05 am: d693b1406a am: 2b22bb33ff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489

Change-Id: Id655da41ef37252c060ff7722966e0fc4e06b4d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 13:26:38 +00:00
Treehugger Robot 2b22bb33ff Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05 am: d693b1406a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489

Change-Id: Iff1c7f7e931932e3da697b8057cbc57fc8c78aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 12:51:22 +00:00
Treehugger Robot d693b1406a Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" am: 78e1964a05
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2361489

Change-Id: Ifc0ab83af62d3672da6221635b75a333de2b9965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 12:17:49 +00:00
Treehugger Robot 78e1964a05 Merge "Fix NPE in FallbackSwipeHandler when getRunningTask() returns null" 2023-03-02 11:48:10 +00:00
Stefan Andonian 268fe6df16 Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev am: 86d8db485f am: b341f31fc7 am: 894a19af1a am: 667c016d0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391179

Change-Id: Ib794baaa164b1fff07404034639ac0cdb446b7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 09:16:18 +00:00
Stefan Andonian a749d14a75 Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev am: 86d8db485f am: b341f31fc7 am: 894a19af1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391179

Change-Id: Ib4ee98bcc9d3ed52e8f4e489e16f95fd7c996abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:44:02 +00:00
Stefan Andonian 667c016d0d Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev am: 86d8db485f am: b341f31fc7 am: 894a19af1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391179

Change-Id: I1665185227b87771d3a4520b8285fe51705d6e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:43:55 +00:00
Stefan Andonian 894a19af1a Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev am: 86d8db485f am: b341f31fc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391179

Change-Id: I1774961a28e66aefedec2261002d7b2c2b7c3974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 08:06:26 +00:00
Stefan Andonian b341f31fc7 Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev am: 86d8db485f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20391179

Change-Id: I41b2afd3616f2f8fb92e6b9a1bb31359e0d4e258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 07:30:52 +00:00
Stefan Andonian 86d8db485f Merge "Preload expensive objects before user is unlocked." into tm-qpr-dev 2023-03-02 07:06:54 +00:00
Jeremy Sim ee5b6ef011 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b am: 0027186ea2 am: 86e4f02035 am: 44d6130b52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: I8f5b59f9f252563df99b55f9be509450cdb5199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:22:01 +00:00
Jeremy Sim 44d6130b52 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b am: 0027186ea2 am: 86e4f02035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: I43569676c1afd155b90b0278e10a2dc05fc71ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:49:49 +00:00
Jeremy Sim 8f64b7ed53 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b am: 0027186ea2 am: 86e4f02035
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: Ibe04cd503db85b49af040106e3a8cc639cc1b109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:48:48 +00:00
Jeremy Sim 86e4f02035 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b am: 0027186ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: Ic90db4ff687565109c3644cede0f7c50f9f66f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:10:00 +00:00
Jeremy Sim 0027186ea2 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: Ibec09110f5b5829d4412a7081e3ef4645dec6c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 03:34:59 +00:00
Jeremy Sim 24b1890c4b Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev 2023-03-02 02:47:46 +00:00
Tony Wickham 976c93b0f7 Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev am: a8b120bc7e am: 921db64ba1 am: ed1b7d31ef am: b18886f646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21654877

Change-Id: I820866c59f5e0da3d61f55757267122e001e741c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 00:11:51 +00:00
Tony Wickham 303f9f4ff1 Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev am: a8b120bc7e am: 921db64ba1 am: ed1b7d31ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21654877

Change-Id: Ie02726a21c6dcdf8a81683a5db688656c9ca3ecc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:32:57 +00:00
Tony Wickham b18886f646 Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev am: a8b120bc7e am: 921db64ba1 am: ed1b7d31ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21654877

Change-Id: I48b9870e3263d457542948290640b474ac9ce45c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:31:27 +00:00
Stefan Andonian 5bd9a225a8 Preload expensive objects before user is unlocked.
This change includes migrating data required for starting the launcher
from encrypted storage into device protected storage. All of the data
being moved has already been approved by the correct authorities.

Bug: 251502424
Test: Performed latency testing using logs from user unlock until first
workspace screen loaded.

Change-Id: I58b0cd1c7bad260c2252f9e172ef85ab885c7fe9
2023-03-01 23:09:07 +00:00
Tony Wickham ed1b7d31ef Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev am: a8b120bc7e am: 921db64ba1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21654877

Change-Id: I7abf3d5a2db3ed58ceca23f0f600f25b2f015807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:56:41 +00:00
Fengjiang Li 26fa07270d Merge "[Predictive Back] Turn on feature for udc" into udc-dev am: 0785970ae6 am: 90f1dfeaee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21618259

Change-Id: Ib51eedaa3404e4fa274a4feed20d645d38c201e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:23:42 +00:00
Tony Wickham 921db64ba1 Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev am: a8b120bc7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21654877

Change-Id: Idf78f029f4865947a0a88d9825d52cae947e4fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:19:39 +00:00
Jeremy Sim df6fa34518 Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e am: baa93c42cb am: a768b4547a am: 2c1f9da0ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: I35e8fcf309cff1755d42fd1c5da593fa59e99188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 22:19:30 +00:00
Tony Wickham a8b120bc7e Merge "Only recreate taskbar for uiMode theme changes" into tm-qpr-dev 2023-03-01 21:29:16 +00:00
Fengjiang Li c041de07a6 Merge "[Predictive Back] Turn on feature for udc" into udc-dev am: 0785970ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21618259

Change-Id: Ifce87f56ea86f9c5a8712701826653eadefc813f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 21:27:59 +00:00
Fengjiang Li 90f1dfeaee Merge "[Predictive Back] Turn on feature for udc" into udc-dev am: 0785970ae6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21618259

Change-Id: I479587d3952a45888c366f5c9ca4e566a3257b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 21:25:44 +00:00
Jeremy Sim 21cf0c323c Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e am: baa93c42cb am: a768b4547a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: I84cbecdbc404eea4f0bc5576897d20cd635c7c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 21:25:42 +00:00
Jeremy Sim 2c1f9da0ef Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e am: baa93c42cb am: a768b4547a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: Iab0e7491176ead67ff1c8204b42bf2d3d3cb0dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 21:23:18 +00:00
Fengjiang Li 0785970ae6 Merge "[Predictive Back] Turn on feature for udc" into udc-dev 2023-03-01 20:56:53 +00:00
Jeremy Sim a768b4547a Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e am: baa93c42cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: Ie29b70f4b5bcc3ad6d045be0a6cdd08866aaef5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 20:42:25 +00:00
Bill Yi bcdce40376 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 19:59:33 +00:00
Alex Chau ac3d580214 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6 am: a1907c710e am: cbab01c721 am: bf03a207a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: I6f63fc31b64016a03e8666f85a45ca604510266a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:49:52 +00:00
Alex Chau e13fa5f565 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6 am: a1907c710e am: cbab01c721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: I00c6cb0332b80c3956a94660f0e9beefa6b2058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:37:14 +00:00
Jeremy Sim baa93c42cb Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: I321507bda3f22ad4aa228a9a15235e576cdf703a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:35:02 +00:00
Alex Chau bf03a207a1 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6 am: a1907c710e am: cbab01c721
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: Ia6fdd2efb1d75e0286402e2ae03b80b745c7fb71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 19:04:52 +00:00
Jeremy Sim e35d112693 Fix bug with Taskbar not differentiating between user profiles
This patch fixes a bug where Taskbar would not differentiate between user profiles when selecting an app to launch from Overview.

The bug occurred because findLastActiveTaskAndRunCallback(), which checks for already-running tasks when launching an app from the Taskbar, only checks for a ComponentName match and not a userId match.

Fixed by making the findLastActiveTaskAndRunCallback() also check for a userId match.

Fixes: 270456926
Test: Manual
Change-Id: I43ff06083a5dce775fdbd0b0ed951beaae34c0ab
2023-03-01 10:57:41 -08:00
Jeremy Sim a49569a90e Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev 2023-03-01 18:53:00 +00:00
Fengjiang Li f533ff350c [Predictive Back] Turn on feature for udc
Add feature flag and turn it on for U

Test: manual
Bug: b/264920023
Change-Id: I43d9c04b13b91ce0b0e53402a5c3b2f0e81272ff
2023-03-01 18:41:32 +00:00
Alex Chau cbab01c721 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6 am: a1907c710e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: Ibf2a35e5d54d2938a00cb251ddb71656f6308207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 18:19:32 +00:00
Bill Yi 439b339a19 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-03-01 18:12:37 +00:00
Alex Chau a1907c710e Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: I47517820ce6448ac3b123ac1044ef07ccc60308b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 17:43:43 +00:00
Jordan Demeulenaere b7395e0541 Format files with the upcoming version of ktfmt am: be82bc661c am: 652ec4997a am: 51132f7f86 am: 08ada855b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: I4ab31e9b33a327c77fdcab165c88a31b4de9aae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 17:27:45 +00:00
Alex Chau 6a10a003d6 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev 2023-03-01 17:13:35 +00:00
Jordan Demeulenaere ca3667a7d3 Format files with the upcoming version of ktfmt am: be82bc661c am: 652ec4997a am: 51132f7f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: I0cef9c993d03e67e5fb8e7d40069db7f0ebbab7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 16:56:20 +00:00
Jordan Demeulenaere 08ada855b0 Format files with the upcoming version of ktfmt am: be82bc661c am: 652ec4997a am: 51132f7f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: Ic123880ee18de0b4a724aaf5f5000a1c1b43c0ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 16:33:49 +00:00
Jordan Demeulenaere 51132f7f86 Format files with the upcoming version of ktfmt am: be82bc661c am: 652ec4997a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: I06342a9bb4b91dd00196b76dec1dd2daaf4ee2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 15:55:10 +00:00
Jordan Demeulenaere 652ec4997a Format files with the upcoming version of ktfmt am: be82bc661c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: Icd28fd41925b49d0f8c4318365a244e3fa43f637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:22:07 +00:00