PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the state didn't reset after the size change and rotation.

Browse Source 
Action:
Immediately take the effect of updating the progress to avoid waiting for receiving the event to delay update.

Bug: 244979646
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I6b78555c8536b666a3f015e41574c65e15879d1d
This commit is contained in:
Peter Liang
2022-12-11 14:35:34 +08:00
parent 2c2a826c3f
commit 3ef603e622
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
View File

@@ -25,6 +25,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.LabeledSeekBarPreference;
import java.util.Optional;
/**
* The controller of {@link LabeledSeekBarPreference} that listens to display size and font size
* settings changes and updates preview size threshold smoothly.
@@ -33,19 +35,24 @@ class PreviewSizeSeekBarController extends BasePreferenceController implements
TextReadingResetController.ResetStateListener {
private final PreviewSizeData<? extends Number> mSizeData;
private boolean mSeekByTouch;
private ProgressInteractionListener mInteractionListener;
private Optional<ProgressInteractionListener> mInteractionListener = Optional.empty();
private LabeledSeekBarPreference mSeekBarPreference;
private final SeekBar.OnSeekBarChangeListener mSeekBarChangeListener =
new SeekBar.OnSeekBarChangeListener() {
@Override
public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
mInteractionListener.notifyPreferenceChanged();
if (!mSeekByTouch && mInteractionListener != null) {
mInteractionListener.onProgressChanged();
if (mInteractionListener.isEmpty()) {
return;
}
final ProgressInteractionListener interactionListener =
mInteractionListener.get();
interactionListener.notifyPreferenceChanged();
if (!mSeekByTouch) {
interactionListener.onProgressChanged();
}
}
@Override
@@ -57,9 +64,7 @@ class PreviewSizeSeekBarController extends BasePreferenceController implements
public void onStopTrackingTouch(SeekBar seekBar) {
mSeekByTouch = false;
if (mInteractionListener != null) {
mInteractionListener.onEndTrackingTouch();
}
mInteractionListener.ifPresent(ProgressInteractionListener::onEndTrackingTouch);
}
};
@@ -70,7 +75,7 @@ class PreviewSizeSeekBarController extends BasePreferenceController implements
}
void setInteractionListener(ProgressInteractionListener interactionListener) {
mInteractionListener = interactionListener;
mInteractionListener = Optional.ofNullable(interactionListener);
}
@Override
@@ -95,6 +100,10 @@ class PreviewSizeSeekBarController extends BasePreferenceController implements
public void resetState() {
final int defaultProgress = mSizeData.getValues().indexOf(mSizeData.getDefaultValue());
mSeekBarPreference.setProgress(defaultProgress);
// Immediately take the effect of updating the progress to avoid waiting for receiving
// the event to delay update.
mInteractionListener.ifPresent(ProgressInteractionListener::onProgressChanged);
}