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

am d59b0aaf: Merge "Not enforcing a timeout anymore for talkback users" into lmp-dev

Browse Source 
* commit 'd59b0aafe0200b4a7b685534ed3e049ec9b7f0fc':
  Not enforcing a timeout anymore for talkback users
This commit is contained in:
Selim Cinek
2014-09-01 11:17:21 +00:00
committed by Android Git Automerger
parent 77bc49306c 6531ae2fcd
commit 9132ced866
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
View File

@@ -96,7 +96,6 @@ public class VolumePanel extends Handler {
private static final int TIMEOUT_DELAY_SHORT = 1500;
private static final int TIMEOUT_DELAY_COLLAPSED = 4500;
private static final int TIMEOUT_DELAY_SAFETY_WARNING = 5000;
private static final int TIMEOUT_DELAY_SAFETY_WARNING_TALKBACK = 25000;
private static final int TIMEOUT_DELAY_EXPANDED = 10000;
private static final int MSG_VOLUME_CHANGED = 0;
@@ -794,8 +793,7 @@ public class VolumePanel extends Handler {
}
private void updateTimeoutDelay() {
mTimeoutDelay = sSafetyWarning != null ? mAccessibilityManager.isEnabled() ?
TIMEOUT_DELAY_SAFETY_WARNING_TALKBACK : TIMEOUT_DELAY_SAFETY_WARNING
mTimeoutDelay = sSafetyWarning != null ? TIMEOUT_DELAY_SAFETY_WARNING
: mActiveStreamType == AudioManager.STREAM_MUSIC ? TIMEOUT_DELAY_SHORT
: mZenPanelExpanded ? TIMEOUT_DELAY_EXPANDED
: isZenPanelVisible() ? TIMEOUT_DELAY_COLLAPSED
@@ -1218,8 +1216,12 @@ public class VolumePanel extends Handler {
}
updateStates();
}
updateTimeoutDelay();
resetTimeout();
if (mAccessibilityManager.isTouchExplorationEnabled()) {
removeMessages(MSG_TIMEOUT);
} else {
updateTimeoutDelay();
resetTimeout();
}
}
/**
@@ -1373,10 +1375,12 @@ public class VolumePanel extends Handler {
private void resetTimeout() {
if (LOGD) Log.d(mTag, "resetTimeout at " + System.currentTimeMillis()
+ " delay=" + mTimeoutDelay);
removeMessages(MSG_TIMEOUT);
sendEmptyMessageDelayed(MSG_TIMEOUT, mTimeoutDelay);
removeMessages(MSG_USER_ACTIVITY);
sendEmptyMessage(MSG_USER_ACTIVITY);
if (sSafetyWarning == null || !mAccessibilityManager.isTouchExplorationEnabled()) {
removeMessages(MSG_TIMEOUT);
sendEmptyMessageDelayed(MSG_TIMEOUT, mTimeoutDelay);
removeMessages(MSG_USER_ACTIVITY);
sendEmptyMessage(MSG_USER_ACTIVITY);
}
}
private void forceTimeout(long delay) {