Merge "Add content description to the master switch toggle button." into oc-dev am: 10158feecf

am: 79d8e5db66 Change-Id: Ied594a8096175ad340f246af3d467629df687bc1
2017-04-28 19:41:59 +00:00
parent 1e583e5d03 79d8e5db66
commit ab5b6e7360
2 changed files with 16 additions and 0 deletions
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -83,6 +83,7 @@ public class MasterSwitchPreference extends TwoTargetPreference {

        mSwitch = (Switch) holder.findViewById(R.id.switchWidget);
        if (mSwitch != null) {
+            mSwitch.setContentDescription(getTitle());
            mSwitch.setChecked(mChecked);
            mSwitch.setEnabled(mEnableSwitch);
        }