New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (13/n).
- Add the ResetPreference for controlling all preferences state in the text and reading options page. 1) Create a new interface ResetStateListener for the other preferences. - Link-up between the reset, font size, and display size preferences. Bug: 211503117 Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest Change-Id: Ida773967834e32737b1daac885a2dd71189d32c8
This commit is contained in:
@@ -29,10 +29,12 @@ import com.android.settings.widget.LabeledSeekBarPreference;
|
||||
* The controller of {@link LabeledSeekBarPreference} that listens to display size and font size
|
||||
* settings changes and updates preview size threshold smoothly.
|
||||
*/
|
||||
class PreviewSizeSeekBarController extends BasePreferenceController {
|
||||
class PreviewSizeSeekBarController extends BasePreferenceController implements
|
||||
TextReadingResetController.ResetStateListener {
|
||||
private final PreviewSizeData<? extends Number> mSizeData;
|
||||
private boolean mSeekByTouch;
|
||||
private ProgressInteractionListener mInteractionListener;
|
||||
private LabeledSeekBarPreference mSeekBarPreference;
|
||||
|
||||
private final SeekBar.OnSeekBarChangeListener mSeekBarChangeListener =
|
||||
new SeekBar.OnSeekBarChangeListener() {
|
||||
@@ -81,13 +83,17 @@ class PreviewSizeSeekBarController extends BasePreferenceController {
|
||||
|
||||
final int dataSize = mSizeData.getValues().size();
|
||||
final int initialIndex = mSizeData.getInitialIndex();
|
||||
final LabeledSeekBarPreference seekBarPreference =
|
||||
screen.findPreference(getPreferenceKey());
|
||||
mSeekBarPreference = screen.findPreference(getPreferenceKey());
|
||||
mSeekBarPreference.setMax(dataSize - 1);
|
||||
mSeekBarPreference.setProgress(initialIndex);
|
||||
mSeekBarPreference.setContinuousUpdates(true);
|
||||
mSeekBarPreference.setOnSeekBarChangeListener(mSeekBarChangeListener);
|
||||
}
|
||||
|
||||
seekBarPreference.setMax(dataSize - 1);
|
||||
seekBarPreference.setProgress(initialIndex);
|
||||
seekBarPreference.setContinuousUpdates(true);
|
||||
seekBarPreference.setOnSeekBarChangeListener(mSeekBarChangeListener);
|
||||
@Override
|
||||
public void resetState() {
|
||||
final int defaultProgress = mSizeData.getValues().indexOf(mSizeData.getDefaultValue());
|
||||
mSeekBarPreference.setProgress(defaultProgress);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -16,6 +16,8 @@
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import static com.android.settings.accessibility.TextReadingResetController.ResetStateListener;
|
||||
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.content.Context;
|
||||
|
||||
@@ -27,6 +29,7 @@ import com.android.settingslib.search.SearchIndexable;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Accessibility settings for adjusting the system features which are related to the reading. For
|
||||
@@ -38,6 +41,7 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
|
||||
private static final String FONT_SIZE_KEY = "font_size";
|
||||
private static final String DISPLAY_SIZE_KEY = "display_size";
|
||||
private static final String PREVIEW_KEY = "preview";
|
||||
private static final String RESET_KEY = "reset";
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
@@ -74,6 +78,13 @@ public class TextReadingPreferenceFragment extends DashboardFragment {
|
||||
displaySizeController.setInteractionListener(previewController);
|
||||
controllers.add(displaySizeController);
|
||||
|
||||
final List<ResetStateListener> resetStateListeners =
|
||||
controllers.stream().filter(c -> c instanceof ResetStateListener).map(
|
||||
c -> (ResetStateListener) c).collect(Collectors.toList());
|
||||
final TextReadingResetController resetController =
|
||||
new TextReadingResetController(context, RESET_KEY, resetStateListeners);
|
||||
controllers.add(resetController);
|
||||
|
||||
return controllers;
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,66 @@
|
||||
/*
|
||||
* Copyright (C) 2022 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import android.content.Context;
|
||||
import android.view.View;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.widget.LayoutPreference;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* The controller of the reset button in the text and reading options page.
|
||||
*/
|
||||
class TextReadingResetController extends BasePreferenceController {
|
||||
private final List<ResetStateListener> mListeners;
|
||||
|
||||
TextReadingResetController(Context context, String preferenceKey,
|
||||
@NonNull List<ResetStateListener> listeners) {
|
||||
super(context, preferenceKey);
|
||||
mListeners = listeners;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
final LayoutPreference layoutPreference = screen.findPreference(getPreferenceKey());
|
||||
final View view = layoutPreference.findViewById(R.id.reset_button);
|
||||
view.setOnClickListener(v -> mListeners.forEach(ResetStateListener::resetState));
|
||||
}
|
||||
|
||||
/**
|
||||
* Interface for resetting to default state.
|
||||
*/
|
||||
interface ResetStateListener {
|
||||
/**
|
||||
* Called when the reset button was clicked.
|
||||
*/
|
||||
void resetState();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user