summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lujiang Xue <rogerxue@google.com> 2017-08-15 12:29:07 -0700
committer Lujiang Xue <rogerxue@google.com> 2017-08-15 12:29:07 -0700
commita8aae28c12d0c15b02aed26d9de5dade52971b5e (patch)
tree20f8da42831127376e3f4b048a51579b0eb02e86
parentc920506d01ab5a2d6ae8bba9d080c2b976ebd32d (diff)
make updateWidth aware of side margins
Bug: 63716325 Test: build and flash Change-Id: Ia8644737e5377a72c1e6c2eaac1a11a734b8fb31
-rw-r--r--packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 7f5c59585649..04f34d918a0e 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -297,7 +297,8 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
}
private void updateWindowWidthH() {
- final ViewGroup.LayoutParams lp = mDialogView.getLayoutParams();
+ final ViewGroup.MarginLayoutParams lp =
+ (ViewGroup.MarginLayoutParams) mDialogView.getLayoutParams();
final DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
if (D.BUG) Log.d(TAG, "updateWindowWidth dm.w=" + dm.widthPixels);
int w = dm.widthPixels;
@@ -306,7 +307,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
if (w > max) {
w = max;
}
- lp.width = w;
+ lp.width = w - lp.getMarginEnd() - lp.getMarginStart();
mDialogView.setLayoutParams(lp);
}