| Chunk |
|---|
| Conflicting content |
|---|
View mDate;
FixedSizeDrawable mBackground;
<<<<<<< HEAD
boolean mNightMode = false;
int mStartAlpha = 0, mEndAlpha = 0;
long mEndTime = 0;
Rect mButtonBounds = new Rect();
boolean mCapturingEvents = true;
=======
>>>>>>> 5d722580afbca277ebc760d5b2c0400f4bca1a8d
public StatusBarView(Context context, AttributeSet attrs) {
super(context, attrs);
} |
| Solution content |
|---|
View mDate;
FixedSizeDrawable mBackground;
boolean mNightMode = false;
int mStartAlpha = 0, mEndAlpha = 0;
long mEndTime = 0;
Rect mButtonBounds = new Rect();
boolean mCapturingEvents = true;
public StatusBarView(Context context, AttributeSet attrs) {
super(context, attrs);
} |
| File |
|---|
| StatusBarView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |