commit e6147842f5a8821a49a89ddecd210a5941d3acf9
author Josh Tsuji <tsuji@google.com> Thu Jun 10 17:41:31 2021 -0400
committer Josh Tsuji <tsuji@google.com> Thu Jun 10 21:56:15 2021 +0000
tree 23031930997ce738ec661799bf65825226d65928
parent 20da155df4d5a7a53153d84b4aa5239226596115

Reinitialize dimens to fix issues with changing display/font size.

Fixes: 189411240
Test: change display size and back without rebooting
Change-Id: Id8b56ab1a8b985bffcc4f087d9e5db70f2a01c5f

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
index 961822a5..ed84a59 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
@@ -151,12 +151,12 @@
 
     private final int mDialogShowAnimationDurationMs;
     private final int mDialogHideAnimationDurationMs;
-    private final int mDialogWidth;
-    private final int mDialogCornerRadius;
-    private final int mRingerDrawerItemSize;
-    private final int mRingerRowsPadding;
-    private final boolean mShowVibrate;
-    private final int mRingerCount;
+    private int mDialogWidth;
+    private int mDialogCornerRadius;
+    private int mRingerDrawerItemSize;
+    private int mRingerRowsPadding;
+    private boolean mShowVibrate;
+    private int mRingerCount;
     private final boolean mShowLowMediaVolumeIcon;
     private final boolean mChangeVolumeRowTintWhenInactive;
 
@@ -288,18 +288,8 @@
                 mDialogRowsView.invalidate();
             };
         }
-        mDialogWidth = mContext.getResources().getDimensionPixelSize(
-                R.dimen.volume_dialog_panel_width);
-        mDialogCornerRadius = mContext.getResources().getDimensionPixelSize(
-                R.dimen.volume_dialog_panel_width_half);
-        mRingerDrawerItemSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.volume_ringer_drawer_item_size);
-        mRingerRowsPadding = mContext.getResources().getDimensionPixelSize(
-                R.dimen.volume_dialog_ringer_rows_padding);
-        mShowVibrate = mController.hasVibrator();
 
-        // Normal, mute, and possibly vibrate.
-        mRingerCount = mShowVibrate ? 3 : 2;
+        initDimens();
     }
 
     @Override
@@ -378,6 +368,8 @@
     private void initDialog() {
         mDialog = new CustomDialog(mContext);
 
+        initDimens();
+
         mConfigurableTexts = new ConfigurableTexts(mContext);
         mHovering = false;
         mShowing = false;
@@ -569,6 +561,21 @@
         initODICaptionsH();
     }
 
+    private void initDimens() {
+        mDialogWidth = mContext.getResources().getDimensionPixelSize(
+                R.dimen.volume_dialog_panel_width);
+        mDialogCornerRadius = mContext.getResources().getDimensionPixelSize(
+                R.dimen.volume_dialog_panel_width_half);
+        mRingerDrawerItemSize = mContext.getResources().getDimensionPixelSize(
+                R.dimen.volume_ringer_drawer_item_size);
+        mRingerRowsPadding = mContext.getResources().getDimensionPixelSize(
+                R.dimen.volume_dialog_ringer_rows_padding);
+        mShowVibrate = mController.hasVibrator();
+
+        // Normal, mute, and possibly vibrate.
+        mRingerCount = mShowVibrate ? 3 : 2;
+    }
+
     protected ViewGroup getDialogView() {
         return mDialogView;
     }