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

Commit c0f7aff3 authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents 7da9d7aa a1c7ffe7

packages/SystemUI/src/com/android/systemui/volume/SegmentedButtons.java

+2 −1
Original line number Diff line number Diff line
@@ -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

packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java

+3 −0
Original line number Diff line number Diff line
@@ -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);