From 64eb5d29007155e89b03cbb682845faf1fbd743d Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Wed, 8 Dec 2010 15:46:59 -0800
Subject: [PATCH] make the wifi button go where it's supposed to.

Change-Id: I415a5ad5e7524746d1e8d467f94058468bc719b7
---
 .../SystemUI/res/layout-xlarge/status_bar_settings_view.xml    | 1 +
 packages/SystemUI/res/values/strings.xml                       | 3 +++
 .../com/android/systemui/statusbar/tablet/SettingsView.java    | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
index 5e867e5d137ba..5e36da3960a36 100644
--- a/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
+++ b/packages/SystemUI/res/layout-xlarge/status_bar_settings_view.xml
@@ -64,6 +64,7 @@
         <TextView
                 android:id="@+id/network_label"
                 style="@style/StatusBarPanelSettingsContents"
+                android:text="@string/status_bar_settings_wifi_button"
                 />
         <ImageView
             android:layout_width="wrap_content"
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 644cca060c5ee..97370285c7c39 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -74,6 +74,9 @@
     <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
     <string name="status_bar_settings_settings_button">Settings</string>
 
+    <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+    <string name="status_bar_settings_wifi_button">Wi-Fi</string>
+
     <!-- Label in the system panel for airplane mode (all radios are turned off)[CHAR LIMIT=30] -->
     <string name="status_bar_settings_airplane">Airplane mode</string>
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
index 0491baa681464..01436f8b19d08 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
@@ -99,6 +99,9 @@ public class SettingsView extends LinearLayout implements View.OnClickListener {
     // ----------------------------
     private void onClickNetwork() {
         Slog.d(TAG, "onClickNetwork");
+        getContext().startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)
+                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        getStatusBarManager().collapse();
     }
 
     // Settings