commit 98af408afd3b151e0945be5223f0c3ff8e845af8
author Android Build Merger (Role) <android-build-merger@google.com> Wed Aug 09 16:54:28 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 09 16:54:28 2017 +0000
tree 1f2d059e9ab46e9d500bda168e65f0e7a0979785
parent 44726df82692b7bb8c3d3f468183fa361b3c93c2
parent a9fce8010def88c637c8de3a3b87a0f5e0c8fadb

Merge "Merge "LockIcon: update content description when config changes" into oc-dr1-dev am: f79068637a" into oc-mr1-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index cdba24c..6cfa838 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -332,6 +332,7 @@
         lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width);
         lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height);
         mLockIcon.setLayoutParams(lp);
+        mLockIcon.setContentDescription(getContext().getText(R.string.accessibility_unlock_button));
         mLockIcon.update(true /* force */);
 
         lp = mLeftAffordanceView.getLayoutParams();