Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb096074 authored by Freeman Ng's avatar Freeman Ng Committed by Android Git Automerger
Browse files

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

* commit '148222fd':
  remove disabling of Back/Dismiss button for 10" mode
parents f2a9bd33 148222fd
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -97,9 +97,16 @@ public class DateTimeSettingsSetupWizard extends Activity
        mTimeZoneAdapter = ZonePicker.constructTimezoneAdapter(this, false,
            R.layout.date_time_setup_custom_list_item_2);

        // 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() {
        // Currently just comment out codes related to auto timezone.