Bill Yi
f3be85267e
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: f78b6ea226 -s ours am: 53673dd2ca -s ours
...
am skip reason: skip tag Change-Id Ic4c3cfbde42e2318988c073662c95863bb13f27d with SHA-1 85e48c8295 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1674068
Change-Id: Ied013374c954ac7b5f0b80a9ddb3f2d1c7f5814e
2021-04-14 06:31:22 +00:00
Bill Yi
53673dd2ca
[automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: f78b6ea226 -s ours
...
am skip reason: skip tag Change-Id Ic4c3cfbde42e2318988c073662c95863bb13f27d with SHA-1 85e48c8295 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1674068
Change-Id: I9d30bc7141188c03808a38b57898b62dced2a716
2021-04-14 05:46:19 +00:00
Bill Yi
f78b6ea226
Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE"
2021-04-14 04:59:51 +00:00
Bill Yi
756c47bc96
Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE
...
Merged-In: Ic4c3cfbde42e2318988c073662c95863bb13f27d
Merged-In: I53baf5ade2bf8c2a7c6b1edf852b4f397778c03c
Change-Id: Ifa33c0999fd7fb5d72eb2ffea18662c6d22a4cd1
2021-04-13 19:29:21 -07:00
Bill Yi
d63fa49285
[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 85e48c8295 -s ours
...
am skip reason: skip tag Change-Id I31f76112edeb770bc3b9c017f6205392dbe3f5a8 with SHA-1 5dd7e72e1d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14173988
Change-Id: I53baf5ade2bf8c2a7c6b1edf852b4f397778c03c
2021-04-14 00:31:11 +00:00
Bill Yi
85e48c8295
Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I31f76112edeb770bc3b9c017f6205392dbe3f5a8
Change-Id: Ic4c3cfbde42e2318988c073662c95863bb13f27d
2021-04-12 09:28:12 -07:00
Alex Johnston
5dd7e72e1d
resolve merge conflicts of 8786016e85 to rvc-qpr-dev am: a538ffe2a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694
Change-Id: I31f76112edeb770bc3b9c017f6205392dbe3f5a8
2021-04-08 12:46:10 +00:00
Alex Johnston
a538ffe2a4
resolve merge conflicts of 8786016e85 to rvc-qpr-dev
...
Bug: 168802517
Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
2021-04-07 18:01:43 +00:00
Alex Johnston
8786016e85
Block recent work profile apps content capture
...
Stop data exposure of work profile by blocking
content capture of recents apps when the work
profile is locked.
Manual testing steps
* Set up work profile
* Set personal and work pattern
* Open work app, enter work pattern and
verify content capture is possible
* Lock device
* Go to Recents and select already opened
work app. Verify content capture is not
possible until work pattern is entered.
Bug: 168802517
Test: manual testing
Change-Id: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
2021-03-29 18:12:00 +00:00
Rajeev Kumar
ee9a99a6a8
Merge "Add OWNERS to Launcher3/go" am: 278edf2938 am: dc71c0178a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1653167
Change-Id: Id3e60d2015fc099461d8ac18767bb909b75d3165
2021-03-25 16:03:04 +00:00
Rajeev Kumar
dc71c0178a
Merge "Add OWNERS to Launcher3/go" am: 278edf2938
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1653167
Change-Id: I313a119d7e67f142d04e254e57d1cabcefc60921
2021-03-25 15:24:57 +00:00
Rajeev Kumar
278edf2938
Merge "Add OWNERS to Launcher3/go"
2021-03-25 14:50:06 +00:00
Jon Spivack
177cff38fa
Add OWNERS to Launcher3/go
...
The code in this directory only impacts the Go Launcher variants, so it would make sense for the owners to be from the Go team.
Bug: 183627385
Test: N/A
Change-Id: Iab09be2d590d25bce6de07048befa2e832a54623
2021-03-24 11:47:54 -07:00
Treehugger Robot
536bcdbb15
Merge "Adding alinazaidi@ in Launcher3's OWNERS" am: 0d3a2d99c8 am: e50fba1654
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1626524
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7362df47744092f599e64d15315ee0732530fb97
2021-03-11 14:04:27 +00:00
Treehugger Robot
e50fba1654
Merge "Adding alinazaidi@ in Launcher3's OWNERS" am: 0d3a2d99c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1626524
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1b1ff23f998fdd98001995a172d11a3026e75743
2021-03-11 13:29:18 +00:00
Treehugger Robot
0d3a2d99c8
Merge "Adding alinazaidi@ in Launcher3's OWNERS"
2021-03-11 12:56:14 +00:00
Treehugger Robot
bb008f6187
Merge "Adding new team members working on the launcher" am: e5584cb882 am: 8dfa6bd01f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1626521
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I77f092eb2d5900db7c1b4ff634427fc62f99e2fb
2021-03-11 10:24:35 +00:00
Treehugger Robot
8dfa6bd01f
Merge "Adding new team members working on the launcher" am: e5584cb882
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1626521
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6728c7d9db6e4d287f1a9e9afc37c0846dac02e
2021-03-11 10:04:41 +00:00
Pierre Barbier de Reuille
dd2bed8a93
Adding alinazaidi@ in Launcher3's OWNERS
...
For some reason, I was unable to do it with others in the CL.
Test: N/A
Change-Id: I02596028dd15e1fdbe255b954bd39f4c3bb005e2
2021-03-11 09:45:51 +00:00
Treehugger Robot
e5584cb882
Merge "Adding new team members working on the launcher"
2021-03-11 09:34:58 +00:00
Pierre Barbier de Reuille
ae5d23d120
Adding new team members working on the launcher
...
Test: N/A
Change-Id: I21dcf7fa78522826ae78db9cf8bdd72f8c8a6eca
2021-03-10 22:08:24 +00:00
Xin Li
f053b13529
[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09b5 -s ours am: 3aa15f3f6b -s ours
...
am skip reason: Change-Id Icc96bfa8a3d59a19194a154baeaffaea1281af0a with SHA-1 3be35ec269 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1613681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib6f3a42ec8a6ddddb8572ea391431c0833b66b39
2021-03-03 23:36:59 +00:00
Xin Li
3aa15f3f6b
[automerger skipped] Merge "Merge RQ2A.210305.007" am: b1826d09b5 -s ours
...
am skip reason: Change-Id Icc96bfa8a3d59a19194a154baeaffaea1281af0a with SHA-1 3be35ec269 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1613681
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6a0fb0f0fb011feaab78b67e08cc3c6d29cc3d71
2021-03-03 22:28:30 +00:00
Xin Li
b1826d09b5
Merge "Merge RQ2A.210305.007"
2021-03-03 21:41:29 +00:00
Xin Li
66ff39e1bc
Merge RQ2A.210305.007
...
Bug: 180401296
Merged-In: Icc96bfa8a3d59a19194a154baeaffaea1281af0a
Change-Id: I399d98f43a2799fbdada6e73afe450edcba6eec7
2021-03-03 09:12:18 -08:00
Bob Badour
8824a5cd61
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: 541d0855ac am: 3be35ec269
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1587746
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21ee4a4ccd42b0bdbc3e20121b5d53c9067e8cf2
2021-02-24 22:58:35 +00:00
Bob Badour
3be35ec269
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: 541d0855ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1587746
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc96bfa8a3d59a19194a154baeaffaea1281af0a
2021-02-24 22:25:46 +00:00
Bob Badour
541d0855ac
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3"
2021-02-24 19:19:03 +00:00
Xin Li
6b965bbd7f
[automerger skipped] Merge ab/7061308 into stage. am: d7927e46dc -s ours
...
am skip reason: Change-Id Ib590035a7b3f124b2a767279623d51bc8c0dbd18 with SHA-1 dc0b212582 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13658527
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7c95710f428c920c0c43d7cea1429224b86c63cc
2021-02-23 09:05:04 +00:00
Bob Badour
4bdf380625
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3
...
Added SPDX-license-identifier-Apache-2.0 to:
Android.bp
Android.mk
robolectric_tests/Android.mk
tests/Android.mk
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ia348bba8ca075e87070ff8a605ca79ffcbea9982
Merged-in: Ia348bba8ca075e87070ff8a605ca79ffcbea9982
2021-02-21 20:34:37 -08:00
Xin Li
d7927e46dc
Merge ab/7061308 into stage.
...
Bug: 180401296
Merged-In: Ib590035a7b3f124b2a767279623d51bc8c0dbd18
Change-Id: I5cf1081160fac6f8450261bf8af9d118db2cf194
2021-02-21 09:25:10 -08:00
android-build-team Robot
95c362d5a0
Merge cherrypicks of [13532551, 13532552, 13534990, 13533561, 13533870, 13533871, 13534991, 13533562, 13532553, 13533872, 13534992, 13532554, 13535065, 13535085, 13535105, 13535125, 13535126, 13535106, 13535107, 13535086] into rvc-qpr2-release
...
Change-Id: I02773d2c5a849e00c0f12d4a807c24b5eaebedcf
2021-02-09 20:20:24 +00:00
Tracy Zhou
1283f546de
Fix missing grid for devices that upgrade from R
...
Fixes: 178435615
Test: TODO
Change-Id: I9894b88485daf5b641b4674a5abff05e0f53138b
(cherry picked from commit a62e49b365 )
2021-02-09 20:19:29 +00:00
Ice Chang
e8cc8d5398
Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-qpr-dev-plus-aosp
2021-02-01 03:31:11 +00:00
Tracy Zhou
3977aa6014
Fix missing grid for devices that upgrade from R am: a62e49b365
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13420191
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id968c2fe398e1ff8ce8425804c0f7e20fdfd1b28
2021-01-28 03:11:28 +00:00
Tracy Zhou
a62e49b365
Fix missing grid for devices that upgrade from R
...
Fixes: 178435615
Test: TODO
Change-Id: I9894b88485daf5b641b4674a5abff05e0f53138b
2021-01-27 22:21:24 +00:00
Jon Miranda
25178c55b2
Fix bug where dragview gets stuck on screen. am: b453ef7621
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13407365
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I636aef61403f44fd27898d74d2b857fd14f9ffc2
2021-01-26 18:41:40 +00:00
Jon Miranda
b453ef7621
Fix bug where dragview gets stuck on screen.
...
* Since the BubbleTextViews views do not have a listener, the long press
was still getting triggered even though it was in a pressed state.
* We only trigger long press if the view is not pressed or if there is no listener.
* A listener is only added for widgets, and for long press wiidgets are not
pressed state.
Bug: 162636845
Test: manual test, repo steps in bug
Change-Id: Ia9df12cf31a0844403d69ddacebf2bdbc5c59d3b
(cherry picked from commit 6fa63473e1 )
2021-01-26 15:35:35 +00:00
linalex
0646238ab4
[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java
...
Bug: 153276032
Test: TF_GLOBAL_CONFIG=/google/src/cloud/<ldap>/<workspace>/google3/wireless/android/test_tools/forrest/configs/local-host-config.xml \
pts-tradefed run commandAndExit cuj/<testname> \
--primary-abi-only \
--log-level verbose --log-level-display verbose \
--wifi-network GoogleGuest
Change-Id: Ib1cbc609f47a547f173e8170f00af9e8bdfa77bb
(cherry picked from commit 8492c67639 )
2021-01-26 04:58:49 +00:00
Tony Wickham
f677930374
Separate TaskView translationX into dismiss + offset translations am: 5662a653da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13370324
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60d9f219eed57dfab08d815ecf6ba834b546e4df
2021-01-20 01:52:26 +00:00
Tony Wickham
5662a653da
Separate TaskView translationX into dismiss + offset translations
...
- Previously, these both setTranslationX() directly, meaning one
could clobber the other. Now they are set independently and
aggregated to setTranslationX().
- For fake landscape, we actually are setting translationY, so
had to create both translationX and translationY properties, and
set the appropriate one via the current orientation handler's
"primary" dimension.
Fixes: 176766821
Change-Id: I204f039331dd43bbbf87bf6a2249238daf4d9877
2021-01-19 23:00:45 +00:00
Ice Chang
e40fbd6568
[automerger skipped] Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-dev am: 57874e6b39 -s ours am: a449c9323e -s ours am: e832389844 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12793279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9facd3f45c531cd0ea6ffa3d3a012c85038cc9ed
2021-01-06 06:10:27 +00:00
Ice Chang
e832389844
[automerger skipped] Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-dev am: 57874e6b39 -s ours am: a449c9323e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12793279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I316539c39e01a3dda16ab2eba90a05e3529d1e83
2021-01-06 05:36:20 +00:00
Ice Chang
a449c9323e
[automerger skipped] Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-dev am: 57874e6b39 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12793279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3eeabee22f4b278eb079424059eed871c8fd5f39
2021-01-06 05:18:53 +00:00
Ice Chang
57874e6b39
Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-dev
2021-01-06 04:59:03 +00:00
Ice Chang
0033c3aa6e
[automerger skipped] Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-qpr-dev am: 86a07cf7c3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12947940
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3efe59e78bc7fd5e2d4214360aaefb0eabca53b2
2021-01-06 03:14:44 +00:00
Ice Chang
86a07cf7c3
Merge "[DO NOT MERGE ANYWHERE] Add swipes left method in Background.java" into rvc-qpr-dev
2021-01-06 02:30:22 +00:00
android-build-team Robot
6c9849a0e8
Snap for 7025657 from 980c089d2f to rvc-qpr2-release
...
Change-Id: I51306b58d8fe57bb04c4d01fec956ffe1589048a
2020-12-11 00:08:01 +00:00
Xin Li
dc0b212582
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 053a3415fe -s ours am: 49665ae5f9 -s ours
...
am skip reason: Change-Id I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa with SHA-1 ecb18a6573 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1521195
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib590035a7b3f124b2a767279623d51bc8c0dbd18
2020-12-10 03:46:46 +00:00
Sunny Goyal
05d2ab3f68
[DO NOT MERGE] Keeping Launcher in overview UI if activity is restarting am: 980c089d2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13192821
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id2a3c6c21c3c00464fa0384d5f78943cbbbe8e97
2020-12-10 03:35:50 +00:00