Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4681ef2b authored by Peter_Liang's avatar Peter_Liang
Browse files

New feature “Text and reading options” for SetupWizard, Wallpaper, and Settings (10/n). 

- Create the font size LabeledSeekBarPreference and add the entry
1) It's integrated with the system font scale configurations.
2) Create the new PreviewSizeSeekBarController component for controlling the LabeledSeekBarPreference of the display/font size.
3) Create the new PreviewSizeData component to store the configurations related to the display/font size features.

Bug: 211503117
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest

Change-Id: I0c1cf6d0425c5c8b61cc8ed0c9fedadf7a65bd27
parent 0ee078d3

res/xml/accessibility_text_reading_options.xml

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,16 @@ 
    android:persistent="false"

    android:title="@string/accessibility_text_reading_options_title">



    <com.android.settings.widget.LabeledSeekBarPreference

        android:key="font_size"

        android:selectable="false"

        android:summary="@string/short_summary_font_size"

        android:title="@string/title_font_size"

        settings:iconEnd="@drawable/ic_add_24dp"

        settings:iconEndContentDescription="@string/font_size_make_larger_desc"

        settings:iconStart="@drawable/ic_remove_24dp"

        settings:iconStartContentDescription="@string/font_size_make_smaller_desc"/>



    <SwitchPreference

        android:key="toggle_force_bold_text"

        android:persistent="false"

src/com/android/settings/accessibility/FontSizeData.java

0 → 100644
+58 −0
Original line number Diff line number Diff line 
/*

 * 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 static com.android.settings.display.ToggleFontSizePreferenceFragment.fontSizeValueToIndex;



import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.provider.Settings;



import com.android.settings.R;



import java.util.Arrays;

import java.util.List;

import java.util.stream.Collectors;



/**

 * Data class for storing the configurations related to the font size.

 */

final class FontSizeData extends PreviewSizeData<Float> {

    private static final float FONT_SCALE_DEF_VALUE = 1.0f;



    FontSizeData(Context context) {

        super(context);



        final Resources resources = getContext().getResources();

        final ContentResolver resolver = getContext().getContentResolver();

        final List<String> strEntryValues =

                Arrays.asList(resources.getStringArray(R.array.entryvalues_font_size));

        setDefaultValue(FONT_SCALE_DEF_VALUE);

        final float currentScale =

                Settings.System.getFloat(resolver, Settings.System.FONT_SCALE, getDefaultValue());

        setInitialIndex(fontSizeValueToIndex(currentScale, strEntryValues.toArray(new String[0])));

        setValues(strEntryValues.stream().map(Float::valueOf).collect(Collectors.toList()));

    }



    @Override

    void commit(int currentProgress) {

        final ContentResolver resolver = getContext().getContentResolver();

        Settings.System.putFloat(resolver, Settings.System.FONT_SCALE,

                getValues().get(currentProgress));

    }

}

src/com/android/settings/accessibility/PreviewSizeData.java

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * 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 androidx.annotation.NonNull;



import java.util.List;



/**

 * Abstract data class for storing and fetching the configurations related to the preview of the

 * text and reading options.

 */

abstract class PreviewSizeData<T extends Number> {

    private final Context mContext;

    private int mInitialIndex;

    private T mDefaultValue;

    private List<T> mValues;



    PreviewSizeData(@NonNull Context context) {

        mContext = context;

    }



    Context getContext() {

        return mContext;

    }



    List<T> getValues() {

        return mValues;

    }



    void setValues(List<T> values) {

        mValues = values;

    }



    T getDefaultValue() {

        return mDefaultValue;

    }



    void setDefaultValue(T defaultValue) {

        mDefaultValue = defaultValue;

    }



    int getInitialIndex() {

        return mInitialIndex;

    }



    void setInitialIndex(int initialIndex) {

        mInitialIndex = initialIndex;

    }



    /**

     * Persists the selected size.

     */

    abstract void commit(int currentProgress);

}

src/com/android/settings/accessibility/PreviewSizeSeekBarController.java

0 → 100644
+113 −0
Original line number Diff line number Diff line 
/*

 * 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.widget.SeekBar;



import androidx.annotation.NonNull;

import androidx.preference.PreferenceScreen;



import com.android.settings.core.BasePreferenceController;

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 {

    private final PreviewSizeData<? extends Number> mSizeData;

    private boolean mSeekByTouch;

    private ProgressInteractionListener mInteractionListener;



    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();

                    }

                }



                @Override

                public void onStartTrackingTouch(SeekBar seekBar) {

                    mSeekByTouch = true;

                }



                @Override

                public void onStopTrackingTouch(SeekBar seekBar) {

                    mSeekByTouch = false;



                    if (mInteractionListener != null) {

                        mInteractionListener.onEndTrackingTouch();

                    }

                }

            };



    PreviewSizeSeekBarController(Context context, String preferenceKey,

            @NonNull PreviewSizeData<? extends Number> sizeData) {

        super(context, preferenceKey);

        mSizeData = sizeData;

    }



    void setInteractionListener(ProgressInteractionListener interactionListener) {

        mInteractionListener = interactionListener;

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



        final int dataSize = mSizeData.getValues().size();

        final int initialIndex = mSizeData.getInitialIndex();

        final LabeledSeekBarPreference seekBarPreference =

                screen.findPreference(getPreferenceKey());



        seekBarPreference.setMax(dataSize - 1);

        seekBarPreference.setProgress(initialIndex);

        seekBarPreference.setContinuousUpdates(true);

        seekBarPreference.setOnSeekBarChangeListener(mSeekBarChangeListener);

    }



    /**

     * Interface for callbacks when users interact with the seek bar.

     */

    interface ProgressInteractionListener {



        /**

         * Called when the progress is changed.

         */

        void notifyPreferenceChanged();



        /**

         * Called when the progress is changed without tracking touch.

         */

        void onProgressChanged();



        /**

         * Called when the seek bar is end tracking.

         */

        void onEndTrackingTouch();

    }

}

src/com/android/settings/accessibility/TextReadingPreferenceFragment.java

+16 −0
Original line number Diff line number Diff line
@@ -17,12 +17,17 @@ 
package com.android.settings.accessibility;



import android.app.settings.SettingsEnums;

import android.content.Context;



import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.search.SearchIndexable;



import java.util.ArrayList;

import java.util.List;



/**

 * Accessibility settings for adjusting the system features which are related to the reading. For

 * example, bold text, high contrast text, display size, font size and so on.
@@ -30,6 +35,7 @@ import com.android.settingslib.search.SearchIndexable; 
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class TextReadingPreferenceFragment extends DashboardFragment {

    private static final String TAG = "TextReadingPreferenceFragment";

    private static final String FONT_SIZE_KEY = "font_size";



    @Override

    protected int getPreferenceScreenResId() {
@@ -46,6 +52,16 @@ public class TextReadingPreferenceFragment extends DashboardFragment { 
        return SettingsEnums.ACCESSIBILITY_TEXT_READING_OPTIONS;

    }



    @Override

    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        final FontSizeData fontSizeData = new FontSizeData(context);



        controllers.add(new PreviewSizeSeekBarController(context, FONT_SIZE_KEY, fontSizeData));



        return controllers;

    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.accessibility_text_reading_options);

}