| commit | 8ad1fb63403e624f730684db4a3b0ea8aec80b78 | [log] [tgz] |
|---|---|---|
| author | Daisuke Miyakawa <dmiyakawa@google.com> | Mon Jan 31 11:55:43 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 31 11:55:43 2011 -0800 |
| tree | 90a60b94a8e94a38517bf2b2721d0948cc5413ea | |
| parent | 171412000a95ce35fd3461afe7bcc5b7f2f210f4 [diff] | |
| parent | 62fb701ea9781f4e1c05af6d730e91bb2cdcdae0 [diff] |
Merge "Disable back button on SetupWizard flow." into honeycomb
diff --git a/res/layout-xlarge/date_time_settings_setupwizard.xml b/res/layout-xlarge/date_time_settings_setupwizard.xml index aa1bbcf..ee425eb 100644 --- a/res/layout-xlarge/date_time_settings_setupwizard.xml +++ b/res/layout-xlarge/date_time_settings_setupwizard.xml
@@ -14,6 +14,7 @@ limitations under the License. --> <RelativeLayout + android:id="@+id/layout_root" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent"
diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml index 715b7cd..2a7da0e 100644 --- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml +++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -15,6 +15,7 @@ --> <RelativeLayout + android:id="@+id/layout_root" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:layout_width="fill_parent"
diff --git a/src/com/android/settings/DateTimeSettingsSetupWizard.java b/src/com/android/settings/DateTimeSettingsSetupWizard.java index 90a0f8b..c3d3bfd 100644 --- a/src/com/android/settings/DateTimeSettingsSetupWizard.java +++ b/src/com/android/settings/DateTimeSettingsSetupWizard.java
@@ -82,6 +82,9 @@ } public void initUiForXl() { + final View layoutRoot = findViewById(R.id.layout_root); + layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); + // Currently just comment out codes related to auto timezone. // TODO: Remove them when we are sure they are unnecessary. /*
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java index 7d8895d..caafabc 100644 --- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java +++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -155,6 +155,9 @@ } public void setup() { + final View layoutRoot = findViewById(R.id.layout_root); + layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK); + mTitleView = (TextView)findViewById(R.id.wifi_setup_title); mProgressBar = (ProgressBar)findViewById(R.id.scanning_progress_bar); mProgressBar.setMax(2);