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

Merge "Fix media side clipping on large screen portrait" into tm-dev

Browse Source
This commit is contained in:
Fabian Kozynski
2022-05-19 14:31:34 +00:00
committed by Android (Google) Code Review
parent 95d2e13cc1 df16ddc204
commit cf55babfa8
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/qs/QSFragment.java
View File

@@ -97,7 +97,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
private float mLastPanelFraction;
private float mSquishinessFraction = 1;
private boolean mQsDisabled;
private int[] mTemp = new int[2];
private int[] mLocationTemp = new int[2];
private final RemoteInputQuickSettingsDisabler mRemoteInputQuickSettingsDisabler;
private final MediaHost mQsMediaHost;
@@ -653,9 +653,10 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
}
mQSPanelScrollView.setClipBounds(mQsBounds);
mQSPanelScrollView.getLocationOnScreen(mTemp);
int top = mTemp[1];
mQsMediaHost.getCurrentClipping().set(0, top, getView().getMeasuredWidth(),
mQSPanelScrollView.getLocationOnScreen(mLocationTemp);
int left = mLocationTemp[0];
int top = mLocationTemp[1];
mQsMediaHost.getCurrentClipping().set(left, top, left + getView().getMeasuredWidth(),
top + mQSPanelScrollView.getMeasuredHeight()
- mQSPanelScrollView.getPaddingBottom());
}
@@ -800,8 +801,8 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
* the QS container.
*/
private int getQsMinExpansionHeightForSplitShade() {
getView().getLocationOnScreen(mTemp);
int top = mTemp[1];
getView().getLocationOnScreen(mLocationTemp);
int top = mLocationTemp[1];
// We want to get the original top position, so we subtract any translation currently set.
int originalTop = (int) (top - getView().getTranslationY());
// On split shade the QS view doesn't start at the top of the screen, so we need to add the
@@ -865,7 +866,7 @@ public class QSFragment extends LifecycleFragment implements QS, CommandQueue.Ca
indentingPw.println("mLastPanelFraction: " + mLastPanelFraction);
indentingPw.println("mSquishinessFraction: " + mSquishinessFraction);
indentingPw.println("mQsDisabled: " + mQsDisabled);
indentingPw.println("mTemp: " + Arrays.toString(mTemp));
indentingPw.println("mTemp: " + Arrays.toString(mLocationTemp));
indentingPw.println("mShowCollapsedOnKeyguard: " + mShowCollapsedOnKeyguard);
indentingPw.println("mLastKeyguardAndExpanded: " + mLastKeyguardAndExpanded);
indentingPw.println("mState: " + StatusBarState.toString(mState));