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

* commit '945aac2e299e8a290c6ec3e5fbad84b7c28366ce':
  remove disabling of Back/Dismiss button for 10" mode

1 files changed, 9 insertions, 2 deletions

diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java
index 08204b69a..e63153e71 100644
--- a/src/com/android/settings/DateTimeSettingsSetupWizard.java
+++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -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() {