Kholoud Mohamed
b1bc2b5847
Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548
Change-Id: I8a3e7971f919dc4136ed5dbd8c6d6f6dde676bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:25:37 +00:00
Sunny Goyal
409a8b7639
Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805
Change-Id: Ib849c2b924afed251380d25bc31ee05a45b34421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:24:44 +00:00
Sunny Goyal
ef6ed6b68e
Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341 am: d58c7e5d6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355
Change-Id: I8a6caf4ef78bb9d6e1399847d53f0a3927d75072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:24:41 +00:00
Bill Yi
c2ff895e93
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cf58cdf4ed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18216901
Change-Id: Ida3ffddbf847337c7edaf27fa1c4cb79cd61f7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:22:56 +00:00
Bill Yi
5b6cc0b592
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3536421d1d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18216901
Change-Id: If77dc96f74037848361342cb2bfd76ae6001221d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:22:43 +00:00
Kholoud Mohamed
3a929f44ae
Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548
Change-Id: Ic7edfbb75e125aaa599689e90862e28e91f49dc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:23:55 +00:00
Sunny Goyal
3b88baeaac
Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805
Change-Id: If3a5ed5e768751d3fd4c4df8f2347845f0151949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:23:45 +00:00
Sunny Goyal
d58c7e5d6b
Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355
Change-Id: I88202b90b1729340f6316e5516401a713bc1b29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:23:42 +00:00
Bill Yi
cf58cdf4ed
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-10 13:58:01 +00:00
Kholoud Mohamed
b8e9cbcc65
Merge "Add missing enterprise string" into tm-dev
2022-05-10 09:54:13 +00:00
Sunny Goyal
32457641f0
Merge "Adding feature to automatically show keyboard in all-apps" into tm-dev am: 7869000544 am: a0fbd4ddd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206142
Change-Id: Ia2c0d3b56ed107cfb72a3a5b47a63e1696168b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 03:41:44 +00:00
Sunny Goyal
b0416cc478
Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev
...
* changes:
Revert "Fix hotseat width to span a number of columns"
Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations."
2022-05-09 23:14:38 +00:00
Sunny Goyal
a0fbd4ddd4
Merge "Adding feature to automatically show keyboard in all-apps" into tm-dev am: 7869000544
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206142
Change-Id: Ia13660468d25c113b6d87a3e3ba54d1c90bd822b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 22:29:24 +00:00
Sunny Goyal
7869000544
Merge "Adding feature to automatically show keyboard in all-apps" into tm-dev
2022-05-09 21:50:48 +00:00
TreeHugger Robot
31934c0422
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0a18365a7c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18217524
Change-Id: I11d4e41c67ecafca82ecb219468a03935610554b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:44:41 +00:00
Bill Yi
742b3e625e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0fcb04c1a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18217524
Change-Id: I105df3f208c85a93e5bec55bf8cf6507e0a999f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 20:44:36 +00:00
TreeHugger Robot
3051beac34
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-09 20:36:53 +00:00
TreeHugger Robot
0a18365a7c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-09 20:36:27 +00:00
TreeHugger Robot
62f752c25a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-05-09 20:34:53 +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
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
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
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
TreeHugger Robot
8d5c3e91cf
Merge "Remove long press on home button for kids mode." into tm-dev
2022-05-09 19:22:11 +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
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
Becky Qiu
9c21bc071d
Merge "[Toast] Fix the NPE in isPersonalTab()." into tm-dev
2022-05-09 18:24:49 +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
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
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
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
Bill Yi
0fcb04c1a1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7f9e3707b09452fd688a505554871d836c02b973
2022-05-08 17:47:44 +00:00
Bill Yi
41c62117b7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4b1b7365779c609748cf8d4268e17a77e411da02
2022-05-08 17:47:05 +00:00
Bill Yi
3536421d1d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idaab73d947e0284d981847659b2ec2daa5c83f3c
2022-05-08 17:44:29 +00:00