commit 6beb924ec2b147d259cd3438f56cd88691fc57e5
author Freeman Ng <tenorslowworm@google.com> Tue Jun 07 11:51:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 07 11:51:23 2011 -0700
tree 557aaa26e04289c578dca1f6c206e4775ac4ad64
parent 37940170d00130d55d379178413f115b3feb59c4
parent 351367bbd830646ddeed49227ab37442479556f9

am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2

* commit '351367bbd830646ddeed49227ab37442479556f9':
  add options to lock suw wifi setup orientation into portrait or landscape

src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java

diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index b265362..a73f96c 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -21,6 +21,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -54,6 +55,10 @@
     private static final String TAG = "SetupWizard";
     private static final boolean DEBUG = true;
 
+    // lock orientation into landscape or portrait
+    private static final String EXTRA_PREFS_LANDSCAPE_LOCK = "extra_prefs_landscape_lock";
+    private static final String EXTRA_PREFS_PORTRAIT_LOCK = "extra_prefs_portrait_lock";
+
     private static final EnumMap<DetailedState, DetailedState> sNetworkStateMap =
             new EnumMap<DetailedState, DetailedState>(DetailedState.class);
 
@@ -165,10 +170,18 @@
     }
 
     private void initViews() {
-        if (getIntent().getBooleanExtra("firstRun", false)) {
+        Intent intent = getIntent();
+
+        if (intent.getBooleanExtra("firstRun", false)) {
             final View layoutRoot = findViewById(R.id.layout_root);
             layoutRoot.setSystemUiVisibility(View.STATUS_BAR_DISABLE_BACK);
         }
+        if (intent.getBooleanExtra(EXTRA_PREFS_LANDSCAPE_LOCK, false)) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+        if (intent.getBooleanExtra(EXTRA_PREFS_PORTRAIT_LOCK, false)) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT);
+        }
 
         mTitleView = (TextView)findViewById(R.id.wifi_setup_title);
         mProgressBar = (ProgressBar)findViewById(R.id.scanning_progress_bar);