PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

6493 Commits

Author SHA1 Message Date
Jonathan Miranda e6286866f5 Merge "resolve merge conflicts of 11bf817e86 to sc-v2-dev" into sc-v2-dev am: ce4397aafe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969495

Change-Id: Ie542d77f88c224984472d52eede2bcc80b797f84
 2021-06-15 01:17:11 +00:00
Samuel Fufa 22617e92ca Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969650

Change-Id: I1d6376d52f570e72ae32ef2e498c8d925273d954
 2021-06-15 01:03:28 +00:00
Samuel Fufa 63774f4a10 Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc am: 99600f1598 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969650

Change-Id: I4a9e28a30094ec7c1c60c10627f5981d45e391cb
 2021-06-14 23:04:24 +00:00
Samuel Fufa 3b978f98df Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969650

Change-Id: I1255ec27717fe3375b4cf57cc1ab149b9d4cf420
 2021-06-14 22:47:01 +00:00
Samuel Fufa 99600f1598 Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14969650

Change-Id: I3422b9a16a6db641da422358fa5a219ae6703b5d
 2021-06-14 22:46:59 +00:00
Samuel Fufa 200c734e8e [Build Blocking] Fix conflicting resource IDs for work tab 
Bug: 186857875
Bug: 191080190
Test: local
Change-Id: I7adbd79a061af4d07c7426db1496f8c319902266
 2021-06-14 22:30:57 +00:00
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
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
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
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
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
Samuel Fufa b8b822a74b Merge "Introduce inline education for work profile" into sc-dev 2021-06-14 19:29:28 +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 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
Jon Miranda 8644368e08 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
 2021-06-14 16:13:43 +00:00
Takeshi Hagikura 84e69ae5ef Merge "Update the colors of the tabs of work profile pagination" into sc-dev am: 7937cecde2 am: 024262cc03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14913674

Change-Id: I1a221270017e460a00610ee8300d621f8249d7a2
 2021-06-14 08:24:33 +00:00
Takeshi Hagikura 3b5825f6c4 Merge "Update the colors of the tabs of work profile pagination" into sc-dev am: 7937cecde2 am: 040dfd00eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14913674

Change-Id: Iad06a0d4d16a77157b0e90df70e426f4e3f40d3a
 2021-06-14 08:24:03 +00:00
Takeshi Hagikura 024262cc03 Merge "Update the colors of the tabs of work profile pagination" into sc-dev am: 7937cecde2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14913674

Change-Id: Iea5ec8efa514c0ad3b4e9e8b14b0ea526996e90f
 2021-06-14 08:09:44 +00:00
Takeshi Hagikura 040dfd00eb Merge "Update the colors of the tabs of work profile pagination" into sc-dev am: 7937cecde2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14913674

Change-Id: I66dc68a9ea522bd16f2720eeef387ce88f4d981d
 2021-06-14 08:08:56 +00:00
Takeshi Hagikura a5a87e55a7 Merge "Update the colors of the tabs of work profile pagination" into sc-dev am: 7937cecde2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14913674

Change-Id: I01658f515cc0832f6c639b77fb56c12914c1da2f
 2021-06-14 08:08:54 +00:00
Takeshi Hagikura 7937cecde2 Merge "Update the colors of the tabs of work profile pagination" into sc-dev 2021-06-14 07:54:39 +00:00
Samuel Fufa 154ad76f40 Introduce inline education for work profile 
Bug: 186857875
Test: local
Change-Id: I796b04fbb3ffc714a01104107774819d35034f93
 2021-06-14 01:01:42 -05:00
Samuel Fufa 7ddc987796 Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev am: 2f346b8666 am: 2e8ef02c31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948496

Change-Id: I724d7ef6602bb8b3e76eaf6b8d4dba68462d0cf0
 2021-06-14 03:00:56 +00:00
Samuel Fufa ace729983a Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev am: 2f346b8666 am: cd5f45b2b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948496

Change-Id: I9289778170734f9838e66947b3ff5305e048e78e
 2021-06-14 03:00:49 +00:00
Samuel Fufa cd5f45b2b6 Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev am: 2f346b8666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948496

Change-Id: I7208e1c28573aa65035aa0783f56f52f4a0c1b3b
 2021-06-14 02:49:51 +00:00
Samuel Fufa 2e8ef02c31 Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev am: 2f346b8666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948496

Change-Id: I1db42baddd0040e84a16ec62ab8915a7d4cbbd1c
 2021-06-14 02:48:46 +00:00
Samuel Fufa daed6c0751 Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev am: 2f346b8666 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14948496

Change-Id: Idb7f10a279a492d5caf870ea1dbfc55e44053114
 2021-06-14 02:48:23 +00:00
Samuel Fufa 2f346b8666 Merge "[AllApps][Work] Introduce work toggle Fab" into sc-dev 2021-06-14 02:34:58 +00:00
Samuel Fufa 45e0e26971 [AllApps][Work] Introduce work toggle Fab 
Screenshot: https://screenshot.googleplex.com/C4r7kKPxv3PKdyN
Bug: 186856928
Test: on-device
Change-Id: Ifd8ce20fcf2247a6e80537dc7631458e594a8a63
 2021-06-13 20:01:20 -05:00
Brian Isganitis 3b60237e38 Merge "Revert "Revert "Update preferences to Material Next styling""" into sc-v2-dev am: 225e6ba272 am: 650fa8139a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14924442

Change-Id: I44b5a08491711d2e5b8123579cb9cff70e2d47b6
 2021-06-13 22:05:01 +00:00
Brian Isganitis 650fa8139a Merge "Revert "Revert "Update preferences to Material Next styling""" into sc-v2-dev am: 225e6ba272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14924442

Change-Id: I5302e1728999e68df2c6acabf3a969193ecdcb81
 2021-06-13 21:30:15 +00:00
Brian Isganitis 93031bc2ae Revert "Revert "Update preferences to Material Next styling"" 
There should be enough free space to merge this change into S V2.

This reverts commit 19d623d921.

Test: Settings root, all apps, and about have new style on S
Bug: 187732263
Fix: 188254205, 188012913
Change-Id: I346bbf819f3fe1eb13b47125b53c15baab11e439
 2021-06-11 16:04:35 -04:00
Jonathan Miranda 9210b14c22 Merge "Adding color back to popup container." into sc-dev am: d88f572864 am: a51ef571ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: I5e462f782416356c6eedbc8341ef6c89c44f45ff
 2021-06-11 17:44:25 +00:00
Jonathan Miranda 670348b9fa Merge "Adding color back to popup container." into sc-dev am: d88f572864 am: 8b14b2da8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: Ief9fa2a56db25bfcb0870b3db7004c0fc114a33c
 2021-06-11 17:43:58 +00:00
Jonathan Miranda a51ef571ad Merge "Adding color back to popup container." into sc-dev am: d88f572864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: If0211bbefae257d97e7b652acff0b569bf088b4d
 2021-06-11 17:30:04 +00:00
Jonathan Miranda 8b14b2da8a Merge "Adding color back to popup container." into sc-dev am: d88f572864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: I04cf5e44f34ef354959ccc9fe7aaac5f09bb2f45
 2021-06-11 17:29:26 +00:00
Jonathan Miranda cdc4789db8 Merge "Adding color back to popup container." into sc-dev am: d88f572864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14796372

Change-Id: I449e101bc4fca3f9f8672d6b889406dac25b6c42
 2021-06-11 17:29:23 +00:00
Jonathan Miranda d88f572864 Merge "Adding color back to popup container." into sc-dev 2021-06-11 17:16:27 +00:00
Anton Hansson 9d76378464 Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2cb am: 8b780d8517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14939015

Change-Id: Id8c453621a6a4ae3d6e49ec86b53e2764adf7382
 2021-06-11 15:24:49 +00:00
Anton Hansson ac68fe0f3f Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2cb am: 6ad1a8d1d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14939015

Change-Id: I1fa905ca481e450e1fb0017de9e781c52adc2c98
 2021-06-11 15:24:23 +00:00
Anton Hansson 8b780d8517 Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14939015

Change-Id: I47bd374d48ee1cdbdc69b4cb3504296c7d475396
 2021-06-11 15:13:08 +00:00
Anton Hansson 6ad1a8d1d2 Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14939015

Change-Id: I77f6ce3a2108f4e1547e11d85b16d15483f175e4
 2021-06-11 15:12:20 +00:00
Anton Hansson d7b9bf8995 Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev am: 17ef90b2cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14939015

Change-Id: I75e6989b9cf1d82eb3d5df9a32f9047f63387314
 2021-06-11 15:12:19 +00:00
Anton Hansson 17ef90b2cb Merge "Revert "[AllApps][Work] Introduce work toggle Fab"" into sc-dev 2021-06-11 15:02:25 +00:00
Anton Hansson fc235903ab Revert "[AllApps][Work] Introduce work toggle Fab" 
This reverts commit 08cca82eca.

Reason for revert: broke errorprone build
Bug: 190150515

Change-Id: I1d8707392310e745713b8780bdb957299b88a3a6
 2021-06-11 14:05:07 +00:00
Alina Zaidi 784d08da4e Merge changes I5d1c9e4b,I08154c94 into sc-dev am: 1fbf9200f1 am: e908dbba29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14899453

Change-Id: Icc45b99bc5daac07ab781ec794748218b3ab9087
 2021-06-10 21:16:35 +00:00