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

Commit 03134abf authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Add content description to zenmode" into pi-dev am: adc15344 

am: c320298e

Change-Id: I4822d26b1cf5667ae67131422d8f41da6b2ad28b
parents be79a70b c320298e

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 


            final SliceItem titleItem = rc.getTitleItem();

            button.setText(titleItem == null ? null : titleItem.getText());

            button.setContentDescription(rc.getContentDescription());



            Drawable iconDrawable = null;

            SliceItem icon = SliceQuery.find(item.getSlice(),

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardSliceProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ public class KeyguardSliceProvider extends SliceProvider implements 
            return;

        }

        RowBuilder dndBuilder = new RowBuilder(builder, mDndUri)

                .setContentDescription(getContext().getResources()

                        .getString(R.string.accessibility_quick_settings_dnd))

                .addEndItem(Icon.createWithResource(getContext(), R.drawable.stat_sys_dnd));

        builder.addRow(dndBuilder);

    }