PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '945aac2e299e8a290c6ec3e5fbad84b7c28366ce':
  remove disabling of Back/Dismiss button for 10" mode
This commit is contained in:
Freeman Ng
2011-06-10 14:08:35 -07:00
committed by Android Git Automerger
parent 10d41eca7b 945aac2e29
commit 86432504d3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/DateTimeSettingsSetupWizard.java
View File

@@ -97,8 +97,15 @@ public class DateTimeSettingsSetupWizard extends Activity
mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false, mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
R.layout.date_time_setup_custom_list_item_2); R.layout.date_time_setup_custom_list_item_2);
final View layoutRoot = findViewById(R.id.layout_root); // For the normal view, disable Back since changes stick immediately
layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); // 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() { public void initUiForXl() {