Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the expanded view height when bar is stashed" into udc-qpr-dev

Browse Source
This commit is contained in:
Liran Binyamin
2023-07-12 14:41:32 +00:00
committed by Android (Google) Code Review
parent a621f8cce2 fab598746f
commit b7a861a4cf
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java
View File

@@ -1075,9 +1075,9 @@ public class BubbleController implements ConfigurationChangeListener,
* <p>This is used by external callers (launcher).
*/
@VisibleForTesting
public void expandStackAndSelectBubbleFromLauncher(String key, int bubbleBarXCoordinate,
int bubbleBarYCoordinate) {
mBubblePositioner.setBubbleBarPosition(bubbleBarXCoordinate, bubbleBarYCoordinate);
public void expandStackAndSelectBubbleFromLauncher(String key, int bubbleBarOffsetX,
int bubbleBarOffsetY) {
mBubblePositioner.setBubbleBarPosition(bubbleBarOffsetX, bubbleBarOffsetY);
if (BubbleOverflow.KEY.equals(key)) {
mBubbleData.setSelectedBubbleFromLauncher(mBubbleData.getOverflow());
@@ -2088,10 +2088,10 @@ public class BubbleController implements ConfigurationChangeListener,
}
@Override
public void showBubble(String key, int bubbleBarXCoordinate, int bubbleBarYCoordinate) {
public void showBubble(String key, int bubbleBarOffsetX, int bubbleBarOffsetY) {
mMainExecutor.execute(
() -> mController.expandStackAndSelectBubbleFromLauncher(
key, bubbleBarXCoordinate, bubbleBarYCoordinate));
key, bubbleBarOffsetX, bubbleBarOffsetY));
}
@Override

13
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java
View File

@@ -718,9 +718,16 @@ public class BubblePositioner {
mShowingInBubbleBar = showingInBubbleBar;
}
/** Sets the position of the bubble bar in screen coordinates. */
public void setBubbleBarPosition(int x, int y) {
mBubbleBarPosition.set(x, y);
/**
* Sets the position of the bubble bar in screen coordinates.
*
* @param offsetX the offset of the bubble bar from the edge of the screen on the X axis
* @param offsetY the offset of the bubble bar from the edge of the screen on the Y axis
*/
public void setBubbleBarPosition(int offsetX, int offsetY) {
mBubbleBarPosition.set(
getAvailableRect().width() - offsetX,
getAvailableRect().height() + mInsets.top + mInsets.bottom - offsetY);
}
/**

3
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/IBubbles.aidl
View File

@@ -29,8 +29,7 @@ interface IBubbles {
oneway void unregisterBubbleListener(in IBubblesListener listener) = 2;
oneway void showBubble(in String key, in int bubbleBarXCoordinate,
in int bubbleBarYCoordinate) = 3;
oneway void showBubble(in String key, in int bubbleBarOffsetX, in int bubbleBarOffsetY) = 3;
oneway void removeBubble(in String key, in int reason) = 4;