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

Commit 08733a27 authored by Michael Bestas's avatar Michael Bestas
Browse files

Settings: Remove screen rotation from accessibility 

We have a more advanced option in display settings

Change-Id: I8be43e899a14d184374b422a381b0db839709fbf
parent 0b2213f4

res/xml/accessibility_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -48,11 +48,6 @@ 
                android:summary="@string/experimental_preference"

                android:persistent="false"/>



        <SwitchPreference

                android:key="toggle_lock_screen_rotation_preference"

                android:title="@string/accelerometer_title"

                android:persistent="false"/>



        <SwitchPreference

                android:key="toggle_speak_password_preference"

                android:title="@string/accessibility_toggle_speak_password_preference_title"

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

+0 −46
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ import android.view.KeyEvent; 
import android.view.accessibility.AccessibilityManager;

import com.android.internal.content.PackageMonitor;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.view.RotationPolicy;

import com.android.internal.view.RotationPolicy.RotationPolicyListener;

import com.android.settings.DialogCreatable;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -82,8 +80,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            "toggle_high_text_contrast_preference";

    private static final String TOGGLE_INVERSION_PREFERENCE =

            "toggle_inversion_preference";

    private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =

            "toggle_lock_screen_rotation_preference";

    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =

            "toggle_speak_password_preference";

    private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
@@ -168,20 +164,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
                }

            };



    private final RotationPolicyListener mRotationPolicyListener = new RotationPolicyListener() {

        @Override

        public void onChange() {

            updateLockScreenRotationCheckbox();

        }

    };



    // Preference controls.

    private PreferenceCategory mServicesCategory;

    private PreferenceCategory mSystemsCategory;



    private SwitchPreference mToggleLargeTextPreference;

    private SwitchPreference mToggleHighTextContrastPreference;

    private SwitchPreference mToggleLockScreenRotationPreference;

    private SwitchPreference mToggleSpeakPasswordPreference;

    private ListPreference mSelectLongPressTimeoutPreference;

    private Preference mNoServicesMessagePreference;
@@ -222,20 +210,12 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 


        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);

        mSettingsContentObserver.register(getContentResolver());

        if (RotationPolicy.isRotationSupported(getActivity())) {

            RotationPolicy.registerRotationPolicyListener(getActivity(),

                    mRotationPolicyListener);

        }

    }



    @Override

    public void onPause() {

        mSettingsPackageMonitor.unregister();

        mSettingsContentObserver.unregister(getContentResolver());

        if (RotationPolicy.isRotationSupported(getActivity())) {

            RotationPolicy.unregisterRotationPolicyListener(getActivity(),

                    mRotationPolicyListener);

        }

        super.onPause();

    }
@@ -271,9 +251,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        } else if (mToggleHighTextContrastPreference == preference) {

            handleToggleTextContrastPreferenceClick();

            return true;

        } else if (mToggleLockScreenRotationPreference == preference) {

            handleLockScreenRotationPreferenceClick();

            return true;

        } else if (mToggleSpeakPasswordPreference == preference) {

            handleToggleSpeakPasswordPreferenceClick();

            return true;
@@ -302,11 +279,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
                (mToggleHighTextContrastPreference.isChecked() ? 1 : 0));

    }



    private void handleLockScreenRotationPreferenceClick() {

        RotationPolicy.setRotationLockForAccessibility(getActivity(),

                !mToggleLockScreenRotationPreference.isChecked());

    }



    private void handleToggleSpeakPasswordPreferenceClick() {

        Settings.Secure.putInt(getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
@@ -353,13 +325,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        mToggleInversionPreference = (SwitchPreference) findPreference(TOGGLE_INVERSION_PREFERENCE);

        mToggleInversionPreference.setOnPreferenceChangeListener(this);



        // Lock screen rotation.

        mToggleLockScreenRotationPreference =

                (SwitchPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);

        if (!RotationPolicy.isRotationSupported(getActivity())) {

            mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);

        }



        // Speak passwords.

        mToggleSpeakPasswordPreference =

                (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
@@ -527,9 +492,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        mToggleInversionPreference.setChecked(Settings.Secure.getInt(getContentResolver(),

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



        // Auto-rotate screen

        updateLockScreenRotationCheckbox();



        // Speak passwords.

        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
@@ -567,14 +529,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
                : R.string.accessibility_feature_state_off);

    }



    private void updateLockScreenRotationCheckbox() {

        Context context = getActivity();

        if (context != null) {

            mToggleLockScreenRotationPreference.setChecked(

                    !RotationPolicy.isRotationLocked(context));

        }

    }



    private void loadInstalledServices() {

        Set<ComponentName> installedServices = sInstalledServices;

        installedServices.clear();