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

Commit e66e6419 authored by Ben Chung's avatar Ben Chung
Browse files

Add accessibility shortcuts fragment in a11y settings 

Accessibility settings category restructure, add accessibility shortcuts
fragment for related accessibility services.

Bug: 174829936
Test: atest AccessibilityShortcutsFragmentTest, atest AccessibilitySettingsTest
Change-Id: I9706906863872bc60d31eae54bbf3a35d70e812e
parent f969007c

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5254,6 +5254,8 @@ 
    <string name="accessibility_summary_state_stopped">Not working. Tap for info.</string>

    <!-- Accessibility service's description when enabled but not running (like maybe it crashed). -->

    <string name="accessibility_description_state_stopped">This service is malfunctioning.</string>

    <!-- Title for the accessibility shortcuts settings page. [CHAR LIMIT=50] -->

    <string name="accessibility_shortcuts_settings_title">Accessibility shortcuts</string>









    <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->









    <string name="enable_quick_setting">Show in Quick Settings</string>
































res/xml/accessibility_settings.xml



+20
−9






























Original line number
Diff line number
Diff line







@@ -29,15 +29,7 @@







    <PreferenceCategory









        android:key="screen_reader_category"









        android:persistent="false"









        android:title="@string/screen_reader_category_title">



















        <Preference









            android:fragment="com.android.settings.tts.TextToSpeechSettings"









            android:key="tts_settings_preference"









            android:persistent="false"









            android:title="@string/tts_settings_title"









            settings:controller="com.android.settings.language.TtsPreferenceController"/>









    </PreferenceCategory>









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



















    <PreferenceCategory









        android:key="display_category"








@@ -129,6 +121,25 @@

















    </PreferenceCategory>



















    <!-- TODO(b/174829936): Add title for shortcuts settings category. -->









    <PreferenceCategory android:persistent="false">



















        <Preference









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









            android:key="accessibility_shortcuts_preference_screen"









            android:persistent="false"









            android:title="@string/accessibility_shortcuts_settings_title"









            settings:searchable="true"/>



















        <Preference









            android:fragment="com.android.settings.tts.TextToSpeechSettings"









            android:key="tts_settings_preference"









            android:persistent="false"









            android:title="@string/tts_settings_title"









            settings:controller="com.android.settings.language.TtsPreferenceController"/>



















    </PreferenceCategory>



















    <PreferenceCategory









        android:key="experimental_category"









        android:persistent="false"
































res/xml/accessibility_shortcuts_settings.xml
0 → 100644



+30
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!-- Copyright (C) 2021 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.









-->



















<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:key="accessibility_shortcuts_settings"









    android:persistent="false"









    android:title="@string/accessibility_shortcuts_settings_title">



















    <SwitchPreference









        android:key="accessibility_shortcut_preference"









        android:persistent="false"









        android:title="@string/accessibility_shortcut_service_on_lock_screen_title"









        android:summary="@string/accessibility_shortcut_description"









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









</PreferenceScreen>
























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



+13
−0






























Original line number
Diff line number
Diff line







@@ -372,6 +372,9 @@ public class AccessibilitySettings extends DashboardFragment {







        } else {









            getPreferenceScreen().addPreference(downloadedServicesCategory);









        }



















        // Hide screen reader category if it is empty.









        updatePreferenceCategoryVisibility(CATEGORY_SCREEN_READER);









    }



















    private List<RestrictedPreference> getInstalledAccessibilityList(Context context) {








@@ -452,6 +455,16 @@ public class AccessibilitySettings extends DashboardFragment {







        }









    }



















    /**









     * Updates the visibility of a category according to its child preference count.









     *









     * @param categoryKey The key of the category which needs to check









     */









    private void updatePreferenceCategoryVisibility(String categoryKey) {









        final PreferenceCategory category = mCategoryToPrefCategoryMap.get(categoryKey);









        category.setVisible(category.getPreferenceCount() != 0);









    }



















    /**









     * Updates preferences related to system configurations.









     */
































src/com/android/settings/accessibility/ShortcutsSettingsFragment.java
0 → 100644



+48
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2021 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.app.settings.SettingsEnums;



















import com.android.settings.R;









import com.android.settings.dashboard.DashboardFragment;









import com.android.settings.search.BaseSearchIndexProvider;



















/** Accessibility settings for accessibility shortcuts. */









public class ShortcutsSettingsFragment extends DashboardFragment {



















    private static final String TAG = "ShortcutsSettingsFragment";



















    @Override









    public int getMetricsCategory() {









        return SettingsEnums.ACCESSIBILITY_SHORTCUTS_SETTINGS;









    }



















    @Override









    protected int getPreferenceScreenResId() {









        return R.xml.accessibility_shortcuts_settings;









    }



















    @Override









    protected String getLogTag() {









        return TAG;









    }



















    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =









            new BaseSearchIndexProvider(R.xml.accessibility_shortcuts_settings);



















}