From 03708e030a9c85e323ba2464e908e4c9c3fc3095 Mon Sep 17 00:00:00 2001 From: Freeman Ng Date: Thu, 9 Jun 2011 15:42:25 -0700 Subject: [PATCH] remove disabling of Back/Dismiss button for 10" mode bug: 4580049 Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700 --- src/com/android/settings/DateTimeSettingsSetupWizard.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java index 685ee00044..4ff7fc8632 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() { -- 2.11.0