PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05

Browse Source 
am: 03fb024

* commit '03fb0244d58d1d932570c1eacdce498d8146e68f':
  Fix Settings Condition expand button a11y label

Change-Id: Ia0d8bb962071b75f5d78912a07e64d012caff9ce
This commit is contained in:
Jason Monk
2016-04-27 19:31:26 +00:00
committed by android-build-merger
parent 18d0386703 03fb0244d5
commit c8ab34c5e4
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -7142,6 +7142,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>

2
src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
View File

@@ -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);