Commit Graph

50094 Commits

Author SHA1 Message Date
TreeHugger Robot 6ad150d8a0 Merge "Remove long press on home button for kids mode." into tm-dev am: 8d5c3e91cf am: f6ccde8079
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230546

Change-Id: I68a99489ca0d9dfe3c14fd8198ee625c01e702e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 22:17:43 +00:00
Vinit Nayak bb22b0994f Merge "Extend recents button hitbox on tablet" into tm-dev am: 46d95995aa am: e50b15862e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17958719

Change-Id: I14bfce27e1e9255b24c7b43293bc20f7b6833638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 22:01:08 +00:00
Alex Chau 184843271b Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0 am: e59d4352ba am: 75f6c62657
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I341527441c3f38ce7e7d577010ee1763281cf93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:31:59 +00:00
Alex Chau 93e72351ab Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0 am: 86c6d714ef am: 1f0a5cc7fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: Ic863f70e08bc1fea6f609ac9a8f7729b66b36b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:18:41 +00:00
Alex Chau f84c3a963f Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: ec20f0042d am: 40cc7a8fb5 am: 0b7b50ec9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I65a5b2fe2dfcb7593f0483690af16d72be59a023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 21:07:30 +00:00
TreeHugger Robot f6ccde8079 Merge "Remove long press on home button for kids mode." into tm-dev am: 8d5c3e91cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230546

Change-Id: I102b872ee1f2221c3f79f0411d26417ad5154f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:41:43 +00:00
Vinit Nayak e50b15862e Merge "Extend recents button hitbox on tablet" into tm-dev am: 46d95995aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17958719

Change-Id: I9324a2e43b21fc60faa4a274e10d034b7f3cfbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:30:06 +00:00
Becky Qiu d7f27aceac Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev am: 9c21bc071d am: 2108afe1b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206587

Change-Id: I1baf42adb58aa5d6f8d2711ace059c5fa3903ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:18:24 +00:00
Alex Chau 75f6c62657 Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0 am: e59d4352ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I1c9f03af774ea7d18d0d625e6c5ac4096fbccad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:30:12 +00:00
TreeHugger Robot 8d5c3e91cf Merge "Remove long press on home button for kids mode." into tm-dev 2022-05-09 19:22:11 +00:00
Becky Qiu 2108afe1b7 Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev am: 9c21bc071d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206587

Change-Id: Iba38e5b700b2c8dd93a43d1392d692be1d1da872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:18:38 +00:00
Vinit Nayak 46d95995aa Merge "Extend recents button hitbox on tablet" into tm-dev 2022-05-09 18:46:01 +00:00
TreeHugger Robot 6c321687b5 Merge "Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode" into tm-dev am: 787c0e135b am: d82e1c0e60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230544

Change-Id: I7a51f6c296d3d15d43bdb8ad7b96504a51b6daa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:36:16 +00:00
Kholoud Mohamed 7d78bf7597 Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev am: 0e2b622014 am: f5746ccc08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18029204

Change-Id: Ib578ecbd02483cf39aa8a25b24ac727c1ddf348e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:30:04 +00:00
Becky Qiu 9c21bc071d Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev 2022-05-09 18:24:49 +00:00
Alex Chau e59d4352ba Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I061b2c5db386f5bf3ea84ffe1022a5c12eaf50a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:22:29 +00:00
Alex Chau 1f0a5cc7fc Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0 am: 86c6d714ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I988c9dcab79a96220791c982ee473c70f918cfba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:04:20 +00:00
TreeHugger Robot d82e1c0e60 Merge "Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode" into tm-dev am: 787c0e135b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230544

Change-Id: I6de91eb4b3c6b366679dd3ccafdceba4dbb22d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:55:00 +00:00
Jerry Chang 804d2c1b90 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: 6da7320840
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I1f9e66ebf5d07cfb75c7da1f6ab821c4ba1fc76f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:54:43 +00:00
Kholoud Mohamed f5746ccc08 Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev am: 0e2b622014
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18029204

Change-Id: I497e102289ec08e913c2bbdec505131e3edb4f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:42:04 +00:00
Alex Chau 0b7b50ec9d Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: ec20f0042d am: 40cc7a8fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I1ba865d255a2ce3bae86c28ff11898635e560236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:32:27 +00:00
TreeHugger Robot 787c0e135b Merge "Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode" into tm-dev 2022-05-09 17:25:36 +00:00
Jerry Chang 6da7320840 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I9ac293f3a2fc917e2c8dc070819ef5e7acefd392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:04:34 +00:00
Becky Qiu f0fd3d8e2e [Toast] Fix the NPE in isPersonalTab().
Don't set mUsingTab until replaceRVContainer is done.

Bug: 224882720
Test: manual
Change-Id: I9ebec067d06df5e890ffe3c90d49f1de51b3b981
2022-05-09 09:57:29 -07:00
Alex Chau fc332aba0d Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 55aa28a750
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I523c492ab7476c66a7c216542f976767858d887b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:25:13 +00:00
Alex Chau 40cc7a8fb5 Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: ec20f0042d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I6f3537eedacae65154a3ffc2ca18533e95b8c4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:20:51 +00:00
Pat Manning 52bb52aeb4 Remove long press on home button for kids mode.
Fix: 229961238
Test: manual
Change-Id: Idb50d4e142b1d1b0539a71b7a727d00dc76c6a68
2022-05-09 16:57:33 +01:00
Alex Chau ec20f0042d Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: Ie2075d31b6042795066cdeacf85aee12d379240f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:18:38 +00:00
Alex Chau 86c6d714ef Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04 am: 85403363b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: Ie1e47381e84267bc10cfdc99683d328684196687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:13:59 +00:00
Kholoud Mohamed 0e2b622014 Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev 2022-05-09 14:57:40 +00:00
Alex Chau 55aa28a750 Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I89ad509440f7aca09a81d246d4fede3e2c3a8b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:45:30 +00:00
Alex Chau 85403363b0 Merge "Sort hotseat items in migration to preserve position" into tm-dev am: d9b6543a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18185509

Change-Id: I52e194d02284f619df1a9617078282c6690bb07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:19:59 +00:00
Alex Chau 8a47d5f955 Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode
- Avoid doLogGesture for app->overview in 3 button mode

Bug: 219686410
Test: app -> overveiw in 3 button mode and gesture mode
Change-Id: I5e65f9182be0388abfc9b07d5f08c96a3334b7b5
2022-05-09 14:54:10 +01:00
Jerry Chang 384b521dd5 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev 2022-05-09 10:57:02 +00:00
Alex Chau d9b6543a04 Merge "Sort hotseat items in migration to preserve position" into tm-dev 2022-05-09 10:35:49 +00:00
kholoud mohamed d5a4d60483 update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED
Also updated work folder name provider to retrieve it from dpm

Bug: 218322904
Test: manual
Change-Id: Id80a9e90806f3a07f132b5cc1e9871bb35df42b0
2022-05-09 10:01:10 +01:00
Automerger Merge Worker 02d1e0d6f4 Merge "Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c" into tm-d1-dev-plus-aosp am: 52c3d5bc44 am: e6ea1e2374
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: Iaa80d0798233606f4908db9d9230e9c34cc841fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 17:19:00 +00:00
TreeHugger Robot 37e57611a3 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 am: 01dcde8ebd am: 760646396d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I8c254bba928557c40a6ae2858b78a792fff7c02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 17:18:51 +00:00
TreeHugger Robot 67ed0e42f9 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 am: 891694abd4 am: 01d3eb5408
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I87839a6b5a8ddcd5ca88f1de55314cc4e1f4d917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 17:18:43 +00:00
Automerger Merge Worker e6ea1e2374 Merge "Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c" into tm-d1-dev-plus-aosp am: 52c3d5bc44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I0670876ae61f07a51a5329d987e73aedfde2f930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:50:56 +00:00
TreeHugger Robot 760646396d Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 am: 01dcde8ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I53009594e7c9bbb16feeb64f7a84b57ded6ad49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:50:47 +00:00
TreeHugger Robot 01d3eb5408 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21 am: 891694abd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I1e9022ea7cecadb2fcc1e0939c55555c424cd1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:50:30 +00:00
Automerger Merge Worker 52c3d5bc44 Merge "Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c" into tm-d1-dev-plus-aosp 2022-05-07 16:26:48 +00:00
TreeHugger Robot 01dcde8ebd Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: Ibd230253f0c2fcdd4a2ed2eeb9244b5d6b9742ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:26:45 +00:00
TreeHugger Robot fdddd1d1da Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 20843ba58c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: Ic5da654747214c7bb1a356244f967ec1784392ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:26:45 +00:00
TreeHugger Robot 891694abd4 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 0d37d70e21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: Ibaf38b0610fdd6101c88bcfca2c23548aa9fb0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:26:44 +00:00
TreeHugger Robot aebd373465 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c am: 235de12d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: If264111747c6bde581e4fe7f017af984a791d89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:26:18 +00:00
TreeHugger Robot 0d37d70e21 Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I907e703da6706a669a7dd0a15d988a798b1db116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:11:07 +00:00
TreeHugger Robot 235de12d1f Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I2ee45d9697d0f7a794de4bc6e643e538b0319d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:10:10 +00:00
TreeHugger Robot 20843ba58c Merge "Finish mIconAlignmentForLauncherState animation before animating to new value" into tm-dev am: 062d96721c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18198384

Change-Id: I677de2b816e2a32777aa0adf71653684581882e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-07 16:09:49 +00:00