| Chunk |
|---|
| Conflicting content |
|---|
private TextView mStatus2;
private TextView mScreenLocked;
private TextView mEmergencyCallText;
<<<<<<< HEAD
=======
private Button mEmergencyCallButton;
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
// current configuration state of keyboard and display
private int mKeyboardHidden; |
| Solution content |
|---|
private TextView mStatus2;
private TextView mScreenLocked;
private TextView mEmergencyCallText;
// current configuration state of keyboard and display
private int mKeyboardHidden; |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
mSelector.setLeftHintText(R.string.lockscreen_unlock_label);
mEmergencyCallText = (TextView) findViewById(R.id.emergencyCallText);
<<<<<<< HEAD
=======
mEmergencyCallButton = (Button) findViewById(R.id.emergencyCallButton);
mEmergencyCallButton.setText(R.string.lockscreen_emergency_call);
mLockPatternUtils.updateEmergencyCallButtonState(mEmergencyCallButton);
mEmergencyCallButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
mCallback.takeEmergencyCallAction();
}
});
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
setFocusable(true); |
| Solution content |
|---|
mSelector.setLeftHintText(R.string.lockscreen_unlock_label);
mEmergencyCallText = (TextView) findViewById(R.id.emergencyCallText);
setFocusable(true); |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Cast expression |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
private void updateLayout(Status status) {
// The emergency call button no longer appears on this screen.
if (DBG) Log.d(TAG, "updateLayout: status=" + status);
<<<<<<< HEAD
=======
mEmergencyCallButton.setVisibility(View.GONE); // in almost all cases
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
switch (status) {
case Normal:
// text |
| Solution content |
|---|
private void updateLayout(Status status) {
// The emergency call button no longer appears on this screen.
if (DBG) Log.d(TAG, "updateLayout: status=" + status);
switch (status) {
case Normal:
// text |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
getCarrierString(
mUpdateMonitor.getTelephonyPlmn(),
mUpdateMonitor.getTelephonySpn()));
<<<<<<< HEAD
// unnecessary clutter
//mScreenLocked.setText(R.string.lockscreen_screen_locked);
=======
// Empty now, but used for sliding tab feedback
mScreenLocked.setText("");
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
// layout
mScreenLocked.setVisibility(View.INVISIBLE); |
| Solution content |
|---|
getCarrierString(
mUpdateMonitor.getTelephonyPlmn(),
mUpdateMonitor.getTelephonySpn()));
// unnecessary clutter
//mScreenLocked.setText(R.string.lockscreen_screen_locked);
// layout
mScreenLocked.setVisibility(View.INVISIBLE); |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
mScreenLocked.setVisibility(View.VISIBLE);
mSelector.setVisibility(View.VISIBLE);
mEmergencyCallText.setVisibility(View.VISIBLE);
<<<<<<< HEAD
=======
// do not need to show the e-call button; user may unlock
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
break;
case SimMissingLocked:
// text |
| Solution content |
|---|
mScreenLocked.setVisibility(View.VISIBLE);
mSelector.setVisibility(View.VISIBLE);
mEmergencyCallText.setVisibility(View.VISIBLE);
break;
case SimMissingLocked:
// text |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
// layout
mScreenLocked.setVisibility(View.VISIBLE);
<<<<<<< HEAD
mSelector.setVisibility(View.GONE);
mEmergencyCallText.setVisibility(View.VISIBLE);
=======
mSelector.setVisibility(View.GONE); // cannot unlock
mEmergencyCallText.setVisibility(View.VISIBLE);
mEmergencyCallButton.setVisibility(View.VISIBLE);
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
break;
case SimLocked:
// text |
| Solution content |
|---|
// layout
mScreenLocked.setVisibility(View.VISIBLE);
mSelector.setVisibility(View.GONE);
mEmergencyCallText.setVisibility(View.VISIBLE);
break;
case SimLocked:
// text |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
// layout
mScreenLocked.setVisibility(View.VISIBLE);
<<<<<<< HEAD
mSelector.setVisibility(View.GONE);
mEmergencyCallText.setVisibility(View.VISIBLE);
=======
mSelector.setVisibility(View.GONE); // cannot unlock
mEmergencyCallText.setVisibility(View.VISIBLE);
mEmergencyCallButton.setVisibility(View.VISIBLE);
>>>>>>> 0b23c1436a77500c9d5a78da2e1d2a2d27501589
break;
}
} |
| Solution content |
|---|
// layout
mScreenLocked.setVisibility(View.VISIBLE);
mSelector.setVisibility(View.GONE);
mEmergencyCallText.setVisibility(View.VISIBLE);
break;
}
} |
| File |
|---|
| LockScreen.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |