Merge "Fix build." into mnc-dev

This commit is contained in:
Jorim Jaggi
2015-04-28 23:29:36 +00:00
committed by Android (Google) Code Review

View File

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