Stefan Andonian
59d78bea68
Merge "Load home properly even if AllSetActivity fails Go To Home Swipe." into tm-qpr-dev am: d01497d714 am: 8e97128a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21048063
Change-Id: I172bb350e7ccb70ae60f17f4b579a8b0eb49a0ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 20:14:43 +00:00
Stefan Andonian
8e97128a7e
Merge "Load home properly even if AllSetActivity fails Go To Home Swipe." into tm-qpr-dev am: d01497d714
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21048063
Change-Id: Ia04f38a55b7ac76f895719878ea5cafc7e22e1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 19:25:27 +00:00
Stefan Andonian
d01497d714
Merge "Load home properly even if AllSetActivity fails Go To Home Swipe." into tm-qpr-dev
2023-01-27 18:49:48 +00:00
Sunny Goyal
1eedfdd8bc
Merge "Removing unnecessary abstraction of AdapterProvider"
2023-01-27 16:54:47 +00:00
Thales Lima
d16fc1aacf
[automerger skipped] Merge "Create attr for padding between icon and text in cells" into tm-qpr-dev am: 91b9de1fe2 am: e31106b036 -s ours
...
am skip reason: Merged-In I00af790d0c21c35f1cbce1362e63d3ab8259244a with SHA-1 903d0a3e63 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20980937
Change-Id: Ic8d4fca28c1b8cc30d92c35a021a64b47d71f037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 12:38:06 +00:00
Thales Lima
e31106b036
Merge "Create attr for padding between icon and text in cells" into tm-qpr-dev am: 91b9de1fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20980937
Change-Id: I28a303a6de429baa94325f911555a2271d4978ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 12:01:17 +00:00
Thales Lima
91b9de1fe2
Merge "Create attr for padding between icon and text in cells" into tm-qpr-dev
2023-01-27 10:23:30 +00:00
TreeHugger Robot
7569543c3d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 90c29267bb -s ours am: ed0330e124 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120286
Change-Id: Ic00451c08114bf2eace25a36639f5361faa1e3b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 08:25:28 +00:00
Bill Yi
9c3dfb1acf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 662a344f2d -s ours am: ba664f7006 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120286
Change-Id: I15ae33e3f03462bbb6eec745f3d7a25ced39fdd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 08:25:11 +00:00
TreeHugger Robot
ed0330e124
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 90c29267bb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120286
Change-Id: I2824822a443f23eb3096026866498117b4c8d41f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 07:48:42 +00:00
Bill Yi
ba664f7006
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 662a344f2d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120286
Change-Id: I30ba469b2e1d7045d4a5ac99b170665295216956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 07:48:22 +00:00
TreeHugger Robot
90c29267bb
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-27 06:57:46 +00:00
Sunny Goyal
24db190a13
Removing unnecessary abstraction of AdapterProvider
...
Bug: 266605714
Test: Presubmit
Change-Id: Ib5ccecc33e66e61cb27d083591c8fb7c13a96698
2023-01-27 06:28:37 +00:00
Holly Jiuyu Sun
4c94ad9f2d
Merge "Move ENABLE_HIDE_GBOARD_HEADER_STATIC from feature flag to server side flag." into tm-qpr-dev am: c3c77fc049 am: 5290dc4e64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21091031
Change-Id: Id6f0c79d89920fe44764185a772572fc5b0cd8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 00:07:55 +00:00
Holly Jiuyu Sun
5290dc4e64
Merge "Move ENABLE_HIDE_GBOARD_HEADER_STATIC from feature flag to server side flag." into tm-qpr-dev am: c3c77fc049
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21091031
Change-Id: I1ed496aa625ec1551a5392b0dd0fdf5c7e3fea9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 23:42:30 +00:00
Holly Jiuyu Sun
c3c77fc049
Merge "Move ENABLE_HIDE_GBOARD_HEADER_STATIC from feature flag to server side flag." into tm-qpr-dev
2023-01-26 23:24:21 +00:00
Stefan Andonian
1342862d07
Merge "Add null check for NPE in FolderIcon." into tm-qpr-dev am: 734c4530ed am: 47bb02a553
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21035445
Change-Id: Ie44d2ececf4e2aeeb0f7075afee88d36063175ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 23:07:19 +00:00
Bill Yi
662a344f2d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic19440ac86d08fdd7365b7894ed83c5bd7d95034
2023-01-26 14:58:51 -08:00
Thales Lima
d852d65693
Create attr for padding between icon and text in cells
...
Bug: 265210314
Test: DeviceProfileDumpTest
Change-Id: I00af790d0c21c35f1cbce1362e63d3ab8259244a
Merged-In: I00af790d0c21c35f1cbce1362e63d3ab8259244a
2023-01-26 22:50:18 +00:00
Stefan Andonian
47bb02a553
Merge "Add null check for NPE in FolderIcon." into tm-qpr-dev am: 734c4530ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21035445
Change-Id: If0ea4bd85145b773605f95619de6570a0f5b53a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 22:22:33 +00:00
Thales Lima
4cbc76a803
Merge "Create attr for padding between icon and text in cells"
2023-01-26 22:10:28 +00:00
Stefan Andonian
713517ee65
Load home properly even if AllSetActivity fails Go To Home Swipe.
...
If the user swipes to go home before the Launcher can startup properly,
the user will be stuck on a black screen after swiping up to go home
after reaching the AllSet page after completing the setup wizard. This
change forces the device to go home if the go to home swipe is going to
fail (aka if the Launcher hasn't finished initializing).
Bug: 261901912
Test: Manually verified the device doesn't get stuck like before. UX is
not perfect since the Launcher still needs to load for a few hundred
milliseconds, but the user doesn't get stuck on a black screen.
Change-Id: I8590e7ec1e341ba17db853900de7186284b07e93
2023-01-26 22:03:15 +00:00
Bryce Lee
fbd31e3759
[automerger skipped] Merge "Do not allow system gestures when dreaming." into tm-qpr-dev am: 3a0e420e6f am: 29953016ac -s ours
...
am skip reason: Merged-In If58608c1e491da7906a2615681da0514fa49cfc8 with SHA-1 31e90481d1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20968629
Change-Id: Ic4205644341e71dd57d383e12f6d46962e6af178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 21:44:30 +00:00
Jason Mylen
13e9d3a68c
Merge "Remove competing long haptic when user long presses on widget." into tm-qpr-dev am: 112067efea am: 531b65a51b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20441481
Change-Id: I6b16def04eabe602cae75c6548be55cb63216242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 21:44:12 +00:00
Stefan Andonian
734c4530ed
Merge "Add null check for NPE in FolderIcon." into tm-qpr-dev
2023-01-26 21:32:44 +00:00
Bryce Lee
29953016ac
Merge "Do not allow system gestures when dreaming." into tm-qpr-dev am: 3a0e420e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20968629
Change-Id: I1b74df97bd786656d308519248ba416c542ed88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 21:27:02 +00:00
Jason Mylen
531b65a51b
Merge "Remove competing long haptic when user long presses on widget." into tm-qpr-dev am: 112067efea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20441481
Change-Id: Ibc7f5d92eeb98d9e948bce9718bc34be25b166b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 21:23:41 +00:00
Bryce Lee
3a0e420e6f
Merge "Do not allow system gestures when dreaming." into tm-qpr-dev
2023-01-26 21:08:59 +00:00
Jason Mylen
112067efea
Merge "Remove competing long haptic when user long presses on widget." into tm-qpr-dev
2023-01-26 21:08:50 +00:00
Thales Lima
903d0a3e63
Create attr for padding between icon and text in cells
...
Bug: 265210314
Test: DeviceProfileDumpTest
Change-Id: I00af790d0c21c35f1cbce1362e63d3ab8259244a
(cherry picked from commit 60cab75576e9f844fcaae8f0723a075f2a00bb1f)
Merged-In: I00af790d0c21c35f1cbce1362e63d3ab8259244a
2023-01-26 15:40:27 +00:00
Brandon Dayauon
c0f68d56dd
Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev am: 5809508f25 am: a36f89aa8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21077875
Change-Id: I5e8adb842d3acfa437f73557013cc06c357bac40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 15:25:48 +00:00
Azhara Assanova
fc7e84a101
Merge "Add a no-op flag to mutable implicit PendingIntents"
2023-01-26 10:38:36 +00:00
Anushree Ganjam
8a8de08d5b
Merge "Add logging attribute for VIDEO and SYSTEM_POINTER result type." into tm-qpr-dev am: 8653f1484c am: d8693d7b8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21049743
Change-Id: Ieef510d8891497f4f123ab4be4a65e062943ea4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-26 01:37:02 +00:00
Brandon Dayauon
a36f89aa8d
Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev am: 5809508f25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21077875
Change-Id: Id5b1ef6fbe75a596d9aee1a53a39f83621172cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 23:24:05 +00:00
Anushree Ganjam
d8693d7b8f
Merge "Add logging attribute for VIDEO and SYSTEM_POINTER result type." into tm-qpr-dev am: 8653f1484c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21049743
Change-Id: Ic84bb765e4066442ae54eeba3d23413b102c7b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 23:23:42 +00:00
Brandon Dayauon
5809508f25
Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev
2023-01-25 21:38:17 +00:00
Jason Mylen
4f2d04bafe
Remove competing long haptic when user long presses on widget.
...
Before this change removing the competing long press haptic,long
pressing to drag the widget causes a doubleclickesque haptic because
of the first haptic being quickly cancelled.
Bug: 257531349
Test: manual
Change-Id: I320339725f5ba27a22e550c28838adda94384c0f
2023-01-25 21:26:15 +00:00
Anushree Ganjam
8653f1484c
Merge "Add logging attribute for VIDEO and SYSTEM_POINTER result type." into tm-qpr-dev
2023-01-25 21:25:24 +00:00
Andy Wickham
ab83443fe8
Merge "Fix header padding when search not enabled." into tm-qpr-dev am: 62ef7ba819 am: 8f7b86df53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074687
Change-Id: Ib49fa131add5b09a127c13b5e7915983c7cec9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 20:54:52 +00:00
Andy Wickham
8f7b86df53
Merge "Fix header padding when search not enabled." into tm-qpr-dev am: 62ef7ba819
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21074687
Change-Id: Ib4b17d0ae5e3d7fe796e334526800950365260e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 20:08:42 +00:00
Andy Wickham
62ef7ba819
Merge "Fix header padding when search not enabled." into tm-qpr-dev
2023-01-25 19:10:09 +00:00
Holly Sun
6a62176621
Move ENABLE_HIDE_GBOARD_HEADER_STATIC from feature flag to server side flag.
...
Bug: 266708932
Test: manual with adb command
Change-Id: Id064367ee970120cf0aa668b9c81613f7262bad8
2023-01-25 10:12:38 -08:00
Bryce Lee
05c9d551d8
Do not allow system gestures when dreaming.
...
Currently, TaskBar expansion is allowed when an activity context is
available. Since Dreams are implemented as an activity, this leads
to being able to expand the TaskBar over a dream. This changelist
updates the logic to not allow system gestures when dreaming.
Test: manual
Bug: 265755700
Change-Id: If58608c1e491da7906a2615681da0514fa49cfc8
Merged-In: If58608c1e491da7906a2615681da0514fa49cfc8
2023-01-25 17:15:18 +00:00
Azhara Assanova
bf0e65a6e9
Add a no-op flag to mutable implicit PendingIntents
...
Starting from target SDK U, we will block creation of mutable
PendingIntents with implicit Intents because attackers can mutate the
Intent object within and launch altered behavior on behalf of victim
apps. For more details on the vulnerability, see go/pendingintent-rca.
From a quick analysis, we concluded that the intents passed into
getPendingIntent() can be both explicit and implicit, so we added
a no-op FLAG_ALLOW_UNSAFE_IMPLICIT_INTENT to bypass the above block of
mutable implicit PendingIntents.
The flag is introduced in ag/21018466.
Bug: 236704164
Bug: 229362273
Test: TH passes
Change-Id: Ia26c8f92d1b4b50e04bc6b487619f54efc7d5a1d
2023-01-25 15:39:35 +00:00
Sunny Goyal
49fcae002c
Merge "Merging unnecessary subclass of ActivityAllAppsContainerView" into tm-qpr-dev am: dbc5e56e07 am: 10c6b3642a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21087423
Change-Id: Idc426b3c9ae0585860402133de8542cb615bc790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 08:27:39 +00:00
Tracy Zhou
fc47142fbe
Merge "Revert "Swipe-up from the bar area on the home screen should pull up overview""
2023-01-25 07:59:10 +00:00
Tracy Zhou
16938d35a9
Revert "Swipe-up from the bar area on the home screen should pull up overview"
...
This reverts commit c5985751c4 .
Reason for revert: Confirmed with Manasi that we don't want to have a different behavior for the trackpad gesture even if it starts from the task bar area. It should be treated the same.
Change-Id: I5817c477968545e452d7600d43825209e2c75c37
2023-01-25 07:58:45 +00:00
Sunny Goyal
10c6b3642a
Merge "Merging unnecessary subclass of ActivityAllAppsContainerView" into tm-qpr-dev am: dbc5e56e07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21087423
Change-Id: I5dc1727e262b19b99770c000f0f927680b41f051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 07:42:05 +00:00
Fengjiang Li
41d2aa4db3
Merge "Predictive back: widget to all apps" into tm-qpr-dev am: e73db2a011 am: c5a715f531
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20968630
Change-Id: I06791cb598cb1be27a285ae98812650fe3ceffec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 06:46:16 +00:00
Sunny Goyal
dbc5e56e07
Merge "Merging unnecessary subclass of ActivityAllAppsContainerView" into tm-qpr-dev
2023-01-25 06:37:15 +00:00