diff options
| author | Joe Onorato <joeo@google.com> | 2010-12-08 15:51:33 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-08 15:51:33 -0800 |
| commit | ff3c470778a69d262470e9707fce58dd485c6cc9 (patch) | |
| tree | 08d6543da4d1028be540f115c66e3ff5761f8c02 | |
| parent | cbcce92295f5fce4fee71d12e9a717a7acc64b05 (diff) | |
| parent | 64eb5d29007155e89b03cbb682845faf1fbd743d (diff) | |
| download | frameworks_base-ff3c470778a69d262470e9707fce58dd485c6cc9.zip frameworks_base-ff3c470778a69d262470e9707fce58dd485c6cc9.tar.gz frameworks_base-ff3c470778a69d262470e9707fce58dd485c6cc9.tar.bz2 | |
Merge "make the wifi button go where it's supposed to."
3 files changed, 7 insertions, 0 deletions
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 5e867e5..5e36da3 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 644cca0..9737028 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 0491baa..01436f8 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 |