diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-17 02:57:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-16 23:30:53 +0000 |
| commit | 9b435f29d72d3be25c97ae3234ba375df055d09d (patch) | |
| tree | b249c31811a8f433f6e257c4b89c694aafb81948 | |
| parent | a1ed7f2f77f2518809bd369c236fb1d07fe2db6c (diff) | |
| parent | e817a66e83191c0ae74acd53a538a0965eba2683 (diff) | |
| download | packages_apps_Settings-9b435f29d72d3be25c97ae3234ba375df055d09d.zip packages_apps_Settings-9b435f29d72d3be25c97ae3234ba375df055d09d.tar.gz packages_apps_Settings-9b435f29d72d3be25c97ae3234ba375df055d09d.tar.bz2 | |
Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
| -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 6a470aa..ec13ce1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1429,6 +1429,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; } |