Add modifications which should have been in the change

I520d690d3301837d32f91dad54a973a379ce1989

Change-Id: Iecca6b4fef2ec42a62273035b096ccedcea94d78

res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml

@@ -12,9 +12,8 @@
      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
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="horizontal"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
@@ -23,25 +22,21 @@
               android:paddingLeft="60dip"
               android:paddingRight="60dip">
 
-
     <!-- Left: almost empty with one title at the top  -->
-  <RelativeLayout
+    <RelativeLayout android:orientation="vertical"
-     android:orientation="vertical"
                     android:layout_width="0px"
                     android:layout_weight=".3"
                     android:layout_height="fill_parent"
                     android:paddingRight="10dip"
                     android:paddingBottom="10dip">
-    <TextView
+        <TextView android:id="@+id/wifi_setup_title"
-       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
+        <Button android:id="@+id/wifi_setup_cancel"
-       android:id="@+id/wifi_setup_cancel"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
@@ -50,9 +45,8 @@
                 android:visibility="gone" />
     </RelativeLayout>
 
-  <!-- Center: Full of fragment -->
+    <!-- Center: fragment -->
-  <LinearLayout
+    <LinearLayout android:orientation="vertical"
-     android:orientation="vertical"
                   android:layout_width="0px"
                   android:layout_weight=".4"
                   android:layout_height="fill_parent"
@@ -62,8 +56,7 @@
                   android:paddingBottom="15dip">
         <!-- Assume the text size of this text should be same as Preference's
              texts. See also preference.xml -->
-    <TextView
+        <TextView android:id="@+id/wifi_setup_status"
-       android:id="@+id/wifi_setup_status"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
                   android:background="#ff113344"
@@ -73,46 +66,40 @@
                   android:layout_marginBottom="20dip"
                   android:textAppearance="?android:attr/textAppearanceLarge"
                   android:text="@string/wifi_setup_status_select_network"/>
-    <fragment
+        <fragment class="com.android.settings.wifi.WifiSettings"
-       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
+    <RelativeLayout android:orientation="vertical"
-     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
+        <TextView android:id="@+id/scanning_progress_text"
-       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
+        <ProgressBar android:id="@+id/scanning_progress_bar"
-       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
+        <Button android:id="@+id/wifi_setup_connect"
-       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
+        <Button android:id="@+id/wifi_setup_forget"
-       android:id="@+id/wifi_setup_forget"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
@@ -120,8 +107,7 @@
                 android:text="@string/wifi_forget"
                 android:visibility="gone" />
 
-    <Button
+        <Button android:id="@+id/wifi_setup_skip_or_next"
-       android:id="@+id/wifi_setup_skip_or_next"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="30dip"
@@ -129,21 +115,18 @@
                 android:textSize="24dip"
                 android:text="@string/wifi_setup_skip" />
 
-    <Button
+        <Button android:id="@+id/wifi_setup_refresh_list"
-       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
+        <Button android:id="@+id/wifi_setup_add_network"
-       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>

res/layout/wifi_config_preference.xml

@@ -14,21 +14,15 @@
      limitations under the License.
 -->
 <!-- All ids in this layout must be in wifi_dialog.xml -->
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-   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"

res/xml/wifi_access_points_for_wifi_setup_xl.xml

@@ -14,11 +14,8 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-   xmlns:android="http://schemas.android.com/apk/res/android">
-
     <com.android.settings.wifi.AccessPointCategoryForSetupWizardXL
          android:key="access_points"
          android:persistent="false" />
-
 </PreferenceScreen>

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;
 

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 {

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);

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)

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.

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;

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;

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;
 
 /**