diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/wifi/WifiPickerActivity.java | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 04e0b9a..8526523 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1421,6 +1421,8 @@ <string name="wifi_settings_summary">Set up & manage wireless access points</string> <!-- Used in the 1st-level settings screen to turn on Wi-Fi [CHAR LIMIT=60] --> <string name="wifi_setup_wizard_title">Select Wi\u2011Fi</string> + <!-- Used by Account creation for turning on Wi-Fi [CHAR LIMIT=60] --> + <string name="wifi_select_network">Select Wi\u2011Fi</string> <!-- Summary text when turning Wi-Fi or bluetooth on --> <string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string> <!-- Summary text when turning Wi-Fi or bluetooth off --> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 087540b..290473e 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -476,7 +476,7 @@ public class SettingsActivity extends Activity mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) || intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false); - final ComponentName cn = getIntent().getComponent(); + final ComponentName cn = intent.getComponent(); final String className = cn.getClassName(); mIsShowingDashboard = className.equals(Settings.class.getName()); diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index b306466..5bdceb9 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -18,6 +18,7 @@ package com.android.settings.wifi; import com.android.settings.ButtonBarHandler; import com.android.settings.SettingsActivity; import com.android.settings.wifi.p2p.WifiP2pSettings; +import com.android.settings.R; import android.content.Intent; import android.preference.PreferenceFragment; @@ -31,6 +32,7 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan Intent modIntent = new Intent(super.getIntent()); if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) { modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName()); + modIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.wifi_select_network); } return modIntent; } |