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

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

Revert "Change string of switchbar and installed service category title" 

This reverts commit 7eddb0e4.

Reason for revert: There's some side effects with string.
Create a new CL in master branch to fix it.

Bug: 132840332
Change-Id: I17526a06474d25bdb32beda96f5bb6371f0e5ade
parent 7eddb0e4

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -4806,7 +4806,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 apps</string>

    <string name="user_installed_services_category_title">Downloaded services</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] -->
@@ -4912,7 +4912,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 <xliff:g id="service" example="TalkBack">%1$s</xliff:g></string>

    <string name="accessibility_service_master_switch_title">Use service</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 -->
@@ -5138,7 +5138,7 @@ 
    </string>









    <!-- Title for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->









    <string name="accessibility_service_action_perform_title">View and perform actions</string>









    <string name="accessibility_service_action_perform_title">View and platform actions</string>

















    <!-- Description for the action perform in accessibility dialog. [CHAR LIMIT=NONE] -->









    <string name="accessibility_service_action_perform_description">It can track your interactions
































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



+7
−11






























Original line number
Diff line number
Diff line







@@ -85,16 +85,6 @@ public class ToggleAccessibilityServicePreferenceFragment







        mLockPatternUtils = new LockPatternUtils(getActivity());









    }



















    @Override









    public void onViewCreated(View view, Bundle savedInstanceState) {









        super.onViewCreated(view, savedInstanceState);









        mSwitchBar.setLabelDelegate((boolean isChecked) -> {









            final AccessibilityServiceInfo info = getAccessibilityServiceInfo();









            return getString(R.string.accessibility_service_master_switch_title,









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









        });









    }



















    @Override









    public void onResume() {









        mSettingsContentObserver.register(getContentResolver());








@@ -130,7 +120,7 @@ public class ToggleAccessibilityServicePreferenceFragment







                return serviceInfo;









            }









        }









        throw new IllegalStateException("ServiceInfo is not found.");









        return null;









    }



















    @Override








@@ -138,12 +128,18 @@ public class ToggleAccessibilityServicePreferenceFragment







        switch (dialogId) {









            case DIALOG_ID_ENABLE_WARNING: {









                final AccessibilityServiceInfo info = getAccessibilityServiceInfo();









                if (info == null) {









                    return null;









                }









                mDialog = AccessibilityServiceWarning









                        .createCapabilitiesDialog(getActivity(), info, this);









                break;









            }









            case DIALOG_ID_DISABLE_WARNING: {









                AccessibilityServiceInfo info = getAccessibilityServiceInfo();









                if (info == null) {









                    return null;









                }









                mDialog = AccessibilityServiceWarning









                        .createDisableDialog(getActivity(), info, this);









                break;
































src/com/android/settings/widget/SwitchBar.java



+1
−21






























Original line number
Diff line number
Diff line







@@ -61,16 +61,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC







        void onSwitchChanged(Switch switchView, boolean isChecked);









    }



















    public interface LabelDelegate {









        /**









         * Called to create label and set the title with Accessibility









         * service name to the textView of switchBar.









         *









         * @param isChecked  The checked state of switchView.









         */









        String createLabel(boolean isChecked);









    }



















    private static final int[] XML_ATTRIBUTES = {









            R.attr.switchBarMarginStart,









            R.attr.switchBarMarginEnd,








@@ -100,7 +90,6 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC







    private boolean mDisabledByAdmin;









    private EnforcedAdmin mEnforcedAdmin = null;









    private String mMetricsTag;









    private LabelDelegate mLabelDelegate;





























    public SwitchBar(Context context) {








@@ -189,11 +178,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC







    }



















    public void setTextViewLabelAndBackground(boolean isChecked) {









        if(mLabelDelegate != null) {









            mLabel = mLabelDelegate.createLabel(isChecked);









        } else {









        mLabel = getResources().getString(isChecked ? mOnTextId : mOffTextId);









        }









        setBackgroundColor(isChecked ? mBackgroundActivatedColor : mBackgroundColor);









        updateText();









    }








@@ -398,9 +383,4 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC

















        requestLayout();









    }



















    public void setLabelDelegate(LabelDelegate labelDelegate) {









        mLabelDelegate = labelDelegate;









        setTextViewLabelAndBackground(isChecked());









    }









}