diff options
| author | Bryce Lee <brycelee@google.com> | 2021-08-18 18:44:55 +0000 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2021-08-18 20:50:58 +0000 |
| commit | a997ca437a104ce4702bf3b2a2ac7cb6d8eeb65a (patch) | |
| tree | 4ce1064566c41021103be0bd757bdf64d77ec79d /quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java | |
| parent | 157d3b950d66118c0a76785edf815741ca532ef3 (diff) | |
Revert "Draw rounded corners above the taskbar"
This reverts commit 157d3b950d66118c0a76785edf815741ca532ef3.
Reason for revert: b/197129604
Bug: 197129604
Change-Id: Idf2267528fade23291aedea9787d98601495537c
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, 2 insertions, 3 deletions
diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java index 1882762a67..6b95f08090 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java @@ -165,9 +165,8 @@ public class TaskbarViewController { int offsetY = launcherDp.getTaskbarOffsetY(); setter.setFloat(mTaskbarIconTranslationYForHome, VALUE, -offsetY, LINEAR); - int collapsedHeight = mActivity.getDefaultTaskbarWindowHeight(); - int expandedHeight = Math.max(collapsedHeight, - mActivity.getDeviceProfile().taskbarSize + offsetY); + int collapsedHeight = mActivity.getDeviceProfile().taskbarSize; + int expandedHeight = collapsedHeight + offsetY; setter.addOnFrameListener(anim -> mActivity.setTaskbarWindowHeight( anim.getAnimatedFraction() > 0 ? expandedHeight : collapsedHeight)); |