am fb096074: am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2

* commit 'fb09607469a5cb42c833725d121e517af5daca72':
  remove disabling of Back/Dismiss button for 10" mode
This commit is contained in:
Freeman Ng
2011-06-10 07:46:40 -07:00
committed by Android Git Automerger

View File

@@ -97,8 +97,15 @@ public class DateTimeSettingsSetupWizard extends Activity
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
R.layout.date_time_setup_custom_list_item_2);
final View layoutRoot = findViewById(R.id.layout_root);
layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
// For the normal view, disable Back since changes stick immediately
// and can't be canceled, and we already have a Next button. For xLarge,
// though, we save up our changes and set them upon Next, so Back can
// cancel. And also, in xlarge, we need the keyboard dismiss button
// to be available.
if (!mUsingXLargeLayout) {
final View layoutRoot = findViewById(R.id.layout_root);
layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
}
}
public void initUiForXl() {