Merge "Add content description to zenmode" into pi-dev

am: adc1534453

Change-Id: I5cd398157fb641b88145a0f90766161e5b8124f0

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

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

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