Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Zen QS: Use explicit content descriptions for zen buttons." into mnc-dev

Browse Source
This commit is contained in:
John Spurlock
2015-06-08 20:13:07 +00:00
committed by Android (Google) Code Review
parent 7da9d7aa52 a1c7ffe755
commit c0f7aff3df
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java
View File

@@ -68,10 +68,11 @@ public class SegmentedButtons extends LinearLayout {
fireOnSelected();
}
public void addButton(int labelResId, Object value) {
public void addButton(int labelResId, int contentDescriptionResId, Object value) {
final Button b = (Button) mInflater.inflate(R.layout.segmented_button, this, false);
b.setTag(LABEL_RES_KEY, labelResId);
b.setText(labelResId);
b.setContentDescription(getResources().getString(contentDescriptionResId));
final LayoutParams lp = (LayoutParams) b.getLayoutParams();
if (getChildCount() == 0) {
lp.leftMargin = lp.rightMargin = 0; // first button has no margin

3
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
View File

@@ -151,10 +151,13 @@ public class ZenModePanel extends LinearLayout {
mZenButtons = (SegmentedButtons) findViewById(R.id.zen_buttons);
mZenButtons.addButton(R.string.interruption_level_none_twoline,
R.string.interruption_level_none,
Global.ZEN_MODE_NO_INTERRUPTIONS);
mZenButtons.addButton(R.string.interruption_level_alarms_twoline,
R.string.interruption_level_alarms,
Global.ZEN_MODE_ALARMS);
mZenButtons.addButton(R.string.interruption_level_priority_twoline,
R.string.interruption_level_priority,
Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
mZenButtons.setCallback(mZenButtonsCallback);