Jonathan Miranda
7e8b2742c9
resolve merge conflicts of 11bf817e86 to sc-v2-dev
...
Bug: 190210234
Bug: 190164147
Test: manual
Change-Id: I155ee7efdbda10c05f87001ac4eaf07017a6d456
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f
2021-06-14 20:32:58 +00:00
Evan Rosky
a14bead20c
Merge "Finish wrapped launcher animations if impl is gone" into sc-v2-dev am: 1f804199c4 am: e11433eadf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940361
Change-Id: Ia559d56fea522cd0b8f5ee3b3e1c7e0541021c6e
2021-06-14 20:28:25 +00:00
Jonathan Miranda
32a0ea3115
Merge "Folder polish - update color extraction, fix contrast issues." into sc-dev am: 11bf817e86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947919
Change-Id: Ia139619babc97811414f7fdcb71c4de0d70b2812
2021-06-14 20:28:10 +00:00
Jonathan Miranda
5fff945c93
Merge "Folder polish - update color extraction, fix contrast issues." into sc-dev am: 11bf817e86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947919
Change-Id: I737b9c0aa6b191916ec3f8fd33a9dd08d26abd2a
2021-06-14 20:28:08 +00:00
Jonathan Miranda
11bf817e86
Merge "Folder polish - update color extraction, fix contrast issues." into sc-dev
2021-06-14 20:11:50 +00:00
Evan Rosky
e11433eadf
Merge "Finish wrapped launcher animations if impl is gone" into sc-v2-dev am: 1f804199c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940361
Change-Id: I58ebfb3ad4523c870e72e9a72a630e9e66213040
2021-06-14 20:11:34 +00:00
Samuel Fufa
1a70ca9109
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b am: b3c3d3e52c am: c7d297cc10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I9fe0e8b9aa98286651506bd5cbd185e0dbe224dc
2021-06-14 20:07:25 +00:00
TreeHugger Robot
b69daaa9a9
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: bf039a9e9c am: cefb13ca30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I9c2551a3a8b3a9db5a785d8cda75a07f4b147a17
2021-06-14 20:07:01 +00:00
Samuel Fufa
3716688be9
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b am: b2d6d73377 am: b1ef1e54c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I302d3a60e39dc36801d4e9fc91b862d9ff68278f
2021-06-14 20:06:48 +00:00
TreeHugger Robot
c004fb8581
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: 38e3dbe38e am: daef8063b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I55a83f6e1ef877739ec23ae5d2248a2cdab66b76
2021-06-14 20:06:03 +00:00
Evan Rosky
1f804199c4
Merge "Finish wrapped launcher animations if impl is gone" into sc-v2-dev
2021-06-14 19:58:13 +00:00
Samuel Fufa
c7d297cc10
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b am: b3c3d3e52c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: Ib54e54aabb59d4d98991d5f5ec2135d57fe017f6
2021-06-14 19:47:26 +00:00
TreeHugger Robot
cefb13ca30
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: bf039a9e9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I6c056a1e5f5ed53e1d8de378f109b6b5dc8fcfd8
2021-06-14 19:47:02 +00:00
Samuel Fufa
b1ef1e54c3
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b am: b2d6d73377
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I7c3208011fbc9e6d777972f0c9c22ed142f0d472
2021-06-14 19:46:42 +00:00
Samuel Fufa
3d9c82ea39
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b am: 4fa492d464
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I29aff65b278786401a0116bd377ff4f74d3b6faa
2021-06-14 19:46:40 +00:00
TreeHugger Robot
daef8063b4
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: 38e3dbe38e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: Id3b745f6409dde02c066f389bd259a9417097495
2021-06-14 19:46:30 +00:00
TreeHugger Robot
d6786d5759
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: 16ed829a41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I0937e16e3174590eea2db0e7eff5b543341eab10
2021-06-14 19:46:23 +00:00
Samuel Fufa
b2d6d73377
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I144ebf38fab282417389a51f0b95d47001482d79
2021-06-14 19:34:04 +00:00
TreeHugger Robot
38e3dbe38e
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I881785a2a1e96aebbd10e148e9f46cda3cee603d
2021-06-14 19:33:41 +00:00
Samuel Fufa
b3c3d3e52c
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: Ifd42cebbe63464879500a6a40b3fec33559404c3
2021-06-14 19:33:12 +00:00
Samuel Fufa
4fa492d464
Merge "Introduce inline education for work profile" into sc-dev am: b8b822a74b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14962825
Change-Id: I61203ef9fbd16ca91721689ea4db03b1b6bfaabc
2021-06-14 19:33:03 +00:00
TreeHugger Robot
bf039a9e9c
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: Ied7af84fe1a5aab837ecc242f9a3ea2d8613d0dd
2021-06-14 19:32:57 +00:00
TreeHugger Robot
16ed829a41
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14949019
Change-Id: I24c63caf42844b01b91e74d29bf180ed0a887865
2021-06-14 19:32:49 +00:00
Samuel Fufa
b8b822a74b
Merge "Introduce inline education for work profile" into sc-dev
2021-06-14 19:29:28 +00:00
Jon Spivack
8c0298c767
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: 7b57deb534 am: ba97ec4156
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: Ia1e59b733cccdf76c58404345d19c81c0ce708b2
2021-06-14 19:17:45 +00:00
TreeHugger Robot
012e978e31
Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev
2021-06-14 19:16:47 +00:00
Jon Spivack
c4fc195b1a
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: 7122e96640 am: a0e6c277c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: I7c80b9d8334942effc170619adc1a24105d79214
2021-06-14 19:01:52 +00:00
Jonathan Miranda
d0ee97ed9e
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 6830915008 am: 33c9db6864
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I9e8206df8211936965578ea8ed5545c81948b80c
2021-06-14 19:01:44 +00:00
Jonathan Miranda
0b47ea2939
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 1bfcb7653b am: 7efb95d289
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I1cab8390fe36d91d6e49832dbff380117e3e125d
2021-06-14 19:01:37 +00:00
Samuel Fufa
d85735db47
Update all apps divider to pill shape
...
Screenshot: https://screenshot.googleplex.com/4AJFL7MjJuZr7tf
Bug: 188946089
Test: local
Change-Id: If45512b24caefc66725892ab8429afd3d9ce20c8
2021-06-14 13:37:52 -05:00
Jon Spivack
f5d637d098
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: adb1e11d74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: I22eee774fbbdd1584e1008d58c504cc74e30ffc6
2021-06-14 18:37:04 +00:00
Jon Spivack
ba97ec4156
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: 7b57deb534
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: I6fe3dbebf9c0f94078af39d7bc43c83a8b3057c5
2021-06-14 18:35:51 +00:00
Jon Spivack
a0e6c277c7
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180 am: 7122e96640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: If2908fe7cb0793e870d7b9ffe2a76b6cf8f712db
2021-06-14 18:25:02 +00:00
Jonathan Miranda
33c9db6864
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 6830915008
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I38f06f2450a1de908f2d1dd797b412f0b64e2c0d
2021-06-14 18:24:52 +00:00
Jon Spivack
7b57deb534
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: I9f11bc98ec704e6eeb1e3c4ce278e92aadc5765f
2021-06-14 18:23:45 +00:00
Jon Spivack
adb1e11d74
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: Iebc9fa87b39f213453503305fdc075a6c093db6b
2021-06-14 18:22:54 +00:00
Jon Spivack
7122e96640
Merge "Send NIU Actions Intents to default Assistant" into sc-dev am: 3e48c63180
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14940621
Change-Id: I6ecc08c16c11b277b628b71b2056146a202e2f8b
2021-06-14 18:22:51 +00:00
Jonathan Miranda
7efb95d289
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 1bfcb7653b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I6a635b2ed5e34dac2e5e2b290678cd0b0365c9ad
2021-06-14 18:19:27 +00:00
Jon Spivack
3e48c63180
Merge "Send NIU Actions Intents to default Assistant" into sc-dev
2021-06-14 18:13:34 +00:00
Jonathan Miranda
4f62faca20
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529 am: 9dadfa4183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I94636e49f32568161f5a608ef3f1da3eadb7a026
2021-06-14 18:09:59 +00:00
Jonathan Miranda
1bfcb7653b
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: I9e60082c8f451edfb4254f99114d268272047627
2021-06-14 18:00:25 +00:00
Jon Miranda
5688010306
Folder polish - update color extraction, fix contrast issues.
...
- Also fixes open/close animation when items were not getting clipped
due to folder not being measured yet.
Bug: 190210234
Bug: 190164147
Test: manual
Change-Id: I230c33d7e4e1871d8d702737c56c79ce46504b8f
Merged-In: I230c33d7e4e1871d8d702737c56c79ce46504b8f
2021-06-14 17:54:19 +00:00
Jonathan Miranda
9dadfa4183
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: If07593c0a967a5f8359f2b5ab3ae716fe59dbc16
2021-06-14 17:54:07 +00:00
Jonathan Miranda
6830915008
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev am: b7cab26529
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14947923
Change-Id: Ie662a3709bbdbbc3e9310254b08c60f40e7cc113
2021-06-14 17:53:51 +00:00
TreeHugger Robot
913e99bf25
Merge "Folder polish - update color extraction, fix contrast issues."
2021-06-14 17:42:30 +00:00
Jonathan Miranda
b7cab26529
Merge "Do not add padding left/right when cell layout border spacing exists." into sc-dev
2021-06-14 17:29:19 +00:00
Winson Chung
fa88493cc5
[automerger skipped] Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74 -s ours am: 99cbbc60b5 -s ours am: d05a311b61 -s ours
...
am skip reason: Merged-In I2057467d5146be6edc382d3745a1e5269cd76a6b with SHA-1 c5d50f710a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941832
Change-Id: I241ee99f26d996f0ce432aa298e250cdb923fa43
2021-06-14 17:14:29 +00:00
Winson Chung
b3fb7110c7
[automerger skipped] Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74 am: 600f360666 -s ours am: 70e1711098 -s ours
...
am skip reason: Merged-In I2057467d5146be6edc382d3745a1e5269cd76a6b with SHA-1 c5d50f710a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941832
Change-Id: I7a89a562c24f981d46553f2bf389ad13713d33e5
2021-06-14 17:14:06 +00:00
Winson Chung
d05a311b61
[automerger skipped] Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74 -s ours am: 99cbbc60b5 -s ours
...
am skip reason: Merged-In I2057467d5146be6edc382d3745a1e5269cd76a6b with SHA-1 c5d50f710a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941832
Change-Id: Ic11fec2b2df26614cc4bfb3e9eb2bce61182d352
2021-06-14 17:10:23 +00:00
Winson Chung
d7a41f21f7
[automerger skipped] Merge "Skip entering PIP when dismissing auto-enter pip task" into sc-dev am: 9f5ba22d74 am: 1b6a66d491 -s ours
...
am skip reason: Merged-In I2057467d5146be6edc382d3745a1e5269cd76a6b with SHA-1 8e0bb9a12f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14941832
Change-Id: Ie3fc492427821aebf0e9e264ce99b69cd9b59d86
2021-06-14 17:09:11 +00:00