am 2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1

* commit '2fa017f874d20a5b037ebe57f3fc0c53964080bc':
  fix datetime layout for phones and remove orientation locking
This commit is contained in:
Freeman Ng
2011-11-21 16:07:54 -08:00
committed by Android Git Automerger
2 changed files with 7 additions and 2 deletions

View File

@@ -88,10 +88,8 @@ public class DateTimeSettingsSetupWizard extends Activity
// not present in the standard layout
mUsingXLargeLayout = findViewById(R.id.time_zone_button) != null;
if (mUsingXLargeLayout) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
initUiForXl();
} else {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
findViewById(R.id.next_button).setOnClickListener(this);
}
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,