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

Commit 5da94319 authored by Mill Chen's avatar Mill Chen
Browse files

Separate text contrast preference controller from accessibility 

Bug: 135056871
Test: manual, robotests
Change-Id: Ia28d8038f341a1a74385d168f78da8a10cca8fcd
parent 01823a53

res/xml/accessibility_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ 


        <SwitchPreference

            android:key="toggle_high_text_contrast_preference"

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

            android:title="@string/accessibility_toggle_high_text_contrast_preference_title"

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



        <Preference

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

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

+1 −22
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
    };



    // Preferences

    private static final String TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE =

            "toggle_high_text_contrast_preference";

    private static final String TOGGLE_INVERSION_PREFERENCE =

            "toggle_inversion_preference";

    private static final String TOGGLE_POWER_BUTTON_ENDS_CALL_PREFERENCE =
@@ -200,7 +198,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
    private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =

            new ArrayMap<>();



    private SwitchPreference mToggleHighTextContrastPreference;

    private SwitchPreference mTogglePowerButtonEndsCallPreference;

    private SwitchPreference mToggleLargePointerIconPreference;

    private SwitchPreference mToggleDisableAnimationsPreference;
@@ -315,10 +312,7 @@ public class AccessibilitySettings extends DashboardFragment implements 


    @Override

    public boolean onPreferenceTreeClick(Preference preference) {

        if (mToggleHighTextContrastPreference == preference) {

            handleToggleTextContrastPreferenceClick();

            return true;

        } else if (mTogglePowerButtonEndsCallPreference == preference) {

        if (mTogglePowerButtonEndsCallPreference == preference) {

            handleTogglePowerButtonEndsCallPreferenceClick();

            return true;

        } else if (mToggleLargePointerIconPreference == preference) {
@@ -367,12 +361,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
                        DeviceConfig.NAMESPACE_TELEPHONY, RAMPING_RINGER_ENABLED, false);

    }



    private void handleToggleTextContrastPreferenceClick() {

        Settings.Secure.putInt(getContentResolver(),

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,

                (mToggleHighTextContrastPreference.isChecked() ? 1 : 0));

    }



    private void handleTogglePowerButtonEndsCallPreferenceClick() {

        Settings.Secure.putInt(getContentResolver(),

                Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
@@ -398,10 +386,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
            mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory);

        }



        // Text contrast.

        mToggleHighTextContrastPreference =

                (SwitchPreference) findPreference(TOGGLE_HIGH_TEXT_CONTRAST_PREFERENCE);



        // Display inversion.

        mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
@@ -680,11 +664,6 @@ public class AccessibilitySettings extends DashboardFragment implements 
            displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);

        }



        // Text contrast.

        mToggleHighTextContrastPreference.setChecked(

                Settings.Secure.getInt(getContentResolver(),

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



        // Dark Mode

        mDarkUIPreferenceController.updateState(mDarkUIModePreference);

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

0 → 100644
+46 −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.core.TogglePreferenceController;



public class HighTextContrastPreferenceController extends TogglePreferenceController {



    public HighTextContrastPreferenceController(Context context, String preferenceKey) {

        super(context, preferenceKey);

    }



    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

    }



    @Override

    public boolean isChecked() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

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

    }



    @Override

    public boolean setChecked(boolean isChecked) {

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

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, (isChecked ? 1 : 0));

    }

}

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

0 → 100644
+96 −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 androidx.preference.SwitchPreference;



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 HighTextContrastPreferenceControllerTest {



    private static final int ON = 1;

    private static final int OFF = 0;

    private static final int UNKNOWN = -1;



    private Context mContext;

    private SwitchPreference mPreference;

    private HighTextContrastPreferenceController mController;



    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mPreference = new SwitchPreference(mContext);

        mController = new HighTextContrastPreferenceController(mContext, "text_contrast");

    }



    @Test

    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {

        assertThat(mController.getAvailabilityStatus()).isEqualTo(

                BasePreferenceController.AVAILABLE);

    }



    @Test

    public void isChecked_enabledTextContrast_shouldReturnTrue() {

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

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ON);



        mController.updateState(mPreference);



        assertThat(mController.isChecked()).isTrue();

        assertThat(mPreference.isChecked()).isTrue();

    }



    @Test

    public void isChecked_disabledTextContrast_shouldReturnFalse() {

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

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, OFF);



        mController.updateState(mPreference);



        assertThat(mController.isChecked()).isFalse();

        assertThat(mPreference.isChecked()).isFalse();

    }



    @Test

    public void setChecked_setTrue_shouldEnableTextContrast() {

        mController.setChecked(true);



        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(ON);



    }



    @Test

    public void setChecked_setFalse_shouldDisableTextContrast() {

        mController.setChecked(false);



        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(OFF);

    }

}