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

Commit 51b1e051 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix Settings Condition expand button a11y label" into nyc-dev

parents ae35c38f 58440b28

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -7140,6 +7140,12 @@ 
    <!-- Turn on a conditional state of the device (e.g. cellular data) [CHAR LIMIT=30] -->

    <string name="condition_turn_on">Turn on</string>









    <!-- Content description used when expanding a condition item to see more details -->









    <string name="condition_expand_show">Show</string>

















    <!-- Content description used when collapsing a condition item to see less details -->









    <string name="condition_expand_hide">Hide</string>

















    <!-- Title of condition that hotspot is on [CHAR LIMIT=30] -->









    <string name="condition_hotspot_title">Hotspot is on</string>

































src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java



+2
−0






























Original line number
Diff line number
Diff line







@@ -71,6 +71,8 @@ public class ConditionAdapterUtils {







        ImageView expand = (ImageView) view.itemView.findViewById(R.id.expand_indicator);









        expand.setTag(condition);









        expand.setImageResource(isExpanded ? R.drawable.ic_expand_less : R.drawable.ic_expand_more);









        expand.setContentDescription(expand.getContext().getString(isExpanded









                ? R.string.condition_expand_hide : R.string.condition_expand_show));









        expand.setOnClickListener(onExpandListener);



















        View detailGroup = view.itemView.findViewById(R.id.detail_group);