Steven Ng
bf105c67b4
Merge "Use a separate personal/work tabs layout for the widget picker" into sc-dev am: 1b5e45acae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14103513
Change-Id: I097524426790c6b68403ba9120094602bbbe1406
2021-04-08 19:21:57 +00:00
Steven Ng
1b5e45acae
Merge "Use a separate personal/work tabs layout for the widget picker" into sc-dev
2021-04-08 18:48:52 +00:00
Winson Chung
3b85860fb2
Merge "Reset force-minimized split state when in live tile mode" into sc-dev am: 01b5d5e332
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14098020
Change-Id: Iae66943d109331cf277efdacc730bd9064a49ee4
2021-04-08 17:04:02 +00:00
Winson Chung
01b5d5e332
Merge "Reset force-minimized split state when in live tile mode" into sc-dev
2021-04-08 16:30:28 +00:00
Alex Johnston
ebf4b4a465
[automerger skipped] resolve merge conflicts of 8786016e85 to rvc-qpr-dev am: a538ffe2a4 am: 5dd7e72e1d -s ours am: 8236471783 -s ours
...
am skip reason: skip tag Change-Id I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 8786016e85 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694
Change-Id: Iafc730ee7b628e2424c01b2c69fe3f2bb45de3a0
2021-04-08 14:12:27 +00:00
Alex Johnston
8236471783
[automerger skipped] resolve merge conflicts of 8786016e85 to rvc-qpr-dev am: a538ffe2a4 am: 5dd7e72e1d -s ours
...
am skip reason: skip tag Change-Id I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 8786016e85 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694
Change-Id: I9f745ba547b331b4953ea060127b463a5acc28f0
2021-04-08 13:35:09 +00:00
Alex Johnston
5dd7e72e1d
resolve merge conflicts of 8786016e85 to rvc-qpr-dev am: a538ffe2a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102694
Change-Id: I31f76112edeb770bc3b9c017f6205392dbe3f5a8
2021-04-08 12:46:10 +00:00
Steven Ng
fd604ee7ae
Use a separate personal/work tabs layout for the widget picker
...
1. Apps are feminine while widgets are masculine in some languages.
We should use a different set of strings to ensure strings are
translated with the right context.
2. We will be using a different theme for widget tabs. Let's keep
the layout separate.
Bug: 184613311
Test: manual
Change-Id: I88df8ca6091e4b6ddf81f34f180a6ce2cada16e3
2021-04-08 11:14:24 +00:00
Alex Johnston
31ddbf2eab
[automerger skipped] Block recent work profile apps content capture am: 8786016e85 am: 18217e7f94 -s ours am: 781b84146f -s ours
...
am skip reason: skip tag Change-Id I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 284aaba153 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989187
Change-Id: If182613690b41be6a05662702fc1fa40685b805b
2021-04-07 22:54:05 +00:00
Alex Johnston
781b84146f
[automerger skipped] Block recent work profile apps content capture am: 8786016e85 am: 18217e7f94 -s ours
...
am skip reason: skip tag Change-Id I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd with SHA-1 284aaba153 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989187
Change-Id: I3b808f2f32a8bb21a19046062824440cb720d555
2021-04-07 21:39:10 +00:00
TreeHugger Robot
b3dfb3cb8f
Merge "Some cleanup in RecentsView" into sc-dev am: 63c169561c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14106036
Change-Id: I90749bc0c39124e4d2be5af93ba4a11ab4ae386c
2021-04-07 21:10:54 +00:00
Pierre Barbier de Reuille
ca90819278
Merge "Stop trying to draw a view not attached to the view tree" into sc-dev am: d1bde5e6f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989193
Change-Id: Id0858c4be58a4f5d9c47e0bd7681002a3974cc37
2021-04-07 21:10:41 +00:00
TreeHugger Robot
63c169561c
Merge "Some cleanup in RecentsView" into sc-dev
2021-04-07 21:06:55 +00:00
Pierre Barbier de Reuille
d1bde5e6f3
Merge "Stop trying to draw a view not attached to the view tree" into sc-dev
2021-04-07 20:40:10 +00:00
Alex Johnston
a538ffe2a4
resolve merge conflicts of 8786016e85 to rvc-qpr-dev
...
Bug: 168802517
Change-Id: I84db4b2328ecdd40991f661f23f635f4dd1a42ab
Merged-In: I3e6ba1d8645335785e8e26cdc895ea9c0017a0fd
2021-04-07 18:01:43 +00:00
Alex Johnston
18217e7f94
Block recent work profile apps content capture am: 8786016e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989187
Change-Id: I0e39d019e358dd8e0016927a9c9b50717cf6eb93
2021-04-07 17:00:40 +00:00
Pierre Barbier de Reuille
ad41a56166
Stop trying to draw a view not attached to the view tree
...
The behavior of the framework when we try to do so is undefined. In our
case, it almost work, but no clipping is applied, which is a problem for
Android S (before that, widget couldn't use clipping in the first
place).
Instead of drawing the view through a drawable, this really add the view
and adds also a badge ImageView for badges instead of drawing them
indirectly.
Note that, temporarily, we have to re-allow drawing the view after it
has been attached, but the underlying framework bug being fixed, this
should be fine (I tested it and it really seems to be).
Bug: 183609936
Test: Using hand designed app (see bug)
Change-Id: I929ef8fc81c98c49406f2d940cd5efc28319886d
2021-04-07 15:51:43 +01:00
Schneider Victor-tulias
e06877601f
Merge "Add logging for adding pending icons to the workspace." into sc-dev am: adfbdcf8fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13989020
Change-Id: Id2f2375d270db285909645f12255ca4a51337ee9
2021-04-07 00:32:19 +00:00
Schneider Victor-tulias
adfbdcf8fe
Merge "Add logging for adding pending icons to the workspace." into sc-dev
2021-04-06 23:45:53 +00:00
TreeHugger Robot
327d9b89c2
Merge "Simplifying widget search pipeline" into sc-dev am: 47fe0d14f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14040011
Change-Id: I5d6e5d00012985e64b9d7065f5f222db0014baba
2021-04-06 23:28:16 +00:00
TreeHugger Robot
47fe0d14f0
Merge "Simplifying widget search pipeline" into sc-dev
2021-04-06 23:12:32 +00:00
Samuel Fufa
035567f641
Merge "[Search] make AbstractSlideinView#createColorScrim overridable" into sc-dev am: 4f7d8fc3fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14101075
Change-Id: I44fd7b791c47dacba64c61ad5423a4e5bea9b951
2021-04-06 23:06:37 +00:00
Sunny Goyal
c82916fecb
Some cleanup in RecentsView
...
> Merging overview and all-apps scrims into a single View
> Decoupling TaskMenuView from taskView
Bug: 184676497
Test: Manual
Change-Id: I49f7249eaa2a800054385ab8e73a441d6a1b5e16
2021-04-06 15:47:33 -07:00
Samuel Fufa
4f7d8fc3fb
Merge "[Search] make AbstractSlideinView#createColorScrim overridable" into sc-dev
2021-04-06 22:36:28 +00:00
Winson Chung
fc540e8be1
Merge "Fix noisy log from sysui flag changes" into sc-dev am: 7cf7c31e46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14098021
Change-Id: I67ff6c8c39d6ba579e7b3c7186ebde4f92950a39
2021-04-06 22:23:43 +00:00
Tony Wickham
0fa98f86fb
Merge "Consolidate two different onTransitionCancelled implementations" into sc-dev am: 029e930751
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14103181
Change-Id: I6d871e1715644325455c5e6a4a635c17ca21d44e
2021-04-06 22:23:37 +00:00
Winson Chung
7cf7c31e46
Merge "Fix noisy log from sysui flag changes" into sc-dev
2021-04-06 21:48:43 +00:00
Tony Wickham
029e930751
Merge "Consolidate two different onTransitionCancelled implementations" into sc-dev
2021-04-06 21:44:53 +00:00
TreeHugger Robot
e3f96639fc
Merge "Fix HINT_STATE not tracking the entire height of the screen" into sc-dev am: c07ad47255
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14104581
Change-Id: Idee949dd793e04b5b9416e52ba00151ac0281e56
2021-04-06 21:30:10 +00:00
TreeHugger Robot
c07ad47255
Merge "Fix HINT_STATE not tracking the entire height of the screen" into sc-dev
2021-04-06 20:58:26 +00:00
Tony Wickham
655bf5ade9
Merge "Explicitly set which taskbar view is visible at each caller" into sc-dev am: fc3bc6098f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14094841
Change-Id: I216a2a826d6d6d2ddc1c2bfebf4e764bd43d2981
2021-04-06 20:34:02 +00:00
Tony Wickham
d054d06099
Merge "Ensure taskbar animation ends when running window animation does" into sc-dev am: 0b0c173ec0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14096849
Change-Id: Icf9a904ddc34a8a474fdaad94de9b247ce16f3c5
2021-04-06 20:32:24 +00:00
Tony Wickham
fc3bc6098f
Merge "Explicitly set which taskbar view is visible at each caller" into sc-dev
2021-04-06 19:37:18 +00:00
Tony Wickham
0b0c173ec0
Merge "Ensure taskbar animation ends when running window animation does" into sc-dev
2021-04-06 19:35:38 +00:00
Tony Wickham
b77fa8da52
Consolidate two different onTransitionCancelled implementations
...
There was previously two different onTransitionCancelled(), one in
BaseActivityInterface and one in AnimationFactory. They are pretty
similar and the differences seem subtle and not necessary. In this
bug, the AnimationFactory version was going to mStartState instead
of StateManager#getRestState() (which is the same, unless mStartState
disables restore). Instead, always use the mActivityInterface
implemenation, which seems more robust.
Test: Open app A, open app B, quick switch from B to A, swipe home
during that transition, then touch nav region during home transtion;
ensure we don't goToState(BACKGROUND_APP) in the subsequent
onTransitionCanceled().
Fixes: 184583037
Change-Id: I315a5087b12413d88c3ccc1e3245a55a76a73e62
2021-04-06 12:16:00 -07:00
Schneider Victor-tulias
bf694d61ee
Add logging for adding pending icons to the workspace.
...
Added logging to help track down b/168788486
Bug: 168788486
Test: manual
Change-Id: I96b38be7c02793f1b6649e6c0de5cdf47dca6edb
2021-04-06 12:10:50 -07:00
Tony Wickham
721a89d93a
Merge "Cleanup taskbar touchableInsets" into sc-dev am: c9846dc6e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14096731
Change-Id: I5331b56137d960f1d5eea3622e8255bcf5f64937
2021-04-06 19:08:24 +00:00
Tony Wickham
c9846dc6e7
Merge "Cleanup taskbar touchableInsets" into sc-dev
2021-04-06 18:36:05 +00:00
Samuel Fufa
06702c00b9
Merge "[Search][Layout] Fix blank space when predictions are disabled" into sc-dev am: 50c6a37ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14102304
Change-Id: I7e4b49d72b7d4fadacaeba5a372b0305908c34aa
2021-04-06 17:57:57 +00:00
Zak Cohen
be66b43c9f
Merge "Overview - update Clear All and Empty message drawing" into sc-dev am: fd9af2f017
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14096074
Change-Id: I8cef2fa1301f7faa0e70a12978da3724aaa7397d
2021-04-06 17:57:52 +00:00
Samuel Fufa
50c6a37ea9
Merge "[Search][Layout] Fix blank space when predictions are disabled" into sc-dev
2021-04-06 17:56:51 +00:00
Zak Cohen
fd9af2f017
Merge "Overview - update Clear All and Empty message drawing" into sc-dev
2021-04-06 17:42:05 +00:00
TreeHugger Robot
46099a47e0
Merge "Update device padding to allocate more space to workspaceBottomPAdding." into sc-dev am: d69407c02e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14095430
Change-Id: Iec72085cd15f466fcd7e2ffe7e1f0a40e7f5c816
2021-04-06 17:36:26 +00:00
Tony Wickham
fbdb50aa48
Fix HINT_STATE not tracking the entire height of the screen
...
Explicitly use DeviceProfile#heightPx instead of getShiftRange(),
which might be less depending on AllAppsTransitionController
Test: swipe up from bottom on home, ensure workspace scales down
as the gesture goes all the way to the top of the screen
Change-Id: I9c2988d361c22d437c7eb9bea8ed715d06054c59
2021-04-06 10:09:44 -07:00
TreeHugger Robot
d69407c02e
Merge "Update device padding to allocate more space to workspaceBottomPAdding." into sc-dev
2021-04-06 16:55:33 +00:00
Samuel Fufa
5461089baa
[Search][Layout] Fix blank space when predictions are disabled
...
This regression is caused due to getExpectedHeight relying on view visibility state while AlphaUpdateListener.updateVisibility was reseting the views visibility.
Bug: 184211402
Test: local
Change-Id: Ib756f5eb8f6356a18a025626008b97fd7c77fec9
2021-04-06 04:05:20 -05:00
Samuel Fufa
ac120c9a47
[Search] make AbstractSlideinView#createColorScrim overridable
...
+ Introduce feature flag for people tile results
Bug: 183972880
Bug: 184003600
Test: Manual
Change-Id: Ia8b3af4e99a66f640f6f42fc5886d9cbfb5e913c
2021-04-06 03:18:07 -05:00
TreeHugger Robot
18210721e7
Merge "[Hotseat] Don't show hotseat edu in tests" into sc-dev am: ce271c1067
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14094674
Change-Id: Ib625be5cb0a041e476bc84cc9097d0e7367daa7c
2021-04-06 06:49:45 +00:00
TreeHugger Robot
ce271c1067
Merge "[Hotseat] Don't show hotseat edu in tests" into sc-dev
2021-04-06 06:18:56 +00:00
Winson Chung
7700bffc47
Fix noisy log from sysui flag changes
...
Bug: 144854916
Test: Logcat after sysui flag changes, ensure no tracing change logs
Change-Id: I36b6b71bae08303787508ab6eb63ca989866370c
2021-04-06 04:38:03 +00:00