diff options
| author | Tony Wickham <twickham@google.com> | 2021-08-13 17:03:55 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2021-08-23 15:33:43 -0700 |
| commit | dd7a418335c791b5fa2d615dad14ddc22dbdaa09 (patch) | |
| tree | 0c385d563daa07d480bbcff1a23cc8ffffd33209 /quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java | |
| parent | c8295216d5904634ee3858668e9e763334e2bab0 (diff) | |
Draw rounded corners above the taskbar
- Increase height of taskbar window, but not contentInsets
- Draw the inverted corners as part of TaskbarDragLayer#dispatchDraw() (which handles the background already)
Test: visual
Bug: 196257194
Fixes: 197129604
Change-Id: I517949a4c2b97c92e3bb43408776db6deb1379b4
Diffstat (limited to 'quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 6b95f08090..1882762a67 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -165,8 +165,9 @@ public class TaskbarViewController { int offsetY = launcherDp.getTaskbarOffsetY(); setter.setFloat(mTaskbarIconTranslationYForHome, VALUE, -offsetY, LINEAR); - int collapsedHeight = mActivity.getDeviceProfile().taskbarSize; - int expandedHeight = collapsedHeight + offsetY; + int collapsedHeight = mActivity.getDefaultTaskbarWindowHeight(); + int expandedHeight = Math.max(collapsedHeight, + mActivity.getDeviceProfile().taskbarSize + offsetY); setter.addOnFrameListener(anim -> mActivity.setTaskbarWindowHeight( anim.getAnimatedFraction() > 0 ? expandedHeight : collapsedHeight)); |