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

Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-11 19:19:10 +00:00
committed by Android (Google) Code Review
parent 24a94491e4 fa4c8e7a5e
commit 3e4e9e234a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -134,6 +134,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
private boolean mShowA11yStream; private boolean mShowA11yStream;
private int mActiveStream; private int mActiveStream;
private int mPrevActiveStream;
private boolean mAutomute = VolumePrefs.DEFAULT_ENABLE_AUTOMUTE; private boolean mAutomute = VolumePrefs.DEFAULT_ENABLE_AUTOMUTE;
private boolean mSilentMode = VolumePrefs.DEFAULT_ENABLE_SILENT_MODE; private boolean mSilentMode = VolumePrefs.DEFAULT_ENABLE_SILENT_MODE;
private State mState; private State mState;
@@ -626,10 +627,19 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
} }
} }
private boolean shouldBeVisibleH(VolumeRow row, boolean isActive) { private boolean shouldBeVisibleH(VolumeRow row, VolumeRow activeRow) {
boolean isActive = row == activeRow;
if (row.stream == AudioSystem.STREAM_ACCESSIBILITY) { if (row.stream == AudioSystem.STREAM_ACCESSIBILITY) {
return mShowA11yStream; return mShowA11yStream;
} }
// if the active row is accessibility, then continue to display previous
// active row since accessibility is dispalyed under it
if (activeRow.stream == AudioSystem.STREAM_ACCESSIBILITY &&
row.stream == mPrevActiveStream) {
return true;
}
return mExpanded && row.view.getVisibility() == View.VISIBLE return mExpanded && row.view.getVisibility() == View.VISIBLE
|| (mExpanded && (row.important || isActive)) || (mExpanded && (row.important || isActive))
|| !mExpanded && isActive; || !mExpanded && isActive;
@@ -643,7 +653,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
// apply changes to all rows // apply changes to all rows
for (final VolumeRow row : mRows) { for (final VolumeRow row : mRows) {
final boolean isActive = row == activeRow; final boolean isActive = row == activeRow;
final boolean shouldBeVisible = shouldBeVisibleH(row, isActive); final boolean shouldBeVisible = shouldBeVisibleH(row, activeRow);
Util.setVisOrGone(row.view, shouldBeVisible); Util.setVisOrGone(row.view, shouldBeVisible);
Util.setVisOrGone(row.header, shouldBeVisible); Util.setVisOrGone(row.header, shouldBeVisible);
if (row.view.isShown()) { if (row.view.isShown()) {
@@ -686,6 +696,7 @@ public class VolumeDialogImpl implements VolumeDialog, TunerService.Tunable {
} }
if (mActiveStream != state.activeStream) { if (mActiveStream != state.activeStream) {
mPrevActiveStream = mActiveStream;
mActiveStream = state.activeStream; mActiveStream = state.activeStream;
updateRowsH(getActiveRow()); updateRowsH(getActiveRow());
rescheduleTimeoutH(); rescheduleTimeoutH();