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

Commit 68d12953 authored by Edgar Wang's avatar Edgar Wang
Browse files

Update learn more string of FooterPrefernce 

Replace FooterPreference#SetLearnMoreContentDescription() with
FooterPreference#SetLearnMoreText().

This is a requirement: All links, controls, and buttons should
also have comprehensible text or tooltip text, so users can identify its
purpose, independent of context, such as when using the URL list from
TalkBack’s local context menu.

Bug: 215045903
Test: manual & robotest
Change-Id: Ib657ba336c5688c1434a58611dea3891001afe14
parent e6389f63

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ public class AccessibilityButtonFooterPreferenceController extends 
    }



    @Override

    protected String getLearnMoreContentDescription() {

    protected String getLearnMoreText() {

        return mContext.getString(

            R.string.accessibility_button_gesture_footer_learn_more_content_description);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public class AccessibilityControlTimeoutFooterPreferenceController extends 
    }



    @Override

    protected String getLearnMoreContentDescription() {

    protected String getLearnMoreText() {

        return mContext.getString(

            R.string.accessibility_control_timeout_footer_learn_more_content_description);

    }

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

+8 −8
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.android.settingslib.HelpUtils; 
public class AccessibilityFooterPreferenceController extends BasePreferenceController {



    private int mHelpResource;

    private String mLearnMoreContentDescription;

    private String mLearnMoreText;

    private String mIntroductionTitle;



    public AccessibilityFooterPreferenceController(Context context, String key) {
@@ -56,9 +56,9 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr 
     * Setups a help item in the {@link AccessibilityFooterPreference} with specific content

     * description.

     */

    public void setupHelpLink(int helpResource, String learnMoreContentDescription) {

    public void setupHelpLink(int helpResource, String learnMoreText) {

        mHelpResource = helpResource;

        mLearnMoreContentDescription = learnMoreContentDescription;

        mLearnMoreText = learnMoreText;

    }



    /**
@@ -73,12 +73,12 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr 


    /**

     * Overrides this if showing a help item in the {@link AccessibilityFooterPreference} with

     * specific content description.

     * specific learn more title.

     *

     * @return the content description for the help url

     * @return learn more title for the help url

     */

    protected String getLearnMoreContentDescription() {

        return mLearnMoreContentDescription;

    protected String getLearnMoreText() {

        return mLearnMoreText;

    }



    /**
@@ -117,7 +117,7 @@ public class AccessibilityFooterPreferenceController extends BasePreferenceContr 
            footerPreference.setLearnMoreAction(view -> {

                view.startActivityForResult(helpIntent, 0);

            });

            footerPreference.setLearnMoreContentDescription(getLearnMoreContentDescription());

            footerPreference.setLearnMoreText(getLearnMoreText());

            footerPreference.setLinkEnabled(true);

        } else {

            footerPreference.setLinkEnabled(false);

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public class CaptionFooterPreferenceController extends AccessibilityFooterPrefer 
    }



    @Override

    protected String getLearnMoreContentDescription() {

    protected String getLearnMoreText() {

        return mContext.getString(

            R.string.accessibility_captioning_footer_learn_more_content_description);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ public class ToggleAutoclickFooterPreferenceController extends 
    }



    @Override

    protected String getLearnMoreContentDescription() {

    protected String getLearnMoreText() {

        return mContext.getString(

            R.string.accessibility_autoclick_footer_learn_more_content_description);

    }