Merge "Disable back button on SetupWizard flow." into honeycomb
This commit is contained in:
committed by
Android (Google) Code Review
commit
8ad1fb6340
@@ -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"
|
||||
|
@@ -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"
|
||||
|
@@ -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.
|
||||
/*
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user