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

Commit 4ae89912 authored by Jean Chen's avatar Jean Chen Committed by Android (Google) Code Review
Browse files

Merge "Support caption second UI structure (3/n)"

parents ca149c7d 2c37f45a

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

+0 −7
Original line number Diff line number Diff line
@@ -122,14 +122,7 @@ public class CaptionAppearanceFragment extends SettingsPreferenceFragment 
        refreshPreviewText();

    }



    private void setPreferenceViewEnabled(boolean enabled) {

        for (Preference preference : mPreferenceList) {

            preference.setEnabled(enabled);

        }

    }



    private void refreshPreferenceViewEnabled(boolean enabled) {

        setPreferenceViewEnabled(enabled);

        mPreviewText.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);

    }

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

+0 −13
Original line number Diff line number Diff line
@@ -70,16 +70,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 
        installUpdateListeners();

    }



    private void setPreferenceViewEnabled(boolean enabled) {

        for (Preference preference : mPreferenceList) {

            preference.setEnabled(enabled);

        }

    }



    private void refreshPreferenceViewEnabled(boolean enabled) {

        setPreferenceViewEnabled(enabled);

    }



    private void initializeAllPreferences() {

        mSwitch = (SwitchPreference) findPreference(PREF_SWITCH);

        mTextAppearance = (Preference) findPreference(PREF_TEXT);
@@ -87,8 +77,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 


        mPreferenceList.add(mTextAppearance);

        mPreferenceList.add(mMoreOptions);



        refreshPreferenceViewEnabled(mCaptioningManager.isEnabled());

    }



    private void installUpdateListeners() {
@@ -105,7 +93,6 @@ public class CaptionPropertiesFragment extends SettingsPreferenceFragment 
        if (mSwitch == preference) {

            Settings.Secure.putInt(

                    cr, Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, (boolean) value ? 1 : 0);

            refreshPreferenceViewEnabled((boolean) value);

        }



        return true;