Merge "Enforce min value on panel slices slider" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-04-16 21:18:05 +00:00
committed by Android (Google) Code Review
14 changed files with 108 additions and 30 deletions

View File

@@ -74,4 +74,8 @@ public class AudioHelper {
public int getMaxVolume(int stream) {
return mAudioManager.getStreamMaxVolume(stream);
}
public int getMinVolume(int stream) {
return mAudioManager.getStreamMinVolume(stream);
}
}

View File

@@ -160,7 +160,7 @@ public class RemoteVolumePreferenceController extends VolumeSeekBarPreferenceCon
}
@Override
public int getMaxSteps() {
public int getMax() {
if (mPreference != null) {
return mPreference.getMax();
}
@@ -171,6 +171,14 @@ public class RemoteVolumePreferenceController extends VolumeSeekBarPreferenceCon
return playbackInfo != null ? playbackInfo.getMaxVolume() : 0;
}
@Override
public int getMin() {
if (mPreference != null) {
return mPreference.getMin();
}
return 0;
}
@Override
public boolean isSliceable() {
return TextUtils.equals(getPreferenceKey(), KEY_REMOTE_VOLUME);

View File

@@ -92,13 +92,21 @@ public abstract class VolumeSeekBarPreferenceController extends
}
@Override
public int getMaxSteps() {
public int getMax() {
if (mPreference != null) {
return mPreference.getMax();
}
return mHelper.getMaxVolume(getAudioStream());
}
@Override
public int getMin() {
if (mPreference != null) {
return mPreference.getMin();
}
return mHelper.getMinVolume(getAudioStream());
}
protected abstract int getAudioStream();
protected abstract int getMuteIcon();