Commit Graph

65347 Commits

Author SHA1 Message Date
Saumya Prakash bc14fdada6 Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07 am: 1c3ae1be0f am: 7ed3891d5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I176d18cbbfea897f1b7712a096ff0d02809d0111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:02:11 +00:00
Fengjiang Li 91d72daaa5 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299 am: 63144d9a29 am: c7613ebf17 am: b3a19abf31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: I7ba24e877a3677dc48bedef348d41d573aedf3fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 00:01:30 +00:00
Saumya Prakash ac3e434a8b Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07 am: ae2aab9217 am: 7690d00322
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I3e720dfccf68b9688e2658579aef586f35e37ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:59:47 +00:00
Saumya Prakash 7ed3891d5f Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07 am: 1c3ae1be0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I845729d04b128ee6dca4a85354076b1e9d5c4a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:59:02 +00:00
Ats Jenk b4351ef739 Merge "Show a persistent toast when selecting desktop apps on home screen" into udc-qpr-dev am: 7377639653 am: f20ce8405e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23298604

Change-Id: I942b9fd9ffdd0d468c3da2d52606e828cf81703a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:59:02 +00:00
Treehugger Robot c22b17fc53 Merge "Add seam space for performReorder in MultipageCellLayout" into udc-dev am: 7b01dbd811 am: 9fd6d425d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23086317

Change-Id: Ib1948a8bcaf477a6aaa927a093597e1950ca0e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:56:51 +00:00
Treehugger Robot 9fd6d425d2 Merge "Add seam space for performReorder in MultipageCellLayout" into udc-dev am: 7b01dbd811
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23086317

Change-Id: I737e1e0d6fa280b96ff8ae11f1e6c1bc131f7261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:40:14 +00:00
Hongwei Wang 74e8b85430 Merge "Notify WMShell on aborting auto-enter-pip" into udc-dev am: 0c66b151e3 am: 7db12f9b0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23321279

Change-Id: I86d52aa16055e9e474a0d31690358435fdc28558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:36:50 +00:00
Treehugger Robot 7b01dbd811 Merge "Add seam space for performReorder in MultipageCellLayout" into udc-dev 2023-05-18 23:20:40 +00:00
Fengjiang Li b3a19abf31 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299 am: 63144d9a29 am: c7613ebf17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: I3b50ff70c1b5fd8050c005eb50ae878dc0c9d70b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:19:19 +00:00
Saumya Prakash 7690d00322 Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07 am: ae2aab9217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I297608452156efc8a4e885e3b6a12414d9bc86ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:19:05 +00:00
Ats Jenk f20ce8405e Merge "Show a persistent toast when selecting desktop apps on home screen" into udc-qpr-dev am: 7377639653
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23298604

Change-Id: Id97cf7fe0e82ebddb11f2cdb1069580266d9cd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:18:10 +00:00
Randy Pfohl f6b3d88736 Merge "Updating overview colors to utilize new tokens" into udc-dev am: f6b74f1521 am: 2e15268102
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269307

Change-Id: Id5f78d9e469728444e7f5f1c509b3c83300c46ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:15:37 +00:00
Hongwei Wang 7db12f9b0b Merge "Notify WMShell on aborting auto-enter-pip" into udc-dev am: 0c66b151e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23321279

Change-Id: I2ee9286b1c6dc5112a867f368e1ae462b7e20abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:15:36 +00:00
Fengjiang Li 1f6c8c2be5 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299 am: bb74462bf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: I862932c5883d2d198c94cc5948cace893af40c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:15:27 +00:00
Saumya Prakash 4bac4d795f Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: e804404462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I8ec3b075c977ec20fa4ce7753d0479131bf88b00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:15:09 +00:00
Fengjiang Li c7613ebf17 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299 am: 63144d9a29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: I6f203417d5699fc57149dcc81ce465594fca4782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:46 +00:00
Fengjiang Li 63144d9a29 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: Iaa4e6bc87de4f08486ee28e8daf28b809778d01a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:24 +00:00
Randy Pfohl 2e15268102 Merge "Updating overview colors to utilize new tokens" into udc-dev am: f6b74f1521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23269307

Change-Id: Id1dc936bf7b6a1cb7876b1244fa35806b6b10e52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:17 +00:00
Fengjiang Li bb74462bf6 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev am: 0d07a85299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23254588

Change-Id: Ibfebb4e9fa8c9e75d868217ff16a886fd37613aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:14:04 +00:00
Saumya Prakash ae2aab9217 Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I31b599f7b1e3cd4a3ed6dc659ba9b3f5b258334b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:13:58 +00:00
Saumya Prakash 1c3ae1be0f Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b am: 1b12262d07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I1ca8d832d70362afd96feb02cdf51e22f1b8cfdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 23:11:45 +00:00
Hongwei Wang 0c66b151e3 Merge "Notify WMShell on aborting auto-enter-pip" into udc-dev 2023-05-18 23:00:03 +00:00
Randy Pfohl f6b74f1521 Merge "Updating overview colors to utilize new tokens" into udc-dev 2023-05-18 22:43:30 +00:00
Fengjiang Li 0d07a85299 Merge "Fix NPE of FolderPagedView#setFocusOnFirstChild" into udc-dev 2023-05-18 22:42:47 +00:00
Treehugger Robot cb11e2fd7f Merge "Add Location related Attributes." into udc-dev am: ead8d955b6 am: 069de9e4ca am: 178a1010bd am: c343d4ccc9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23271439

Change-Id: I632908addaf9a1b82d558255861e52799bf691bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:40:00 +00:00
Federico Baron 8b1ba0ed8f Merge "Update colors for edit state" into udc-dev am: 4b43200910 am: fa54d4e803 am: 5510bc339d am: 72e5933e8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23272389

Change-Id: I88b1e1fa0fa8bdae876ee48fdf9c319933de6033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:39:13 +00:00
Federico Baron 9b2cf70fbf Merge "Update colors for popup menus" into udc-dev am: 3eba77ca4b am: 7b9cb0b63c am: 1cd6f262ba am: a6fe7f4acb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23152777

Change-Id: I5437713747252b0ccd3ca83635fa2103a14f9e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:39:10 +00:00
Treehugger Robot 4ca6e28d6d Merge "Add Location related Attributes." into udc-dev am: ead8d955b6 am: edae4f5a2e am: d457fe63a8 am: c7c8d0be00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23271439

Change-Id: Id4e936b73dba1d3f2f66495cd322aaa077d50cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:37:45 +00:00
Federico Baron ea7cc2d75c Merge "Update colors for edit state" into udc-dev am: 4b43200910 am: 1690776a1d am: 9b843dcf4a am: daeb8d6528
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23272389

Change-Id: I83941c60bd9cbe4ecf242608f1a5c750e2e93815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:36:49 +00:00
Federico Baron 3c899953bf Merge "Update colors for popup menus" into udc-dev am: 3eba77ca4b am: 90edc421ff am: 1b944199e2 am: 5d4572b626
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23152777

Change-Id: I7b964e187546f81fc01170a41ad37c51ef0fa6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:36:47 +00:00
Saumya Prakash e804404462 Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: Ia0ead5d5594d7c524768c403ffbfefb5bb52e40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:26:54 +00:00
Saumya Prakash 1b12262d07 Merge changes If2c82082,I03532b80 into udc-dev am: 66e7ec721b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159151

Change-Id: I20b257f53dadcb5ea3da329beb955aafb9e5e18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:26:48 +00:00
Jagrut Desai a8bbb69d6a Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 0504597717 am: 5aae6e483d am: f04e98b172
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23288804

Change-Id: Ibea9673de493ca98c4bf7c6bed4a3f9e055690bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:26:21 +00:00
Ats Jenk 7377639653 Merge "Show a persistent toast when selecting desktop apps on home screen" into udc-qpr-dev 2023-05-18 22:24:26 +00:00
Treehugger Robot ea20f09909 Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 019348f017 am: 2ad37c01ec am: 5156815ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682

Change-Id: I73766a88ea615a483fd54a9a6837ac15ad95aa59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:10:10 +00:00
Treehugger Robot f17da1659e Merge "Add Location related Attributes." into udc-dev am: ead8d955b6 am: edae4f5a2e am: c16dadbf2f am: 418f9f736a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23271439

Change-Id: Ib53fbfd7a7f8b3c052985f71a582b865be876f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:09:50 +00:00
Jagrut Desai 6bbe387389 Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 9d642cbaec am: b80bb0587f am: 00674c5e04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23288804

Change-Id: Ie80c90d0d0a9a5ceece488a832611394e0ffe252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:08:56 +00:00
Federico Baron f4a0643649 Merge "Update colors for edit state" into udc-dev am: 4b43200910 am: 1690776a1d am: d1ef933569 am: 591975fe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23272389

Change-Id: I1ea6f5492c956e8863449457a8474e727b4a6e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:07:38 +00:00
Federico Baron 1fb6faeefe Merge "Update colors for popup menus" into udc-dev am: 3eba77ca4b am: 90edc421ff am: 8230b45cf5 am: 322f361d16
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23152777

Change-Id: Iadba820921611bb748e9c6439b1790cc0aaea924
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:07:36 +00:00
Jagrut Desai 4f04b5a642 Merge "Fix TaplTestsTaskbar" into udc-dev am: 20c26a4a6c am: 9d642cbaec am: 2949f11b2f am: 0c1509f3f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23288804

Change-Id: I5b54367dc1cab0f7a4ae4470a72c7c7baeeccab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:06:19 +00:00
Automerger Merge Worker a410ef154f Merge "Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 43f6b63317 am: 1967be3a1f" into udc-qpr-dev-plus-aosp am: 0a2744e261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682

Change-Id: I8812e4a458fc2d0c041523e32566347bb926e282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:04:59 +00:00
Treehugger Robot 60be4817e0 Merge "Fix widget clipping in widget back animation" into udc-dev am: 80e9a3b64e am: 43f6b63317 am: e15ad0087f am: 631ddfabc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23267682

Change-Id: I3ce18630ca55f6ddba06d290c01dd8dd3d0c253e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 22:02:53 +00:00
Saumya Prakash 66e7ec721b Merge changes If2c82082,I03532b80 into udc-dev
* changes:
  Update Lottie animations for gesture navigation tutorial to enable custom colors
  Update gesture tutorial colors
2023-05-18 22:01:49 +00:00
Treehugger Robot c343d4ccc9 Merge "Add Location related Attributes." into udc-dev am: ead8d955b6 am: 069de9e4ca am: 178a1010bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23271439

Change-Id: I68f92b3deca27e2978f52c4468c88043bfb47e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:48:04 +00:00
Federico Baron 72e5933e8d Merge "Update colors for edit state" into udc-dev am: 4b43200910 am: fa54d4e803 am: 5510bc339d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23272389

Change-Id: I42d2bdff51724e42d19834e86c0b8bda5bae33d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:47:51 +00:00
Federico Baron a6fe7f4acb Merge "Update colors for popup menus" into udc-dev am: 3eba77ca4b am: 7b9cb0b63c am: 1cd6f262ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23152777

Change-Id: I03870a753d13cdfbb17ec1d918ef4eac125c44ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:47:48 +00:00
Sebastian Franco 96c46e7fba Add seam space for performReorder in MultipageCellLayout
In the other method createAreaForResize we add 1 to the cellX
to account for the seam in the Multipace CellLayout but we don't
account for that on performReorder and we need to add a cellWidth

Also, some methods are not running when the seam is added so their
result are wrong. Now all methods are being accounted for.

Fix: 277709417
Test: atest ReorderAlgorithm
Test: atest MulticellReorderAlgorithm
Change-Id: I7a4ca55f7b9cd7cf94481c880fe152e0a3bb3cf3
2023-05-18 14:47:47 -07:00
Treehugger Robot c7c8d0be00 Merge "Add Location related Attributes." into udc-dev am: ead8d955b6 am: edae4f5a2e am: d457fe63a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23271439

Change-Id: I2a22c2c6d5fed5007489d16408a78d57de881f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:47:12 +00:00
Federico Baron daeb8d6528 Merge "Update colors for edit state" into udc-dev am: 4b43200910 am: 1690776a1d am: 9b843dcf4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23272389

Change-Id: I1726c2402482a51638566502d7990e69acc5514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 21:46:59 +00:00