From 5cd60eb8aa5a4d5cf1a850ddd05d4f94eae1eb2f Mon Sep 17 00:00:00 2001
From: Daisuke Miyakawa <dmiyakawa@google.com>
Date: Wed, 1 Sep 2010 19:27:11 -0700
Subject: [PATCH] Add modifications which should have been in the change
 I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78
---
 .../wifi_settings_for_setup_wizard_xl.xml     | 239 ++++++++----------
 res/layout/wifi_config_preference.xml         | 210 ++++++++-------
 .../wifi_access_points_for_wifi_setup_xl.xml  |  11 +-
 .../android/settings/ProgressCategory.java    |   1 -
 .../android/settings/wifi/AccessPoint.java    |   4 +-
 .../AccessPointCategoryForSetupWizardXL.java  |   6 +-
 src/com/android/settings/wifi/Summary.java    |   4 +-
 .../settings/wifi/WifiConfigPreference.java   |   4 +-
 src/com/android/settings/wifi/WifiDialog.java |   4 +-
 .../android/settings/wifi/WifiSettings.java   |  11 +-
 .../wifi/WifiSettingsForSetupWizardXL.java    |   5 +-
 11 files changed, 234 insertions(+), 265 deletions(-)

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 c6c5a039d81..e8a0f672eed 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -5,145 +5,128 @@
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
 
-          http://www.apache.org/licenses/LICENSE-2.0
+     http://www.apache.org/licenses/LICENSE-2.0
 
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<LinearLayout
-   xmlns:android="http://schemas.android.com/apk/res/android"
-   android:orientation="horizontal"
-   android:layout_width="fill_parent"
-   android:layout_height="fill_parent"
-   android:paddingTop="70dip"
-   android:paddingBottom="80dip"
-   android:paddingLeft="60dip"
-   android:paddingRight="60dip">
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent"
+              android:paddingTop="70dip"
+              android:paddingBottom="80dip"
+              android:paddingLeft="60dip"
+              android:paddingRight="60dip">
 
+    <!-- Left: almost empty with one title at the top  -->
+    <RelativeLayout android:orientation="vertical"
+                    android:layout_width="0px"
+                    android:layout_weight=".3"
+                    android:layout_height="fill_parent"
+                    android:paddingRight="10dip"
+                    android:paddingBottom="10dip">
+        <TextView android:id="@+id/wifi_setup_title"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:gravity="center|top"
+                  android:textSize="48dip"
+                  android:textColor="#FF30FF30"
+                  android:text="@string/wifi_setup_title"/>
+        <Button android:id="@+id/wifi_setup_cancel"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:textSize="24dip"
+                android:text="@string/wifi_cancel"
+                android:visibility="gone" />
+    </RelativeLayout>
 
-  <!-- Left: almost empty with one title at the top  -->
-  <RelativeLayout
-     android:orientation="vertical"
-     android:layout_width="0px"
-     android:layout_weight=".3"
-     android:layout_height="fill_parent"
-     android:paddingRight="10dip"
-     android:paddingBottom="10dip">
-    <TextView
-       android:id="@+id/wifi_setup_title"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:gravity="center|top"
-       android:textSize="48dip"
-       android:textColor="#FF30FF30"
-       android:text="@string/wifi_setup_title"/>
-    <Button
-       android:id="@+id/wifi_setup_cancel"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_alignParentBottom="true"
-       android:textSize="24dip"
-       android:text="@string/wifi_cancel"
-       android:visibility="gone" />
-  </RelativeLayout>
+    <!-- Center: fragment -->
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="0px"
+                  android:layout_weight=".4"
+                  android:layout_height="fill_parent"
+                  android:paddingTop="20dip"
+                  android:paddingLeft="10dip"
+                  android:paddingRight="30dip"
+                  android:paddingBottom="15dip">
+        <!-- Assume the text size of this text should be same as Preference's
+             texts. See also preference.xml -->
+        <TextView android:id="@+id/wifi_setup_status"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:background="#ff113344"
+                  android:paddingLeft="5dip"
+                  android:paddingTop="5dip"
+                  android:paddingBottom="5dip"
+                  android:layout_marginBottom="20dip"
+                  android:textAppearance="?android:attr/textAppearanceLarge"
+                  android:text="@string/wifi_setup_status_select_network"/>
+        <fragment class="com.android.settings.wifi.WifiSettings"
+                  android:id="@+id/wifi_setup_fragment"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content" />
+    </LinearLayout>
 
-  <!-- Center: Full of fragment -->
-  <LinearLayout
-     android:orientation="vertical"
-     android:layout_width="0px"
-     android:layout_weight=".4"
-     android:layout_height="fill_parent"
-     android:paddingTop="20dip"
-     android:paddingLeft="10dip"
-     android:paddingRight="30dip"
-     android:paddingBottom="15dip">
-    <!-- Assume the text size of this text should be same as Preference's
-         texts. See also preference.xml -->
-    <TextView
-       android:id="@+id/wifi_setup_status"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:background="#ff113344"
-       android:paddingLeft="5dip"
-       android:paddingTop="5dip"
-       android:paddingBottom="5dip"
-       android:layout_marginBottom="20dip"
-       android:textAppearance="?android:attr/textAppearanceLarge"
-       android:text="@string/wifi_setup_status_select_network"/>
-    <fragment
-       class="com.android.settings.wifi.WifiSettings"
-       android:id="@+id/wifi_setup_fragment"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content" />
-  </LinearLayout>
+    <!-- Right: various information -->
+    <RelativeLayout android:orientation="vertical"
+                    android:layout_width="0px"
+                    android:layout_weight=".3"
+                    android:layout_height="fill_parent"
+                    android:paddingTop="22dip"
+                    android:paddingLeft="30dip"
+                    android:paddingBottom="10dip">
+        <TextView android:id="@+id/scanning_progress_text"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_alignParentTop="true"
+                  android:textSize="24dip"
+                  android:text="@string/progress_scanning"/>
+        <ProgressBar android:id="@+id/scanning_progress_bar"
+                     android:layout_width="100dip"
+                     android:layout_height="wrap_content"
+                     android:layout_below="@id/scanning_progress_text"
+                     style="?android:attr/progressBarStyleHorizontal" />
 
-  <!-- Right: various information -->
-  <RelativeLayout
-     android:orientation="vertical"
-     android:layout_width="0px"
-     android:layout_weight=".3"
-     android:layout_height="fill_parent"
-     android:paddingTop="22dip"
-     android:paddingLeft="30dip"
-     android:paddingBottom="10dip">
-    <TextView
-       android:id="@+id/scanning_progress_text"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_alignParentTop="true"
-       android:textSize="24dip"
-       android:text="@string/progress_scanning"/>
-    <ProgressBar
-       android:id="@+id/scanning_progress_bar"
-       android:layout_width="100dip"
-       android:layout_height="wrap_content"
-       android:layout_below="@id/scanning_progress_text"
-       style="?android:attr/progressBarStyleHorizontal" />
+        <Button android:id="@+id/wifi_setup_connect"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:textSize="24dip"
+                android:text="@string/wifi_connect"
+                android:visibility="gone" />
+        <Button android:id="@+id/wifi_setup_forget"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:textSize="24dip"
+                android:text="@string/wifi_forget"
+                android:visibility="gone" />
 
-    <Button
-       android:id="@+id/wifi_setup_connect"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_alignParentBottom="true"
-       android:textSize="24dip"
-       android:text="@string/wifi_connect"
-       android:visibility="gone" />
-    <Button
-       android:id="@+id/wifi_setup_forget"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_alignParentBottom="true"
-       android:textSize="24dip"
-       android:text="@string/wifi_forget"
-       android:visibility="gone" />
+        <Button android:id="@+id/wifi_setup_skip_or_next"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="30dip"
+                android:layout_alignParentBottom="true"
+                android:textSize="24dip"
+                android:text="@string/wifi_setup_skip" />
 
-    <Button
-       android:id="@+id/wifi_setup_skip_or_next"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_marginTop="30dip"
-       android:layout_alignParentBottom="true"
-       android:textSize="24dip"
-       android:text="@string/wifi_setup_skip" />
+        <Button android:id="@+id/wifi_setup_refresh_list"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/wifi_setup_skip_or_next"
+                android:textSize="24dip"
+                android:text="@string/wifi_setup_refresh_list" />
 
-    <Button
-       android:id="@+id/wifi_setup_refresh_list"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_above="@id/wifi_setup_skip_or_next"
-       android:textSize="24dip"
-       android:text="@string/wifi_setup_refresh_list" />
-
-    <Button
-       android:id="@+id/wifi_setup_add_network"
-       android:layout_width="fill_parent"
-       android:layout_height="wrap_content"
-       android:layout_above="@id/wifi_setup_refresh_list"
-       android:textSize="24dip"
-       android:text="@string/wifi_setup_add_network" />
-
-  </RelativeLayout>
+        <Button android:id="@+id/wifi_setup_add_network"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/wifi_setup_refresh_list"
+                android:textSize="24dip"
+                android:text="@string/wifi_setup_add_network" />
+    </RelativeLayout>
 </LinearLayout>
diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
index 5cea2d42c28..c510abf99c6 100644
--- a/res/layout/wifi_config_preference.xml
+++ b/res/layout/wifi_config_preference.xml
@@ -14,138 +14,132 @@
      limitations under the License.
 -->
 <!-- All ids in this layout must be in wifi_dialog.xml -->
-<LinearLayout
-   xmlns:android="http://schemas.android.com/apk/res/android"
-   android:orientation="vertical"
-   android:layout_width="fill_parent"
-   android:layout_height="fill_parent">
-  <!-- <TextView android:id="@+id/title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title" /> -->
-
-  <LinearLayout android:id="@+id/info"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical" />
-
-  <LinearLayout android:id="@+id/type"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-    <TextView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/wifi_ssid" />
-
-    <EditText android:id="@+id/ssid"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
               android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:singleLine="true"
-              android:inputType="textNoSuggestions" />
+              android:layout_height="fill_parent">
 
-    <TextView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/wifi_security" />
+    <LinearLayout android:id="@+id/info"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:orientation="vertical" />
+    <LinearLayout android:id="@+id/type"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="vertical"
+                 android:visibility="gone">
 
-    <Spinner android:id="@+id/security"
-             android:layout_width="fill_parent"
-             android:layout_height="wrap_content"
-             android:prompt="@string/wifi_security"
-             android:entries="@array/wifi_security" />
-  </LinearLayout>  <!-- android:id="@+id/type" -->
+       <TextView android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                 android:text="@string/wifi_ssid" />
 
-  <LinearLayout android:id="@+id/fields"
+       <EditText android:id="@+id/ssid"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:singleLine="true"
+                 android:inputType="textNoSuggestions" />
+
+       <TextView android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_security" />
+
+       <Spinner android:id="@+id/security"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:prompt="@string/wifi_security"
+                android:entries="@array/wifi_security" />
+    </LinearLayout>  <!-- android:id="@+id/type" -->
 
-    <LinearLayout android:id="@+id/eap"
+    <LinearLayout android:id="@+id/fields"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:orientation="vertical"
                   android:visibility="gone">
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/wifi_eap_method" />
+        <LinearLayout android:id="@+id/eap"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:orientation="vertical"
+                      android:visibility="gone">
 
-      <Spinner android:id="@+id/method"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:prompt="@string/wifi_eap_method"
-               android:entries="@array/wifi_eap_method" />
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_method" />
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/please_select_phase2" />
+            <Spinner android:id="@+id/method"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_method"
+                     android:entries="@array/wifi_eap_method" />
 
-      <Spinner android:id="@+id/phase2"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:prompt="@string/please_select_phase2"
-               android:entries="@array/wifi_phase2_entries" />
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/please_select_phase2" />
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/wifi_eap_ca_cert" />
+            <Spinner android:id="@+id/phase2"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/please_select_phase2"
+                     android:entries="@array/wifi_phase2_entries" />
 
-      <Spinner android:id="@+id/ca_cert"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:prompt="@string/wifi_eap_ca_cert" />
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_ca_cert" />
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/wifi_eap_user_cert" />
+            <Spinner android:id="@+id/ca_cert"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_ca_cert" />
 
-      <Spinner android:id="@+id/user_cert"
-               android:layout_width="fill_parent"
-               android:layout_height="wrap_content"
-               android:prompt="@string/wifi_eap_user_cert" />
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_user_cert" />
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/wifi_eap_identity" />
+            <Spinner android:id="@+id/user_cert"
+                     android:layout_width="fill_parent"
+                     android:layout_height="wrap_content"
+                     android:prompt="@string/wifi_eap_user_cert" />
 
-      <EditText android:id="@+id/identity"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_identity" />
 
-      <TextView
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:text="@string/wifi_eap_anonymous" />
+            <EditText android:id="@+id/identity"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
 
-      <EditText android:id="@+id/anonymous"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:inputType="textNoSuggestions" />
-    </LinearLayout> <!-- android:id="@+id/eap" -->
+            <TextView
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_eap_anonymous" />
 
-    <TextView android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/wifi_password" />
+            <EditText android:id="@+id/anonymous"
+                      android:layout_width="fill_parent"
+                      android:layout_height="wrap_content"
+                      android:singleLine="true"
+                      android:inputType="textNoSuggestions" />
+        </LinearLayout> <!-- android:id="@+id/eap" -->
 
-    <EditText android:id="@+id/password"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:singleLine="true"
-              android:password="true" />
+        <TextView android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_password" />
 
-    <CheckBox android:id="@+id/show_password"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:text="@string/wifi_show_password" />
-  </LinearLayout>  <!-- android:id="@+id/fields" -->
+        <EditText android:id="@+id/password"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:singleLine="true"
+                  android:password="true" />
+
+        <CheckBox android:id="@+id/show_password"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:text="@string/wifi_show_password" />
+    </LinearLayout>  <!-- android:id="@+id/fields" -->
 </LinearLayout>
diff --git a/res/xml/wifi_access_points_for_wifi_setup_xl.xml b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
index 7766611d22b..013c62c4c2d 100644
--- a/res/xml/wifi_access_points_for_wifi_setup_xl.xml
+++ b/res/xml/wifi_access_points_for_wifi_setup_xl.xml
@@ -14,11 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
-   xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL
-     android:key="access_points"
-     android:persistent="false" />
-
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL
+         android:key="access_points"
+         android:persistent="false" />
 </PreferenceScreen>
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index e0d9f457d65..c5b68b6ddeb 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import android.content.Context;
-import android.preference.PreferenceCategory;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index 856b2c2f71b..fcc9eb2de69 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
@@ -27,8 +29,6 @@ import android.preference.Preference;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.android.settings.R;
-
 import java.util.Comparator;
 
 class AccessPoint extends Preference {
diff --git a/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java b/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
index 5887d4c6938..7a1623bc546 100644
--- a/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
@@ -16,12 +16,12 @@
 
 package com.android.settings.wifi;
 
-import android.content.Context;
-import android.util.AttributeSet;
-
 import com.android.settings.ProgressCategoryBase;
 import com.android.settings.R;
 
+import android.content.Context;
+import android.util.AttributeSet;
+
 public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase {
     public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/src/com/android/settings/wifi/Summary.java b/src/com/android/settings/wifi/Summary.java
index 857d29ed057..d96d23ecd47 100644
--- a/src/com/android/settings/wifi/Summary.java
+++ b/src/com/android/settings/wifi/Summary.java
@@ -16,11 +16,11 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.net.NetworkInfo.DetailedState;
 
-import com.android.settings.R;
-
 class Summary {
     static String get(Context context, String ssid, DetailedState state) {
         String[] formats = context.getResources().getStringArray((ssid == null)
diff --git a/src/com/android/settings/wifi/WifiConfigPreference.java b/src/com/android/settings/wifi/WifiConfigPreference.java
index c5a366d0c26..5a0982771d6 100644
--- a/src/com/android/settings/wifi/WifiConfigPreference.java
+++ b/src/com/android/settings/wifi/WifiConfigPreference.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.content.Context;
 import android.content.DialogInterface;
 import android.preference.Preference;
@@ -24,8 +26,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.android.settings.R;
-
 /**
  * Preference letting users modify a setting for Wifi network. This work as an alternative UI
  * for {@link WifiDialog} without shouwing popup Dialog.
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index e8ab2a0bb58..b6356159d96 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -23,8 +25,6 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
-import com.android.settings.R;
-
 class WifiDialog extends AlertDialog implements WifiConfigUiBase {
     static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
     static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index dc8f6db60e7..817609cdb40 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.ProgressCategoryBase;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -47,17 +51,10 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.android.settings.ProgressCategoryBase;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.TreeSet;
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 1743157eb9b..2d26645b4f2 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -16,10 +16,11 @@
 
 package com.android.settings.wifi;
 
+import com.android.settings.R;
+
 import android.app.Activity;
 import android.net.NetworkInfo.DetailedState;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.Window;
@@ -27,8 +28,6 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
 import java.util.EnumMap;
 
 /**