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

Commit 7f995a60 authored by Mill Chen's avatar Mill Chen
Browse files

Separate caption preference controller from accessibility 

Bug: 135056871
Test: manual, robotests
Change-Id: Ibcc867f09b6b9cf8cd27b2d93241042b4f88c62d
parent 7a1c50f6

res/xml/accessibility_settings.xml

+3 −2
Original line number Diff line number Diff line
@@ -157,9 +157,10 @@ 
            android:title="@string/accessibility_hearingaid_title"/>



        <Preference

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

            android:key="captioning_preference_screen"

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

            android:title="@string/accessibility_captioning_title"

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

            settings:controller="com.android.settings.accessibility.CaptioningPreferenceController"/>

    </PreferenceCategory>



    <PreferenceCategory

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

+0 −8
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
            "accessibility_shortcut_preference";

    private static final String HEARING_AID_PREFERENCE =

            "hearing_aid_preference";

    private static final String CAPTIONING_PREFERENCE_SCREEN =

            "captioning_preference_screen";

    private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =

            "magnification_preference_screen";

    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
@@ -188,7 +186,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
    private SwitchPreference mToggleLargePointerIconPreference;

    private SwitchPreference mToggleDisableAnimationsPreference;

    private ListPreference mSelectLongPressTimeoutPreference;

    private Preference mCaptioningPreferenceScreen;

    private Preference mDisplayMagnificationPreferenceScreen;

    private Preference mAccessibilityShortcutPreferenceScreen;

    private Preference mDisplayDaltonizerPreferenceScreen;
@@ -370,9 +367,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
        mHearingAidPreference = findPreference(HEARING_AID_PREFERENCE);

        mHearingAidPreferenceController.displayPreference(getPreferenceScreen());



        // Captioning.

        mCaptioningPreferenceScreen = findPreference(CAPTIONING_PREFERENCE_SCREEN);



        // Live caption

        mLiveCaptionPreference = findPreference(LIVE_CAPTION_PREFERENCE_KEY);

        mLiveCaptionPreferenceController.displayPreference(getPreferenceScreen());
@@ -613,8 +607,6 @@ public class AccessibilitySettings extends DashboardFragment implements 


        mLiveCaptionPreferenceController.updateState(mLiveCaptionPreference);



        updateFeatureSummary(Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED,

                mCaptioningPreferenceScreen);

        updateFeatureSummary(Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED,

                mDisplayDaltonizerPreferenceScreen);

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

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

 * Copyright (C) 2019 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.provider.Settings;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



public class CaptioningPreferenceController extends BasePreferenceController {



    public CaptioningPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public CharSequence getSummary() {

        final boolean enabled = Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, 0) == 1;

        final int resId = enabled ? R.string.accessibility_feature_state_on

                : R.string.accessibility_feature_state_off;

        return mContext.getResources().getText(resId);

    }

}

tests/robotests/src/com/android/settings/accessibility/CaptioningPreferenceControllerTest.java

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

 * Copyright (C) 2019 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.google.common.truth.Truth.assertThat;



import android.content.Context;

import android.provider.Settings;



import com.android.settings.R;

import com.android.settings.core.BasePreferenceController;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



@RunWith(RobolectricTestRunner.class)

public class CaptioningPreferenceControllerTest {

    private static final int ON = 1;

    private static final int OFF = 0;



    private Context mContext;

    private CaptioningPreferenceController mController;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mController = new CaptioningPreferenceController(mContext, "captioning_pref");

    }



    @Test

    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {

        assertThat(mController.getAvailabilityStatus())

                .isEqualTo(BasePreferenceController.AVAILABLE);

    }



    @Test

    public void getSummary_enabledCaptions_shouldReturnOnSummary() {

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, ON);



        assertThat(mController.getSummary()).isEqualTo(

                mContext.getText(R.string.accessibility_feature_state_on));

    }



    @Test

    public void getSummary_disabledCaptions_shouldReturnOffSummary() {

        Settings.Secure.putInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, OFF);



        assertThat(mController.getSummary()).isEqualTo(

                mContext.getText(R.string.accessibility_feature_state_off));

    }

}