PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug #15702424 add-wifi setting screen has no title

Browse Source 
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
This commit is contained in:
Fabrice Di Meglio
2014-07-16 19:51:06 -07:00
parent a874180fbe
commit e817a66e83
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1421,6 +1421,8 @@
<string name="wifi_settings_summary">Set up &amp; manage wireless access points</string> <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
<!-- Used in the 1st-level settings screen to turn on Wi-Fi [CHAR LIMIT=60] --> <!-- 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> <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 --> <!-- Summary text when turning Wi-Fi or bluetooth on -->
<string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string> <string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string>
<!-- Summary text when turning Wi-Fi or bluetooth off --> <!-- Summary text when turning Wi-Fi or bluetooth off -->

2
src/com/android/settings/SettingsActivity.java
View File

@@ -476,7 +476,7 @@ public class SettingsActivity extends Activity
mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) || mIsShortcut = isShortCutIntent(intent) || isLikeShortCutIntent(intent) ||
intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false); intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);
final ComponentName cn = getIntent().getComponent(); final ComponentName cn = intent.getComponent();
final String className = cn.getClassName(); final String className = cn.getClassName();
mIsShowingDashboard = className.equals(Settings.class.getName()); mIsShowingDashboard = className.equals(Settings.class.getName());

2
src/com/android/settings/wifi/WifiPickerActivity.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.wifi;
import com.android.settings.ButtonBarHandler; import com.android.settings.ButtonBarHandler;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.wifi.p2p.WifiP2pSettings; import com.android.settings.wifi.p2p.WifiP2pSettings;
import com.android.settings.R;
import android.content.Intent; import android.content.Intent;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
@@ -31,6 +32,7 @@ public class WifiPickerActivity extends SettingsActivity implements ButtonBarHan
Intent modIntent = new Intent(super.getIntent()); Intent modIntent = new Intent(super.getIntent());
if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) { if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName()); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName());
modIntent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.wifi_select_network);
} }
return modIntent; return modIntent;
} }