diff options
| author | Freeman Ng <tenorslowworm@google.com> | 2011-06-10 07:46:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-10 07:46:40 -0700 |
| commit | 945aac2e299e8a290c6ec3e5fbad84b7c28366ce (patch) | |
| tree | fe686f9f3d66e230389ab77697aef64c4a24a061 /src/com | |
| parent | a35506c7fb32906678fe541914f420d19ff17394 (diff) | |
| parent | fb09607469a5cb42c833725d121e517af5daca72 (diff) | |
| download | packages_apps_Settings-945aac2e299e8a290c6ec3e5fbad84b7c28366ce.tar.gz packages_apps_Settings-945aac2e299e8a290c6ec3e5fbad84b7c28366ce.tar.bz2 packages_apps_Settings-945aac2e299e8a290c6ec3e5fbad84b7c28366ce.zip | |
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
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/DateTimeSettingsSetupWizard.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java index 685ee0004..4ff7fc863 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() { |