remove disabling of Back/Dismiss button for 10" mode
bug: 4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 685ee00..4ff7fc8 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -97,8 +97,15 @@
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() {