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

Allow customization of display timeout value for volume dialog

Browse Source 
Bug: b/141850913
Test: Local build
Change-Id: I571df53bc458ecbe6c7d70759aa6129501bc03f2
This commit is contained in:
Kamaljeet Maini
2019-10-22 16:49:05 -07:00
parent be00e16458
commit 4a1a68d36d
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CarSystemUI/res/values/integers_car.xml
View File

@@ -34,4 +34,7 @@
<!-- The delay before the unlock dialog pops up --> <!-- The delay before the unlock dialog pops up -->
<integer name="unlock_dialog_delay_ms">0</integer> <integer name="unlock_dialog_delay_ms">0</integer>
<!-- 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>
</resources> </resources>

10
packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
View File

@@ -75,8 +75,6 @@ public class CarVolumeDialogImpl implements VolumeDialog {
private static final String XML_TAG_VOLUME_ITEMS = "carVolumeItems"; private static final String XML_TAG_VOLUME_ITEMS = "carVolumeItems";
private static final String XML_TAG_VOLUME_ITEM = "item"; private static final String XML_TAG_VOLUME_ITEM = "item";
private static final int HOVERING_TIMEOUT = 16000;
private static final int NORMAL_TIMEOUT = 3000;
private static final int LISTVIEW_ANIMATION_DURATION_IN_MILLIS = 250; private static final int LISTVIEW_ANIMATION_DURATION_IN_MILLIS = 250;
private static final int DISMISS_DELAY_IN_MILLIS = 50; private static final int DISMISS_DELAY_IN_MILLIS = 50;
private static final int ARROW_FADE_IN_START_DELAY_IN_MILLIS = 100; private static final int ARROW_FADE_IN_START_DELAY_IN_MILLIS = 100;
@@ -90,6 +88,8 @@ public class CarVolumeDialogImpl implements VolumeDialog {
// Volume items in the RecyclerView. // Volume items in the RecyclerView.
private final List<CarVolumeItem> mCarVolumeLineItems = new ArrayList<>(); private final List<CarVolumeItem> mCarVolumeLineItems = new ArrayList<>();
private final KeyguardManager mKeyguard; private final KeyguardManager mKeyguard;
private final int mNormalTimeout;
private final int mHoveringTimeout;
private Window mWindow; private Window mWindow;
private CustomDialog mDialog; private CustomDialog mDialog;
@@ -175,6 +175,10 @@ public class CarVolumeDialogImpl implements VolumeDialog {
public CarVolumeDialogImpl(Context context) { public CarVolumeDialogImpl(Context context) {
mContext = context; mContext = context;
mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);
mNormalTimeout = mContext.getResources().getInteger(
R.integer.car_volume_dialog_display_normal_timeout);
mHoveringTimeout = mContext.getResources().getInteger(
R.integer.car_volume_dialog_display_hovering_timeout);
} }
private static int getSeekbarValue(CarAudioManager carAudioManager, int volumeGroupId) { private static int getSeekbarValue(CarAudioManager carAudioManager, int volumeGroupId) {
@@ -315,7 +319,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
} }
private int computeTimeoutH() { private int computeTimeoutH() {
return mHovering ? HOVERING_TIMEOUT : NORMAL_TIMEOUT; return mHovering ? mHoveringTimeout : mNormalTimeout;
} }
private void dismissH(int reason) { private void dismissH(int reason) {