summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-04-28 23:29:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-28 23:29:41 +0000
commitb3a020a6de45bbcb1329d8f820e569cfd0de9325 (patch)
tree0a4e47178a08803303eebdd3b2493a618cf27320
parent61a75423648a0070406e9b7aeda1a55e173bd467 (diff)
parent582b57f984a3ed87265ff5724b35349224605ac9 (diff)
downloadframeworks_base-b3a020a6de45bbcb1329d8f820e569cfd0de9325.zip
frameworks_base-b3a020a6de45bbcb1329d8f820e569cfd0de9325.tar.gz
frameworks_base-b3a020a6de45bbcb1329d8f820e569cfd0de9325.tar.bz2
Merge "Fix build." into mnc-dev
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index ea9e2c4..66f3232 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -48,7 +48,7 @@ public class LockIcon extends KeyguardAffordanceView {
private final UnlockMethodCache mUnlockMethodCache;
private AccessibilityController mAccessibilityController;
- public LockIcon(Context context, @Nullable AttributeSet attrs) {
+ public LockIcon(Context context, AttributeSet attrs) {
super(context, attrs);
mTrustDrawable = new TrustDrawable(context);
setBackground(mTrustDrawable);
@@ -56,7 +56,7 @@ public class LockIcon extends KeyguardAffordanceView {
}
@Override
- protected void onVisibilityChanged(@NonNull View changedView, @Visibility int visibility) {
+ protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);
if (isShown()) {
mTrustDrawable.start();