From ce28b3838cdcaa468907d7189956c450d7ceb5c3 Mon Sep 17 00:00:00 2001
From: Charles He <qiurui@google.com>
Date: Fri, 21 Apr 2017 20:15:09 +0100
Subject: [PATCH] Add a11y voice for the VPN icon in status bar

Bug: 37530860
Test: Enable Talkback and highlight the VPN icon
Change-Id: I8c63493b168b40e048b67950e5ed487e95bfb5f5
---
 packages/SystemUI/res/layout/signal_cluster_view.xml | 1 +
 packages/SystemUI/res/values/strings.xml             | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml
index 5766dc1c5b4f7..5df50cdeba1a6 100644
--- a/packages/SystemUI/res/layout/signal_cluster_view.xml
+++ b/packages/SystemUI/res/layout/signal_cluster_view.xml
@@ -32,6 +32,7 @@
         android:layout_width="wrap_content"
         android:paddingEnd="6dp"
         android:src="@drawable/stat_sys_vpn_ic"
+        android:contentDescription="@string/accessibility_vpn_on"
         />
     <FrameLayout
         android:id="@+id/ethernet_combo"
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index b70597f29a72f..48e3142fa498a 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -390,6 +390,9 @@
     <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_airplane_mode">Airplane mode.</string>
 
+    <!-- Content description of the VPN icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+    <string name="accessibility_vpn_on">VPN on.</string>
+
     <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_no_sims">No SIM card.</string>