Commit Graph

60459 Commits

Author SHA1 Message Date
TreeHugger Robot edce86a981 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: Ib7df81ed53d6e44f1cb28de31c0f2fe9596fe329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:27:40 +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
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
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
Vinit Nayak 24188370b1 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: I7390cc065c10d678254732c2875798d496ddb06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:14:03 +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
Becky Qiu c804b86141 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: Ib5a0ef8e101b689ebcfb14869afd8466630ad5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:09:44 +00:00
TreeHugger Robot b31d19a82d Merge "Avoid logging LAUNCHER_OVERVIEW_GESTURE in 3 button mode" into tm-dev am: 787c0e135b am: a6b13b0771
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230544

Change-Id: Ic47f0013d08216da1af4abdb5984b4cf58ff3741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 20:05:05 +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
Kholoud Mohamed 8c45ff129f Merge "update enterprise strings on ACTION_DEVICE_POLICY_RESOURCE_UPDATED" into tm-dev am: 0e2b622014 am: 112b144d37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18029204

Change-Id: Ib121a2411beeee52d15b3bc1085916556dbe8267
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:48:43 +00:00
Sunny Goyal 89a89d63a4 Revert "Fix hotseat width to span a number of columns"
Revert submission 17983445-hotseat_span

Reason for revert: b/231283023
Reverted Changes:
Ice4e37929:Fix hotseat width to span a number of columns
I9ed508490:Fix hotseat width to span a number of columns

Change-Id: Iabf67c5efd8155131a0c8a88192ddd671a43747b
2022-05-09 19:32:07 +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
Sunny Goyal 3e8a04b341 Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations."
This reverts commit b45d6c421d.

Reason for revert: b/231283023

Change-Id: Ic4941ea9ecd382348aae8e099e5a7ebf4ed0bba3
2022-05-09 19:31:45 +00:00
Jerry Chang c09a1b42e8 Merge "Support fade-in divider bar with quick switch gesture" into tm-dev am: 384b521dd5 am: ce22be9c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18160666

Change-Id: I16b96e91c99ed621c7a19b2df66a0898849661d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 19:31:25 +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
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
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
kholoud mohamed 00f80ed1ae Add missing enterprise string
Bug: 231592687
Test: manual
Change-Id: I59e4d899084c965dfbca49f6c65c3b9809a89ed8
2022-05-09 19:48:40 +01: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 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
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 a6b13b0771 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: I8fa89b1e24f45732024410ffba44ffd78c6edcd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:29:26 +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
Kholoud Mohamed 112b144d37 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: I07a44cde6224b6ce2f0403981feccf72c7daa0f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:17:47 +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
Jerry Chang ce22be9c0d 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: Ib6acd9394269ae14cd7de4fd7cd7de8378d5f593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:59:14 +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
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