Jonathan Miranda
aa4b1ee9e6
Merge "Update popup colors. Add local color extraction behind a flag." into sc-dev am: bd51e6e3f3 am: 4e767a9591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15065087
Change-Id: I70956da783206b92609b9ce2b87be68833710367
2021-06-23 23:20:40 +00:00
Jonathan Miranda
4e767a9591
Merge "Update popup colors. Add local color extraction behind a flag." into sc-dev am: bd51e6e3f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15065087
Change-Id: Ibdf0a9dca6a4f3a27121ee59cb88245f5c5b3f10
2021-06-23 23:09:19 +00:00
Jonathan Miranda
bd51e6e3f3
Merge "Update popup colors. Add local color extraction behind a flag." into sc-dev
2021-06-23 22:51:20 +00:00
Hilary Huo
c013cc9819
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37 am: e04ca46d2a am: 43001bdd40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: Ic49efe9f59da827bcf78690ebfb655fb4716b9e4
2021-06-23 22:49:56 +00:00
Hilary Huo
f4ea1d16f3
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37 am: cb4475f7d8 am: d6583d43e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I2264c57e4ed35164a9962f4777895a1d6a75c842
2021-06-23 22:49:31 +00:00
Hilary Huo
43001bdd40
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37 am: e04ca46d2a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I7ceb7c1a2c408f76ff0ac93bbff81798305caa66
2021-06-23 22:41:09 +00:00
Hilary Huo
d6583d43e2
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37 am: cb4475f7d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I60bc789e43bc2a2af58354df44ccf722f3407b73
2021-06-23 22:40:44 +00:00
Hilary Huo
04f50d616e
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37 am: 1f306ec22a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: Id90ce19c4ab2f03e654e18af44292887aca03e1e
2021-06-23 22:40:10 +00:00
Hilary Huo
cb4475f7d8
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I58da46b9fc9fd83205c352996c78453885666397
2021-06-23 22:29:13 +00:00
Hilary Huo
e04ca46d2a
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I3f9c316172aaabd2eb3595eaf80a1edf75045fe4
2021-06-23 22:28:17 +00:00
Hilary Huo
1f306ec22a
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev am: 08843d8e37
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15068624
Change-Id: I06980f9057b8a9dd3f49df15baf08185be3c3b91
2021-06-23 22:28:15 +00:00
Hilary Huo
08843d8e37
Merge "[settings-pixel-search] Add ww logging to track slice fetching timeout" into sc-dev
2021-06-23 22:18:00 +00:00
Steven Ng
5cca64772b
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03 am: 7594a89278 am: b725c7d6be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I748b642ce2358ea836a79701c145cdfbfb64c553
2021-06-23 21:38:03 +00:00
Steven Ng
c744853649
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: 3a813de8e1 am: 2ca51002b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I9aa7c358c2c8c8635123851a55b61920952dc78d
2021-06-23 21:37:57 +00:00
Steven Ng
199fb2c3bd
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03 am: 1579854153 am: 84972e6250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I8c6aebba0b6d80d0e487092664e5e4216217984c
2021-06-23 21:37:51 +00:00
Steven Ng
cc26a49407
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: f5555fcb8e am: b134e677b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I2c84f14f5ca906add555e711724cb8bf297037fa
2021-06-23 21:37:45 +00:00
Steven Ng
b725c7d6be
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03 am: 7594a89278
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I41c76355b427055e8d87fbc2388176fe2c6c0f7d
2021-06-23 21:26:10 +00:00
Steven Ng
2ca51002b9
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: 3a813de8e1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I80ec42a28eb10b2c3411108638db06a7ca40416c
2021-06-23 21:26:04 +00:00
Steven Ng
84972e6250
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03 am: 1579854153
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I6800e52f69259a030b683c9aef42c814ac71f602
2021-06-23 21:25:44 +00:00
Steven Ng
b134e677b9
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: f5555fcb8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I6101875d35cafb8664a0f8f07d5a127a2e37189c
2021-06-23 21:25:39 +00:00
Steven Ng
47fde106aa
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03 am: ec5d4f71fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: Icbc5bc757ba029a4d9969a01d1c3525000902370
2021-06-23 21:25:17 +00:00
Steven Ng
672018edcc
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d am: 8ec3545fb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I98d191aa4bfea42cb90b36dbf7875bd55c385c7c
2021-06-23 21:25:11 +00:00
Jon Miranda
27de7d2643
Update popup colors. Add local color extraction behind a flag.
...
- Also updating folder backgrounds, lStar only works in ColorStateList.
Bug: 191496301
Test: test wallpaper with light text, in light mode
test again in dark mode
test wallpaper with dark text, in light mode
test again in dark mode
Change-Id: I2d43d874e7e2fad6a9a0e039058beb58b204fa96
2021-06-23 14:18:25 -07:00
Steven Ng
1579854153
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I64311aa17528c8c968a8cd2f032992c6e00225d7
2021-06-23 21:17:55 +00:00
Steven Ng
f5555fcb8e
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: Idc12dd2613200ce6e9901856b14c4ce0c5946fb6
2021-06-23 21:17:48 +00:00
Steven Ng
ec5d4f71fc
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: I20b44fb89dd6c9530f920a4bec9fea53ac6b830a
2021-06-23 21:17:04 +00:00
Steven Ng
7594a89278
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev am: fa9f70be03
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15081332
Change-Id: Ica73c354ad54f67e94a20328a0072e2acc4ad21d
2021-06-23 21:17:00 +00:00
Steven Ng
8ec3545fb2
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: Ib55c3525909d6a4b4e4123c9197c364147e3639f
2021-06-23 21:16:57 +00:00
Steven Ng
3a813de8e1
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev am: 5b786ca88d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15042822
Change-Id: I837c61ddaecacf198ce89be0949e79f29a2c7a3d
2021-06-23 21:16:53 +00:00
Steven Ng
fa9f70be03
Merge "Use default spans as min spans if the min spans > default spans" into sc-dev
2021-06-23 21:05:43 +00:00
Steven Ng
5b786ca88d
Merge "Add null check before detach content view from dragView at onDropComplete" into sc-dev
2021-06-23 21:01:57 +00:00
Alina Zaidi
9bc0939a10
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 7392cf9bbf am: e91ee8c09c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Ib2a8e672a80dbc3682adc146d53b91108ac97f69
2021-06-23 20:54:05 +00:00
Jonathan Miranda
2354be9f7c
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: e7ce4caaed am: 8642568372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I8c9f2e35932fc6a7adabdcb043a71658d9d0d62f
2021-06-23 20:54:00 +00:00
Alina Zaidi
1f72467ae8
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 565d7d8ec5 am: d49ed50acb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Iba8bfc95ebe3c16d6a7beafc9c7cc0c04eb23ac5
2021-06-23 20:53:53 +00:00
Jonathan Miranda
2ffa726ec6
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: 328acc3b08 am: 5a2b4b9d56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: Ie5d5429c9f652e715ddf396f20bfa29d292ad358
2021-06-23 20:53:40 +00:00
Alina Zaidi
e481686af7
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: bb92f9b06b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Icdd26a62b40a6d87ea58a3892466087b5608e5ec
2021-06-23 20:51:04 +00:00
Alina Zaidi
e91ee8c09c
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 7392cf9bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I6861430249d8f1e87e06d5fff82c14b80f23bd62
2021-06-23 20:50:44 +00:00
Jonathan Miranda
8642568372
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: e7ce4caaed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: If2d9eb7e3df87243c1ae6e0304bec64a4c82bcd2
2021-06-23 20:50:38 +00:00
Jonathan Miranda
015af8b316
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: a6009c7395
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I0ff342ed289f9e99a1a6e7a1dbd7b1d09dcfba69
2021-06-23 20:50:14 +00:00
Alina Zaidi
d49ed50acb
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3 am: 565d7d8ec5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I5e9f2e1b2125d1355ef88294bd47a103907d0547
2021-06-23 20:41:13 +00:00
Jonathan Miranda
5a2b4b9d56
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3 am: 328acc3b08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I96a85a2d1166a04240666f5c4ce39a6740e1c56b
2021-06-23 20:40:59 +00:00
Alina Zaidi
bb92f9b06b
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I008a6657c6223ccde5f440f6638a57dd4a9099ff
2021-06-23 20:33:28 +00:00
Alina Zaidi
7392cf9bbf
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: Iad854c8f22ed8923b42732644493063d7486eef6
2021-06-23 20:33:12 +00:00
Jonathan Miranda
e7ce4caaed
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I299041edaebfc0f333bcc7e56b3fe6489aa8c644
2021-06-23 20:32:45 +00:00
Alina Zaidi
565d7d8ec5
Merge "Update string for no room on this Home screen toast." into sc-dev am: b7e15cf3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15079811
Change-Id: I36fbef22d73b024291148c9dcb074c494b79921e
2021-06-23 20:32:34 +00:00
Jonathan Miranda
a6009c7395
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: I2be241dfea0f823c375ad315413c852928ce31c8
2021-06-23 20:32:28 +00:00
Jonathan Miranda
328acc3b08
Merge "Fix folders being light in dark mode." into sc-dev am: 5546b258c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15082515
Change-Id: Ide8fcf408f45b9c8c83e2ba672d47cfc4972844f
2021-06-23 20:31:51 +00:00
Tracy Zhou
eebb05a997
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 57b5325ea0 -s ours am: 03ba878906 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I60279333d42167f6dffe233fa7814762743dc7c7
2021-06-23 20:20:50 +00:00
Tracy Zhou
03ba878906
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 57b5325ea0 -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I07b405713575b80db81e46e69532f31cd2787dd4
2021-06-23 20:18:36 +00:00
Tracy Zhou
1dfeb91306
[automerger skipped] Merge "Finish recents animation on task dismissal only if the task is a live tile task" into sc-dev am: 2f8342d791 am: 4c4122551c -s ours
...
am skip reason: Merged-In Ie1dd02a2e8cc401a613a0ed2199400712c6d5291 with SHA-1 d537968b35 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15072972
Change-Id: I1080155f6ed7265edcc1c9020ed28a48fbcbee13
2021-06-23 20:17:27 +00:00