Winson Chung
3ed9d508bd
Merge "Fix some small related to back button alpha" into sc-v2-dev am: 75867ae0ba am: 747dae3bb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16487030
Change-Id: I1392f9f16613ef9fb0add480260d9d5af3fbed16
2021-12-16 22:58:29 +00:00
Winson Chung
33f1d348ab
Temporarily disable SUW specific insets logic am: 361f82b237 am: 3b22691fe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16492581
Change-Id: I797fca3adbe2fdd95b0a59607f97b4d5273f1c37
2021-12-16 22:57:14 +00:00
Winson Chung
747dae3bb2
Merge "Fix some small related to back button alpha" into sc-v2-dev am: 75867ae0ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16487030
Change-Id: I419c0b0a2918f50d522da24c117fff8332bb3dd0
2021-12-16 22:16:34 +00:00
Winson Chung
3b22691fe2
Temporarily disable SUW specific insets logic am: 361f82b237
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16492581
Change-Id: Id2b28d4428f2ac518b158502123b596995006188
2021-12-16 22:16:21 +00:00
Winson Chung
75867ae0ba
Merge "Fix some small related to back button alpha" into sc-v2-dev
2021-12-16 21:59:27 +00:00
Colin Cross
f0ada36098
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -s ours am: d98610937f -s ours am: b310a85db7 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1925297
Change-Id: I78e21011d339383b18b6b8a2a54e01aabb893c1d
2021-12-16 21:17:27 +00:00
Colin Cross
b310a85db7
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -s ours am: d98610937f -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1925297
Change-Id: I8912495f0159a9ead2548f698f2b7a6897a53ade
2021-12-16 20:59:43 +00:00
Colin Cross
d98610937f
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours am: 0bd628d967 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1925297
Change-Id: I1344fd107d54b7eef3f773d63cf5691939e1887f
2021-12-16 20:43:51 +00:00
Colin Cross
0bd628d967
[automerger skipped] Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes"" am: 6faed50183 -s ours
...
am skip reason: Merged-In Ia2a677f3a3987751349bad951ff136b2d55f439f with SHA-1 e13ff2cb9a is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1925297
Change-Id: I28ae0a1341f26a50a74e1f26eaefe3628504a70b
2021-12-16 19:40:40 +00:00
Colin Cross
6faed50183
Merge "Revert "Temporarily disable Launcher3 tests affected by fling changes""
2021-12-16 19:26:17 +00:00
TreeHugger Robot
d791382c60
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-12-16 18:50:06 +00:00
Winson Chung
361f82b237
Temporarily disable SUW specific insets logic
...
Bug: 204384193
Test: Check that SUW is inset
Change-Id: Id00f10f51b52ef8ec375f650fd44bb2c6eb31e09
2021-12-16 18:45:25 +00:00
TreeHugger Robot
af3ac41de8
Merge "Fixing drawable cloning does not preserve badge"
2021-12-16 18:03:42 +00:00
Winson Chung
e62a1996b7
Fix some small related to back button alpha
...
- Skip updating nav button dark intensity if we're setting it manually
while SUW is running
- There should only be one alpha StatePropertyHolder for the same view
otherwise when updating the properties it can clobber a previous state
Bug: 204384193
Test: Disable dark mode on SUW and verify nav buttons show
Change-Id: I450c3a5697954d9b464bdd622847beb2d01f3802
2021-12-16 17:47:53 +00:00
TreeHugger Robot
c8a3c2a26c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours am: 74713bf7fe -s ours am: adfc2526aa -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Id44a50d24566d9ff8b45cffd556f1a0539b48d72
2021-12-16 16:40:54 +00:00
TreeHugger Robot
6698cdd80b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours am: 85064cbe20 -s ours am: 37f7042e78 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I19fedd4b29e4062061d72644ed774ac5473a08bb
2021-12-16 16:40:47 +00:00
TreeHugger Robot
1f74704615
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 122f22518b am: 567854f88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Iad85c6ca311d2785be54d29a96728be1dd15deaf
2021-12-16 16:40:30 +00:00
Bill Yi
c5da7c082d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours am: 81d7f5cfa1 -s ours am: 69d5b8d398 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Idc75c5b55f997c9926027dc57c082bf2ec819794
2021-12-16 16:40:29 +00:00
TreeHugger Robot
ec6edc918d
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: 62f10cad58 am: 61c7f0c6d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Id1b1ab4d9096828d7300a283b080cc928b2a0e2d
2021-12-16 16:40:03 +00:00
Bill Yi
320898919f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 53f35980bf -s ours am: 927681e12f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I7eed8b1eac0db8e92c0a69c969dfaa4c6f6072ec
2021-12-16 16:40:02 +00:00
Bill Yi
2ff00ecee0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 6247c73793 -s ours am: 0ca20ff79a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: If1d1309ca9fae9541aa0fcb7e30846df52fdf7e7
2021-12-16 16:39:05 +00:00
TreeHugger Robot
adfc2526aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours am: 74713bf7fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I7013385fd4211bb490f477fb5c3244fa7d66d70d
2021-12-16 16:33:23 +00:00
TreeHugger Robot
37f7042e78
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours am: 85064cbe20 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: Ia799fda92518e05bebb045e8da121579ef358cf3
2021-12-16 16:33:08 +00:00
TreeHugger Robot
567854f88d
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 122f22518b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I0e1ed4aac6dd20f83993c8a8754374db91677014
2021-12-16 16:32:56 +00:00
Bill Yi
69d5b8d398
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours am: 81d7f5cfa1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I1cdf85101708d66b72d9f4359874618c6f8ff232
2021-12-16 16:32:55 +00:00
TreeHugger Robot
61c7f0c6d9
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: 62f10cad58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I93aea4cda24ba0dafa436c39c4491830caf4e434
2021-12-16 16:32:15 +00:00
Bill Yi
927681e12f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 53f35980bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Ic0d0fbf6b1ef78404766e274558b41fbbbe70e9c
2021-12-16 16:32:13 +00:00
Bill Yi
0ca20ff79a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 6247c73793 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: Ieb8eed29d21d0c32befcaf8224d8d790cdf15b75
2021-12-16 16:30:50 +00:00
TreeHugger Robot
e75c91459c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours am: 3ffaf3c71f -s ours am: 6a04e85a40 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ia45615ccfc36719eaebabf7529aac1fc4c85f4fd
2021-12-16 16:27:53 +00:00
TreeHugger Robot
2af737f4e4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours am: 011e9314e6 -s ours am: f5721154da -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I7837e3f4b0092665faddea8d13fcbe545cb361de
2021-12-16 16:27:38 +00:00
TreeHugger Robot
3f9df5e866
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 63d5fd85e6 am: ad0d18bd86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ic737844b7f4e0e41b95b9f79e88e7d7e51c82c33
2021-12-16 16:27:30 +00:00
Bill Yi
4f028244f9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours am: 964665a000 -s ours am: 2154f37847 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I6170b94e8ec296110aec04a4fb59dc72a11df84e
2021-12-16 16:27:28 +00:00
TreeHugger Robot
c2024d32a3
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: e2e3340998 am: 5dcb88cb71
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I1d3e23427ab95e5d4ecb5abbe297f4eac120fe01
2021-12-16 16:26:34 +00:00
Bill Yi
23a8bac384
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 2d4d5863b7 -s ours am: 4b2275537a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I22f4f0e2aa87411b7ee4450c8b02f1d3da780f6f
2021-12-16 16:26:32 +00:00
Bill Yi
4e9f80721e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 0a77ac2558 -s ours am: df18d0f7a2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: Ic8fb7c0a3721790db0ae0de5734c4c1839167fbc
2021-12-16 16:25:07 +00:00
TreeHugger Robot
2331b30091
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 9be15e2b85 -s ours am: 1adc711159 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474029
Change-Id: Ie1819042d99bf2b50c234d3ac2f1f0fbcb504972
2021-12-16 16:24:07 +00:00
TreeHugger Robot
41532f5d06
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2cce776dc4 -s ours am: 40cf3b53cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474032
Change-Id: Ie3afb7c1ebe0591d85083edd1025341a567b3ee9
2021-12-16 16:22:43 +00:00
TreeHugger Robot
c11ce9c9ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: b3a4a6139f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Id38f06ba403d538a3c88d4565941aecf0eef2e37
2021-12-16 16:22:26 +00:00
Bill Yi
c76b757798
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 384c30fa4c -s ours am: 9c07d79b28 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I02e061bc2076cf59c415508b246c916f4c392b9e
2021-12-16 16:21:40 +00:00
TreeHugger Robot
6a04e85a40
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours am: 3ffaf3c71f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I3ba0e9e102ad10dd007fdc0abf5522d381653d6d
2021-12-16 16:15:49 +00:00
TreeHugger Robot
f5721154da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours am: 011e9314e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: Ic1932e17d1140f9e55ae4dfacf61aacb55c590a0
2021-12-16 16:15:38 +00:00
TreeHugger Robot
ad0d18bd86
Merge changes from topic "presubmit-am-299ca4020ed94d05b0ac27bbf6752f7a" into sc-qpr1-dev am: cd30824c99 am: 63d5fd85e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I210eb79849adf9f12545f7fab43e314e8aa78cec
2021-12-16 16:15:22 +00:00
Bill Yi
2154f37847
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 189f1ce908 am: a0cf7967db -s ours am: 964665a000 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Iff67c537c8d4faad2fe1c9f70cb2f2da874809f1
2021-12-16 16:15:21 +00:00
TreeHugger Robot
5dcb88cb71
Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05d7 am: e2e3340998
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: Ic7fcfc4f59ec430b2d8126dc72239f9c8f232682
2021-12-16 16:14:55 +00:00
Bill Yi
4b2275537a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 384c30fa4c am: 439705b5a3 -s ours am: 2d4d5863b7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474030
Change-Id: I79133aa37949d7f78930cfb848a64bf9ec373b13
2021-12-16 16:14:52 +00:00
Bill Yi
df18d0f7a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8942bc90bf -s ours am: 0a77ac2558 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474028
Change-Id: I49d9fa06480cfbdafb358c95c04d09a0ebf116c2
2021-12-16 16:13:54 +00:00
TreeHugger Robot
3ffaf3c71f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: Ie8afdf5787284f711960ea7edb124641edbaceb5
2021-12-16 16:11:57 +00:00
TreeHugger Robot
74713bf7fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 649325ad1a -s ours am: 4d6831e2b9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474027
Change-Id: I4baef64d51053fa2d7a6f12bf3137d34de4bdb52
2021-12-16 16:11:50 +00:00
TreeHugger Robot
85064cbe20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I9aa58829f42179c3c4106b3636d0b3f16c04e078
2021-12-16 16:11:34 +00:00
TreeHugger Robot
011e9314e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: d1841de078 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16474031
Change-Id: I70958dc746e53154b9d9c58ee72c59a995ca7439
2021-12-16 16:11:32 +00:00