aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update bubble bar bounds in shell

Browse Source 
Shell keeps track of bubble bar bounds for positioning and animating the
expanded view.
Bubble bar location can be changed when dragging the expanded view or
bubble bar itself.
Previously bounds were only reported when expanding a bubble. But after
adding drag support, bounds can change outside of expand action.
Implement a new bubbles API to report bubble bar bounds to shell
whenever they change in launcher.
Keep track of last reported bounds to ensure that we only send bounds
over when they change and when expand API has not already reported the
bounds.

Bug: 332423960
Flag: ACONFIG com.android.wm.shell.enable_bubble_bar DEVELOPMENT
Test: drag expanded bubble from one side to the other, collapse it,
  observe that collapse animation collapses the view into the bar
Change-Id: If1bf31a04b8f134a1b055fddccd276e924ed98b6
This commit is contained in:
Ats Jenk
2024-04-02 16:23:45 -07:00
parent 96e4511d1a
commit f628796fc6
3 changed files with 72 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarController.java
View File

@@ -151,6 +151,9 @@ public class BubbleBarController extends IBubblesListener.Stub {
private BubbleStashController mBubbleStashController;
private BubbleStashedHandleViewController mBubbleStashedHandleViewController;
// Keep track of bubble bar bounds sent to shell to avoid sending duplicate updates
private final Rect mLastSentBubbleBarBounds = new Rect();
/**
* Similar to {@link BubbleBarUpdate} but rather than {@link BubbleInfo}s it uses
* {@link BubbleBarBubble}s so that it can be used to update the views.
@@ -221,6 +224,7 @@ public class BubbleBarController extends IBubblesListener.Stub {
!sBubbleBarEnabled || mBubbles.isEmpty());
mBubbleBarViewController.setUpdateSelectedBubbleAfterCollapse(
key -> setSelectedBubbleInternal(mBubbles.get(key)));
mBubbleBarViewController.setBoundsChangeListener(this::onBubbleBarBoundsChanged);
});
}
@@ -426,7 +430,9 @@ public class BubbleBarController extends IBubblesListener.Stub {
info.getFlags() | Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION);
mSelectedBubble.getView().updateDotVisibility(true /* animate */);
}
mSystemUiProxy.showBubble(getSelectedBubbleKey(), getExpandedBubbleBarDisplayBounds());
Rect bounds = getExpandedBubbleBarDisplayBounds();
mLastSentBubbleBarBounds.set(bounds);
mSystemUiProxy.showBubble(getSelectedBubbleKey(), bounds);
} else {
Log.w(TAG, "Trying to show the selected bubble but it's null");
}
@@ -609,27 +615,39 @@ public class BubbleBarController extends IBubblesListener.Stub {
return mIconFactory.createBadgedIconBitmap(drawable).icon;
}
private void onBubbleBarBoundsChanged(Rect newBounds) {
Rect displayBounds = convertToDisplayBounds(newBounds);
// Only send bounds over if they changed
if (!displayBounds.equals(mLastSentBubbleBarBounds)) {
mLastSentBubbleBarBounds.set(displayBounds);
mSystemUiProxy.setBubbleBarBounds(displayBounds);
}
}
/**
* Get bounds of the bubble bar as if it would be expanded.
* Calculates the bounds instead of retrieving current view location as the view may be
* animating.
*/
private Rect getExpandedBubbleBarDisplayBounds() {
return convertToDisplayBounds(mBarView.getBubbleBarBounds());
}
private Rect convertToDisplayBounds(Rect currentBarBounds) {
Point displaySize = DisplayController.INSTANCE.get(mContext).getInfo().currentSize;
Rect currentBarBounds = mBarView.getBubbleBarBounds();
Rect location = new Rect();
Rect displayBounds = new Rect();
// currentBarBounds is only useful for distance from left or right edge.
// It contains the current bounds, calculate the expanded bounds.
if (mBarView.getBubbleBarLocation().isOnLeft(mBarView.isLayoutRtl())) {
location.left = currentBarBounds.left;
location.right = (int) (currentBarBounds.left + mBarView.expandedWidth());
displayBounds.left = currentBarBounds.left;
displayBounds.right = (int) (currentBarBounds.left + mBarView.expandedWidth());
} else {
location.left = (int) (currentBarBounds.right - mBarView.expandedWidth());
location.right = currentBarBounds.right;
displayBounds.left = (int) (currentBarBounds.right - mBarView.expandedWidth());
displayBounds.right = currentBarBounds.right;
}
final int translation = (int) abs(mBubbleStashController.getBubbleBarTranslationY());
location.top = displaySize.y - currentBarBounds.height() - translation;
location.bottom = displaySize.y - translation;
return location;
displayBounds.top = displaySize.y - currentBarBounds.height() - translation;
displayBounds.bottom = displaySize.y - translation;
return displayBounds;
}
}