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

Commit d3cc241c authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "[Material Next] Update main feature switch for Caption preferences." into sc-dev

parents 2fcb8531 b4558c96

res/xml/captioning_settings.xml

+6 −8
Original line number Diff line number Diff line
@@ -21,22 +21,20 @@ 
    android:persistent="false"

    android:title="@string/accessibility_captioning_title">



    <com.android.settings.widget.SettingsMainSwitchPreference

        android:key="captioning_preference_switch"

        android:persistent="false"

        android:summary="@string/accessibility_caption_primary_switch_summary"

        android:title="@string/accessibility_caption_primary_switch_title" />



    <com.android.settingslib.widget.LayoutPreference

        android:key="captions_preview"

        android:layout="@layout/accessibility_captions_preview"

        android:persistent="false"

        android:selectable="false"

        android:title="@string/summary_placeholder"

        settings:allowDividerBelow="true"

        settings:searchable="false" />



    <SwitchPreference

        android:key="captioning_preference_switch"

        android:persistent="false"

        android:summary="@string/accessibility_caption_primary_switch_summary"

        android:title="@string/accessibility_caption_primary_switch_title"

        settings:allowDividerAbove="true" />



    <Preference

        android:fragment="com.android.settings.accessibility.CaptionAppearanceFragment"

        android:key="captioning_caption_appearance"

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

+15 −4
Original line number Diff line number Diff line
@@ -22,15 +22,17 @@ import android.content.Context; 
import android.os.Bundle;

import android.provider.Settings;

import android.view.accessibility.CaptioningManager;

import android.widget.Switch;



import androidx.preference.Preference;

import androidx.preference.Preference.OnPreferenceChangeListener;

import androidx.preference.SwitchPreference;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.widget.SettingsMainSwitchPreference;

import com.android.settingslib.search.SearchIndexable;

import com.android.settingslib.widget.OnMainSwitchChangeListener;



import com.google.common.primitives.Floats;
@@ -40,14 +42,14 @@ import java.util.List; 
/** Settings fragment containing captioning properties. */

@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)

public class CaptionPropertiesFragment extends SettingsPreferenceFragment

        implements OnPreferenceChangeListener {

        implements OnPreferenceChangeListener, OnMainSwitchChangeListener {

    private static final String PREF_SWITCH = "captioning_preference_switch";

    private static final String PREF_TEXT = "captioning_caption_appearance";

    private static final String PREF_MORE = "captioning_more_options";



    private CaptioningManager mCaptioningManager;



    private SwitchPreference mSwitch;

    private SettingsMainSwitchPreference mSwitch;

    private Preference mTextAppearance;

    private Preference mMoreOptions;
@@ -78,7 +80,7 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 
    }



    private void initializeAllPreferences() {

        mSwitch = (SwitchPreference) findPreference(PREF_SWITCH);

        mSwitch = (SettingsMainSwitchPreference) findPreference(PREF_SWITCH);

        mTextAppearance = (Preference) findPreference(PREF_TEXT);

        mMoreOptions = (Preference) findPreference(PREF_MORE);
@@ -88,6 +90,8 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 


    private void installUpdateListeners() {

        mSwitch.setOnPreferenceChangeListener(this);

        mSwitch.addOnSwitchChangeListener(this);



    }



    private void initFontSizeValuesArray() {
@@ -133,4 +137,11 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 


    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.captioning_settings);



    @Override

    public void onSwitchChanged(Switch switchView, boolean isChecked) {

        final ContentResolver cr = getActivity().getContentResolver();

        Settings.Secure.putInt(

                cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, isChecked ? 1 : 0);

    }

}