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

Merge "Fix screenshot actions scrolling" into tm-dev

Browse Source
This commit is contained in:
Miranda Kephart
2022-04-01 18:35:38 +00:00
committed by Android (Google) Code Review
parent 7db16524cf 1930d20f8d
commit 111177e96b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java
View File

@@ -49,6 +49,7 @@ public class DraggableConstraintLayout extends ConstraintLayout
private final SwipeDismissHandler mSwipeDismissHandler; private final SwipeDismissHandler mSwipeDismissHandler;
private final GestureDetector mSwipeDetector; private final GestureDetector mSwipeDetector;
private View mActionsContainer; private View mActionsContainer;
private View mActionsContainerBackground;
private SwipeDismissCallbacks mCallbacks; private SwipeDismissCallbacks mCallbacks;
private final DisplayMetrics mDisplayMetrics; private final DisplayMetrics mDisplayMetrics;
@@ -118,7 +119,8 @@ public class DraggableConstraintLayout extends ConstraintLayout
@Override // View @Override // View
protected void onFinishInflate() { protected void onFinishInflate() {
mActionsContainer = findViewById(R.id.actions_container_background); mActionsContainer = findViewById(R.id.actions_container);
mActionsContainerBackground = findViewById(R.id.actions_container_background);
} }
@Override @Override
@@ -129,10 +131,6 @@ public class DraggableConstraintLayout extends ConstraintLayout
return mSwipeDetector.onTouchEvent(ev); return mSwipeDetector.onTouchEvent(ev);
} }
public int getVisibleRight() {
return mActionsContainer.getRight();
}
/** /**
* Cancel current dismissal animation, if any * Cancel current dismissal animation, if any
*/ */
@@ -331,7 +329,7 @@ public class DraggableConstraintLayout extends ConstraintLayout
if (startX > 0 || (startX == 0 && layoutDir == LAYOUT_DIRECTION_RTL)) { if (startX > 0 || (startX == 0 && layoutDir == LAYOUT_DIRECTION_RTL)) {
finalX = mDisplayMetrics.widthPixels; finalX = mDisplayMetrics.widthPixels;
} else { } else {
finalX = -1 * mActionsContainer.getRight(); finalX = -1 * mActionsContainerBackground.getRight();
} }
float distance = Math.abs(finalX - startX); float distance = Math.abs(finalX - startX);