diff options
| -rw-r--r-- | packages/CarSystemUI/res/values/integers_car.xml | 2 | ||||
| -rw-r--r-- | packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/packages/CarSystemUI/res/values/integers_car.xml b/packages/CarSystemUI/res/values/integers_car.xml index d6c16cb4180b..ba3d329ef32a 100644 --- a/packages/CarSystemUI/res/values/integers_car.xml +++ b/packages/CarSystemUI/res/values/integers_car.xml @@ -37,4 +37,6 @@ <!-- Timeout values in milliseconds for displaying volume dialog--> <integer name="car_volume_dialog_display_normal_timeout">3000</integer> <integer name="car_volume_dialog_display_hovering_timeout">16000</integer> + <integer name="car_volume_dialog_display_expanded_normal_timeout">6000</integer> + <integer name="car_volume_dialog_display_expanded_hovering_timeout">32000</integer> </resources> diff --git a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java index 0dad8e51ad7d..b1e7f40e7c4b 100644 --- a/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java +++ b/packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java @@ -92,6 +92,8 @@ public class CarVolumeDialogImpl implements VolumeDialog { private final KeyguardManager mKeyguard; private final int mNormalTimeout; private final int mHoveringTimeout; + private final int mExpNormalTimeout; + private final int mExpHoveringTimeout; private Window mWindow; private CustomDialog mDialog; @@ -180,6 +182,10 @@ public class CarVolumeDialogImpl implements VolumeDialog { R.integer.car_volume_dialog_display_normal_timeout); mHoveringTimeout = mContext.getResources().getInteger( R.integer.car_volume_dialog_display_hovering_timeout); + mExpNormalTimeout = mContext.getResources().getInteger( + R.integer.car_volume_dialog_display_expanded_normal_timeout); + mExpHoveringTimeout = mContext.getResources().getInteger( + R.integer.car_volume_dialog_display_expanded_hovering_timeout); } private static int getSeekbarValue(CarAudioManager carAudioManager, int volumeGroupId) { @@ -314,7 +320,11 @@ public class CarVolumeDialogImpl implements VolumeDialog { } private int computeTimeoutH() { - return mHovering ? mHoveringTimeout : mNormalTimeout; + if (mExpanded) { + return mHovering ? mExpHoveringTimeout : mExpNormalTimeout; + } else { + return mHovering ? mHoveringTimeout : mNormalTimeout; + } } private void dismissH(int reason) { @@ -533,6 +543,7 @@ public class CarVolumeDialogImpl implements VolumeDialog { public void onClick(final View v) { mExpandIcon = v; toggleDialogExpansion(true); + rescheduleTimeoutH(); } } |