Merge "fix breakage caused by recent automerge"
This commit is contained in:
@@ -129,9 +129,6 @@ public class DateTimeSettingsSetupWizard extends Activity
|
|||||||
|
|
||||||
mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
|
mAutoDateTimeButton = (CompoundButton)findViewById(R.id.date_time_auto_button);
|
||||||
mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
|
mAutoDateTimeButton.setChecked(autoDateTimeEnabled);
|
||||||
((TextView)findViewById(R.id.date_time_auto_text))
|
|
||||||
.setText(autoDateTimeEnabled ? R.string.date_time_auto_summaryOn :
|
|
||||||
R.string.date_time_auto_summaryOff);
|
|
||||||
mAutoDateTimeButton.setOnCheckedChangeListener(this);
|
mAutoDateTimeButton.setOnCheckedChangeListener(this);
|
||||||
|
|
||||||
mTimePicker = (TimePicker)findViewById(R.id.time_picker);
|
mTimePicker = (TimePicker)findViewById(R.id.time_picker);
|
||||||
|
|||||||
Reference in New Issue
Block a user