PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,530 Commits 1 Branch 0 Tags
eed2c3fc67fbbfeb944934af4602ff632dfd8535
Commit Graph

29530 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li eed2c3fc67 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours 
am skip reason: Merged-In I5e4b540f169d365c60cf4461e19cda24009f325d with SHA-1 eac11b669d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1741538

Change-Id: Ie632fbf17c1938e781d817df57f1c250d8663df0
 2021-06-21 06:10:17 +00:00
Xin Li e01e5dda78 Merge "DO NOT MERGE - Merge RQ3A.210605.005" 2021-06-21 05:49:03 +00:00
Xin Li 3a8cfeb758 DO NOT MERGE - Merge RQ3A.210605.005 
Bug: 190855093
Merged-In: I5e4b540f169d365c60cf4461e19cda24009f325d
Change-Id: I4d9186b9aa48c437e27bbb0fa22f5e4e7111fef5
 2021-06-18 12:24:35 -07:00
Xin Li eac11b669d DO NOT MERGE - Mark RQ3A.210410.001 as merged 
Bug: 190855093
Merged-In: Ia3f31c621d052d2304c2840b6f4d29eb655317cd
Change-Id: I5e4b540f169d365c60cf4461e19cda24009f325d
 2021-06-17 22:43:29 -07:00
Xin Li 657d475163 DO NOT MERGE - Merge ab/7272582 
Bug: 190855093
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
Change-Id: Ia3f31c621d052d2304c2840b6f4d29eb655317cd
 2021-06-17 21:57:50 +00:00
Treehugger Robot be0414dae4 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: de6e32489a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1691588

Change-Id: I78e87ea29397db108c5d9eba675fba243d5dbeb1
 2021-04-30 03:04:29 +00:00
Treehugger Robot de6e32489a Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" 2021-04-30 02:33:36 +00:00
Bob Badour 382a0b6c50 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3 
Added SPDX-license-identifier-Apache-2.0 to:
  tests/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Id17ab22cf50eabf01ead54016aab0da1c4451d3f
 2021-04-29 17:50:38 -07:00
Treehugger Robot 63f08c2050 [automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: 4043d2492a -s ours 
am skip reason: skip tag Change-Id Iea957fe3cfc434246acfe19eb7917fbe22079cde with SHA-1 936c340405 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1684659

Change-Id: Ic3a8574e076a631b240be5713a8a3ecbd9e6b44b
 2021-04-26 20:49:35 +00:00
Treehugger Robot 4043d2492a Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" 2021-04-26 20:22:36 +00:00
Bob Badour 49627a106c [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3 
Added SPDX-license-identifier-Apache-2.0 to:
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9fa653fdb81e4561c679548eca736039eee1dcd4
Merged-in: Iea957fe3cfc434246acfe19eb7917fbe22079cde
 2021-04-26 19:34:42 +00:00
Treehugger Robot 0790236e6f Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" am: 7bfb0b242b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1682067

Change-Id: I7c1221619427bc38b86f8ee6530279ecbbc4d5ad
 2021-04-21 19:01:39 +00:00
Treehugger Robot 7bfb0b242b Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3" 2021-04-21 18:21:21 +00:00
Treehugger Robot 1b3d656a39 Merge "Adding new team members working on the launcher" am: 99d4712ddb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1682435

Change-Id: I737d72d3d40325d042dd1b3d29b4e2e03022726c
 2021-04-21 17:01:41 +00:00
Treehugger Robot 99d4712ddb Merge "Adding new team members working on the launcher" 2021-04-21 16:36:01 +00:00
Alex Chau e74ea9ec9a Adding new team members working on the launcher 
Test: N/A
Change-Id: I446f3f1ed651bdd2b6ccd22a05d99ab39709262d
 2021-04-21 15:49:47 +01:00
Bob Badour 936c340405 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Launcher3 
Added SPDX-license-identifier-Apache-2.0 to:
  tests/dummy_app/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Iea957fe3cfc434246acfe19eb7917fbe22079cde
 2021-04-20 14:02:30 -07:00
Treehugger Robot a3410d3947 Merge "Modifying screenshot button visibility" am: 3e6c445003 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1461822

Change-Id: I1cb194403e2e8c8927367c8d6f103dde64bf2621
 2021-04-19 03:21:22 +00:00
Treehugger Robot 3e6c445003 Merge "Modifying screenshot button visibility" 2021-04-19 02:58:56 +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 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
android-build-team Robot 2121a1b209 Snap for 7269201 from a538ffe2a4 to rvc-qpr3-release 
Change-Id: If859efaaab8aae2518d6e0344ebbeca4335e2213
 2021-04-08 22:05:42 +00: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