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

Commit a6308c09 authored by Kevin Chang's avatar Kevin Chang
Browse files

Change string of switchbar and installed service category title 

Bug: 122897712
Test: Visual
Change-Id: I0f56b4b7375e651a74189dd17e6b3bd8b99ccfca
parent ccf97154

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -4685,7 +4685,7 @@ 
    <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->

    <string name="interaction_control_category_title">Interaction controls</string>

    <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->

    <string name="user_installed_services_category_title">Downloaded services</string>

    <string name="user_installed_services_category_title">Downloaded apps</string>

    <!-- Title for the accessibility preference category of settings considered to be experimental, meaning they might be changed or removed in the future. [CHAR LIMIT=50] -->

    <string name="experimental_category_title">Experimental</string>

    <!-- Title for feature flags dashboard where developers can turn on experimental features [CHAR LIMIT=50] -->
@@ -4809,7 +4809,7 @@ 
    <!-- Title for accessibility preference for configuring touch feedback vibrations. -->

    <string name="accessibility_touch_vibration_title">Touch feedback</string>

    <!-- Used in the acessibilty service settings to control turning on/off the service entirely -->

    <string name="accessibility_service_master_switch_title">Use service</string>

    <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>

    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->

    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>

    <!-- Used in the Captions settings screen to control turning on/off the feature entirely -->

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

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.preference.SwitchPreference; 


import com.android.internal.accessibility.AccessibilityShortcutController;

import com.android.settings.R;

import com.android.settings.widget.SwitchBar;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.search.Indexable;

import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -126,6 +127,13 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer 
        updatePreferences();

    }



    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,

                getString(R.string.accessibility_global_gesture_preference_title));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

    }



    private void updatePreferences() {

        ContentResolver cr = getContentResolver();

        Context context = getContext();

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

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.accessibility.AccessibilityManager; 
import com.android.internal.widget.LockPatternUtils;

import com.android.settings.R;

import com.android.settings.password.ConfirmDeviceCredentialActivity;

import com.android.settings.widget.SwitchBar;

import com.android.settings.widget.ToggleSwitch;

import com.android.settings.widget.ToggleSwitch.OnBeforeCheckedChangeListener;

import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -211,6 +212,15 @@ public class ToggleAccessibilityServicePreferenceFragment extends ToggleFeatureP 
        }

    }



    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        final AccessibilityServiceInfo info = getAccessibilityServiceInfo();

        final String switchBarText = (info == null) ? "" :

                getString(R.string.accessibility_service_master_switch_title,

                info.getResolveInfo().loadLabel(getPackageManager()));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

    }



    private void updateSwitchBarToggleSwitch() {

        final boolean checked = AccessibilityUtils.getEnabledServicesFromSettings(getActivity())

                .contains(mComponentName);

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

+7 −0
Original line number Diff line number Diff line
@@ -172,6 +172,13 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr 
        return false;

    }



    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,

                getString(R.string.accessibility_autoclick_preference_title));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

    }



    /**

     * Converts seek bar preference progress value to autoclick delay associated with it.

     */

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

+3 −2
Original line number Diff line number Diff line
@@ -105,8 +105,9 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF 


    @Override

    protected void updateSwitchBarText(SwitchBar switchBar) {

        switchBar.setSwitchBarText(R.string.accessibility_daltonizer_master_switch_title,

                R.string.accessibility_daltonizer_master_switch_title);

        final String switchBarText = getString(R.string.accessibility_service_master_switch_title,

                getString(R.string.accessibility_display_daltonizer_preference_title));

        switchBar.setSwitchBarText(switchBarText, switchBarText);

    }



    private void initPreferences() {