am 8ad1fb63: Merge "Disable back button on SetupWizard flow." into honeycomb

* commit '8ad1fb63403e624f730684db4a3b0ea8aec80b78':
  Disable back button on SetupWizard flow.
This commit is contained in:
Daisuke Miyakawa
2011-01-31 11:59:36 -08:00
committed by Android Git Automerger
4 changed files with 8 additions and 0 deletions

View File

@@ -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"

View File

@@ -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"

View File

@@ -82,6 +82,9 @@ public class DateTimeSettingsSetupWizard extends Activity
}
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.
/*

View File

@@ -155,6 +155,9 @@ public class WifiSettingsForSetupWizardXL extends Activity implements OnClickLis
}
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);