summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2017-07-06 16:45:49 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-06 16:45:49 +0000
commit56b8c37ebf6e44ebae1c8c4a97af731b90c822a6 (patch)
tree449ffcd440b5a7472d0bc5090eff937323650af4
parent01f5d30ae6dc60b8f72683406c9daafb635c161c (diff)
parenta37d44df8fae60f4978dcb1f326896b000ea9062 (diff)
Merge "Merge "LockIcon: Initialize mAccessibilityController" into oc-dr1-dev am: c3fef742c0" into oc-dr1-dev-plus-aosp
am: a37d44df8f Change-Id: I79bc12ce0c1333ceeefa233acd17088550c08aca
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java1
1 files changed, 1 insertions, 0 deletions
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 a4dfcd87f955..e9aa6d2e6b0b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -254,6 +254,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
mFlashlightController = Dependency.get(FlashlightController.class);
mAccessibilityController = Dependency.get(AccessibilityController.class);
mAssistManager = Dependency.get(AssistManager.class);
+ mLockIcon.setAccessibilityController(mAccessibilityController);
updateLeftAffordance();
}