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

Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-07-17 02:57:23 +00:00
committed by Android (Google) Code Review
parent a1ed7f2f77 e817a66e83
commit 9b435f29d7
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());

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.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;
}