Commit Graph

36514 Commits

Author SHA1 Message Date
Steven Ng 76feed8464 Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: d34cadffb9 am: b2684d9b91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: Ib8b8e501fd51beee21416b1b75eaf1a8a2083cd5
2021-06-08 15:31:33 +00:00
Steven Ng 5572a60ef8 Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: f8eca2008d am: 25f03e52f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: I5bb4b54f276bbbc6153e3639ba1222d6a3f59996
2021-06-08 15:31:18 +00:00
Steven Ng b2684d9b91 Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: d34cadffb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: I138aaeedff96ea71339fa39da827730d5a77fb35
2021-06-08 15:19:45 +00:00
Steven Ng 25f03e52f1 Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: f8eca2008d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: I68204321fb507d79bb809fa5c0dab5c4f1678ec1
2021-06-08 15:18:48 +00:00
Steven Ng 0e410e404b Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c am: e2517121dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: I34e10bc5799e6ef69272ca63a22487be3f8bfc70
2021-06-08 15:18:20 +00:00
Steven Ng f8eca2008d Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: Ic74b543e4fb94ab377472cb5d8e25fe449818081
2021-06-08 15:06:03 +00:00
Steven Ng e2517121dc Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: Iff5238435b64942e99a995fa996c1d0143e3492a
2021-06-08 15:04:29 +00:00
Steven Ng d34cadffb9 Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev am: eb1617521c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14776609

Change-Id: I90b589f19c9ce2ac30ad4cfbe98cfa4404053927
2021-06-08 15:01:23 +00:00
Steven Ng eb1617521c Merge "Use grid size as the upper bound for widgets' default size in initSpans" into sc-dev 2021-06-08 14:48:29 +00:00
Steven Ng 1d47d8c705 Use grid size as the upper bound for widgets' default size in initSpans
Test: In Pixel 4, drag a monthly view Google calendar widget to a new
      home page from the full widgets picker. The widget outline is
      correctly shown.
Bug: 189060113
Change-Id: I33113b29cc8923098de95f1d5eb14c2b02429de1
2021-06-08 14:15:50 +01:00
Wei Sheng Shih be9ff88b78 Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce am: f077df5aef am: ad0a0e0427
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: I666b6462905b9e215828658a52e69cadedfefb2a
2021-06-08 13:03:07 +00:00
Wei Sheng Shih 64dc135bd1 Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce am: 6f56a61d4c am: 08d06351d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: I607d35a1066b278e4b8225092c25b70d796e154a
2021-06-08 13:02:51 +00:00
Wei Sheng Shih ad0a0e0427 Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce am: f077df5aef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: I157c2849898f67abdc70ff652b8b936f1228378a
2021-06-08 12:50:17 +00:00
Wei Sheng Shih 08d06351d1 Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce am: 6f56a61d4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: Ieadcc218aaf6defe34ccdff59041ef4b44beef58
2021-06-08 12:44:37 +00:00
Wei Sheng Shih e8d2a08562 Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce am: 7d76519c1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: I0d8255797dc1611c85e8cc5d16f9b59aab9b9fc5
2021-06-08 12:43:14 +00:00
Wei Sheng Shih f077df5aef Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: Icc117227086edadc83c34fa12242674c4f6b961c
2021-06-08 12:29:50 +00:00
Wei Sheng Shih 7d76519c1f Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: I36fa8bff1c0a7e19b49149dd3a09b9aee5df08a7
2021-06-08 12:28:18 +00:00
Wei Sheng Shih 6f56a61d4c Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev am: c3db44bbce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14773251

Change-Id: Ic9703cd79e59e8548ee63d20573e424e833ce70b
2021-06-08 12:26:40 +00:00
Wei Sheng Shih c3db44bbce Merge "Pre-set splash screen as icon-style when launch activity from Launcher." into sc-dev 2021-06-08 12:16:24 +00:00
TreeHugger Robot 04b50473f5 [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -s ours am: f9a402c34c am: 5c63500b39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c5d72669ede19617feff0545a0796e55a9876d2
2021-06-08 09:27:02 +00:00
Stevie Kideckel 651c829854 Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64 am: 51d27b8dda am: 77acdf656d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I5eee8f2fd2f1138b74d3e63a311448ecb6d365c8
2021-06-08 09:26:56 +00:00
TreeHugger Robot 6a9d2d7ee7 [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 am: 043cf1557a -s ours am: 3a747c7878 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie413a48f9cf5ea707c211aed57b61e1c82676b19
2021-06-08 09:26:45 +00:00
zakcohen 86385000d9 [automerger skipped] DO NOT MERGE am: 1fb6718c85 am: 370e783674 -s ours am: 5af733122b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4775d59c8e5b3424a1d93623dc71d44a9dfb3562
2021-06-08 09:26:43 +00:00
Stevie Kideckel 0e078bf17a Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64 am: 6985015274 am: d36d988b9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I02a9bf7f055eec9b4ff037a130207740f5dfff53
2021-06-08 09:25:26 +00:00
TreeHugger Robot 5c63500b39 [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -s ours am: f9a402c34c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14885687

Change-Id: I8d396b983e2b10cca5454db92d4dfe0f1da8faaa
2021-06-08 09:17:45 +00:00
Stevie Kideckel 77acdf656d Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64 am: 51d27b8dda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I7f5839a02bde5ca4be5fc18b97ace5bef586ef2b
2021-06-08 09:17:41 +00:00
TreeHugger Robot d387d0eca0 [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 am: 495b3c2a62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I118f1fed9f369fd4fb8236b9b1a1a6fdb60ff619
2021-06-08 09:17:16 +00:00
zakcohen ed5d1f5aba [automerger skipped] DO NOT MERGE am: 1fb6718c85 am: b4d9ebd0de -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23bf3739a979e0b74bd72907cf97ef8c60bc551b
2021-06-08 09:17:14 +00:00
Stevie Kideckel 19215e9cc1 Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64 am: 538e5789bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I818c9a13399b54bfd4b0af0241254b25a45bbe38
2021-06-08 09:17:07 +00:00
TreeHugger Robot 3a747c7878 [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 am: 043cf1557a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92ce43e777d3f4e17d7e1c827e69bb8facce903b
2021-06-08 09:12:14 +00:00
zakcohen 5af733122b [automerger skipped] DO NOT MERGE am: 1fb6718c85 am: 370e783674 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic19428fb776aa2228918ee2f53251bed52d5da4f
2021-06-08 09:12:12 +00:00
Stevie Kideckel d36d988b9d Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64 am: 6985015274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I79b9da4370bede27dc11ca61352734a4322d3868
2021-06-08 09:11:59 +00:00
TreeHugger Robot f9a402c34c [automerger skipped] Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic7c05b2a262e07b8364e0d1ef87a23647d4c7a60
2021-06-08 08:57:19 +00:00
Stevie Kideckel 51d27b8dda Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: Ib539fc02df7b9c967aae919fab5dc864a4ece06a
2021-06-08 08:56:41 +00:00
TreeHugger Robot 495b3c2a62 Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14885687

Change-Id: Ib7c692253cab416ad0a89a910409fd50747291e5
2021-06-08 08:55:59 +00:00
zakcohen b4d9ebd0de DO NOT MERGE am: 1fb6718c85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14885687

Change-Id: I6205b60242fbc2b5b3ed2051a5728ac8b7dc7c71
2021-06-08 08:55:58 +00:00
TreeHugger Robot 043cf1557a Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14885687

Change-Id: I85ea0c10c02086fcf539e0bf7255c060c378fa63
2021-06-08 08:55:40 +00:00
zakcohen 370e783674 DO NOT MERGE am: 1fb6718c85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14885687

Change-Id: I0979cda3bf21947188a3301b7c73442d0c9c8e60
2021-06-08 08:55:39 +00:00
Stevie Kideckel 538e5789bd Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: I40e73e9f0a28f26087b4c1d973180d5362c43837
2021-06-08 08:55:18 +00:00
Stevie Kideckel 6985015274 Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev am: acf27b6d64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881294

Change-Id: Ic5e415d1eb01767a8caa5b810fe797ce9f431826
2021-06-08 08:55:02 +00:00
Pat Manning 17da2b2bf8 Merge "Animate live tile translation and update live tile page scroll on dismissal of non-live tile tasks." into sc-v2-dev am: 9acaf302ad am: 0b5f695912
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14805376

Change-Id: I92527745166eded7a2561ce65a0253ab27a16f4c
2021-06-08 08:48:32 +00:00
TreeHugger Robot 77afcf32f3 Merge "DO NOT MERGE" into sc-dev 2021-06-08 08:46:55 +00:00
Stevie Kideckel acf27b6d64 Merge "Fix accounting for the position/offset of headers with collapsing views" into sc-dev 2021-06-08 08:37:25 +00:00
Pat Manning 0b5f695912 Merge "Animate live tile translation and update live tile page scroll on dismissal of non-live tile tasks." into sc-v2-dev am: 9acaf302ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14805376

Change-Id: I9352fba6202a64e5b83442890d76d5b59c44ed06
2021-06-08 08:34:42 +00:00
Pat Manning 9acaf302ad Merge "Animate live tile translation and update live tile page scroll on dismissal of non-live tile tasks." into sc-v2-dev 2021-06-08 08:21:01 +00:00
Stevie Kideckel fd9bfd3aab Fix accounting for the position/offset of headers with collapsing views
The offset should be taken before views are modified, the position
should be taken after. This fixes an off by one issue when expanding a
header below another already expanded header.

Bug: 183378651
Test: verified locally
Change-Id: I4987d57846d7bcde23b76280f800f19350b3521e
2021-06-08 07:08:42 +00:00
Tony Wickham d16eb9bb20 Have AlphaUpdateListener update visibility in onAnimationEnd() am: 26ab4621ce am: 96cb92075e am: 7f134ecb33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14882859

Change-Id: I26f96f4addb9b7bad75dd46f01fbd09f9d267dc9
2021-06-08 00:49:52 +00:00
Tony Wickham 398b22f0e1 Have AlphaUpdateListener update visibility in onAnimationEnd() am: 26ab4621ce am: 3f25e91586 am: 09dc4d9342
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14882859

Change-Id: I00e3670a4b46a8db8c1c258445d75a5078b8a14b
2021-06-08 00:48:25 +00:00
Tony Wickham 7f134ecb33 Have AlphaUpdateListener update visibility in onAnimationEnd() am: 26ab4621ce am: 96cb92075e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14882859

Change-Id: I77b001d31e62f5abf06f7753eb32e05d7aee01a2
2021-06-08 00:34:17 +00:00
Tony Wickham 09dc4d9342 Have AlphaUpdateListener update visibility in onAnimationEnd() am: 26ab4621ce am: 3f25e91586
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14882859

Change-Id: Iea1a847054cc82b031b9308276beb08fde9984e5
2021-06-08 00:33:29 +00:00