Commit Graph

48012 Commits

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

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

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

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

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

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

Change-Id: I0789f12f46cd89a19fe3589b9b17d9c487bb8158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:32:27 +00:00
Jerry Chang c27c7f935e Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: 31d9d7a825 am: 63cda6d5c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

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

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

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

Change-Id: I287455ffbccfc97f150319f095ba50c254296e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:12:21 +00:00
TreeHugger Robot 26970b25c6 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: I9c5560f1f5da8ae4d77317b6abae55a49befd3d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:58:57 +00:00
Jerry Chang 5072d4810d Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: 31d9d7a825 am: c329f6c715
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I1d5ad2f3e0ebc63ea522cf2f32b4839c96b5fe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:31:48 +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
Becky Qiu 5809ec4dfb Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev am: 9c21bc071d am: 63608f7821
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206587

Change-Id: Id5889e457d52a4b0b1308e71e10d0071c1a8490b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:27:34 +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
TreeHugger Robot 8d74d61845 Merge "Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode" into tm-dev am: 787c0e135b am: bc681eb527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230544

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

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

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

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

Change-Id: Ie994a54ea3bcf1147ee1d11d28144101370f8e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:56:16 +00:00
Vinit Nayak 81c6d794c1 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: I3f435f6b2a3c7f105035118cff4bb7cc24f19f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:50:52 +00:00
Jerry Chang 63cda6d5c1 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: 31d9d7a825
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I80f5e95e238478df0aef78eb506bc9d65c87f901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:50:22 +00:00
Becky Qiu 63608f7821 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: I6b09f7484164de9475758a562881557da832838c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 18:48:59 +00:00
Vinit Nayak 46d95995aa Merge "Extend recents button hitbox on tablet" into tm-dev 2022-05-09 18:46:01 +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 bc681eb527 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: Ie40301bee875d1a66f4b1b6a884cbb571422351f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:59:47 +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
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 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
Kholoud Mohamed d0090571ba Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev am: 0e2b622014 am: dbc0c75cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18029204

Change-Id: I4d7d6ce60e4b63144608b9b79c0dc08678bb63f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:56:52 +00:00
Kholoud Mohamed dbc0c75cd3 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: Ic9afe744e5f2c01742b4d1c733d18c2c86c9b081
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:29:28 +00:00
Jerry Chang c329f6c715 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: 31d9d7a825
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I7f35758f787b992f6b7567a2e5ffa9dd70fc971b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:22:23 +00: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
Jerry Chang 31d9d7a825 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: I0d0f7947fb77a542628dd60a242775cb2f9673dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:38:11 +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 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