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

Commit ff271113 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 b8e846d3

res/xml/accessibility_settings.xml

+0 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ 
                android:title="@string/accessibility_home_button_answers_call_prerefence_title"

                android:persistent="false"/>



        <CheckBoxPreference

                android:key="toggle_lock_screen_rotation_preference"

                android:title="@string/accelerometer_title"

                android:persistent="false"/>



        <CheckBoxPreference

                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
@@ -50,8 +50,6 @@ import android.view.accessibility.AccessibilityManager; 
import android.widget.TextView;



import com.android.internal.content.PackageMonitor;

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;
@@ -93,8 +91,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            "toggle_power_button_ends_call_preference";

    private static final String TOGGLE_HOME_BUTTON_ANSWERS_CALL_PREFERENCE =

            "toggle_home_button_answers_call_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 =
@@ -180,13 +176,6 @@ 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;
@@ -194,7 +183,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
    private CheckBoxPreference mToggleLargeTextPreference;

    private CheckBoxPreference mTogglePowerButtonEndsCallPreference;

    private CheckBoxPreference mToggleHomeButtonAnswersCallPreference;

    private CheckBoxPreference mToggleLockScreenRotationPreference;

    private CheckBoxPreference mToggleSpeakPasswordPreference;

    private ListPreference mSelectLongPressTimeoutPreference;

    private Preference mNoServicesMessagePreference;
@@ -221,20 +209,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();

    }
@@ -262,9 +242,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        } else if (mToggleHomeButtonAnswersCallPreference == preference) {

            handleToggleHomeButtonAnswersCallPreferenceClick();

            return true;

        } else if (mToggleLockScreenRotationPreference == preference) {

            handleLockScreenRotationPreferenceClick();

            return true;

        } else if (mToggleSpeakPasswordPreference == preference) {

            handleToggleSpeakPasswordPreferenceClick();

            return true;
@@ -303,11 +280,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
                        : Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DO_NOTHING));

    }



    private void handleLockScreenRotationPreferenceClick() {

        RotationPolicy.setRotationLockForAccessibility(getActivity(),

                !mToggleLockScreenRotationPreference.isChecked());

    }



    private void handleToggleSpeakPasswordPreferenceClick() {

        Settings.Secure.putInt(getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
@@ -362,13 +334,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            mSystemsCategory.removePreference(mToggleHomeButtonAnswersCallPreference);

        }



        // Lock screen rotation.

        mToggleLockScreenRotationPreference =

                (CheckBoxPreference) findPreference(TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE);

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

            mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);

        }



        // Speak passwords.

        mToggleSpeakPasswordPreference =

                (CheckBoxPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
@@ -536,9 +501,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
            mToggleHomeButtonAnswersCallPreference.setChecked(homeButtonAnswersCall);

        }



        // Auto-rotate screen

        updateLockScreenRotationCheckbox();



        // Speak passwords.

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

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
@@ -583,14 +545,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements 
        }

    }



    private void updateLockScreenRotationCheckbox() {

        Context context = getActivity();

        if (context != null) {

            mToggleLockScreenRotationPreference.setChecked(

                    !RotationPolicy.isRotationLocked(context));

        }

    }



    private void offerInstallAccessibilitySerivceOnce() {

        // There is always one preference - if no services it is just a message.

        if (mServicesCategory.getPreference(0) != mNoServicesMessagePreference) {