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

am 079c412d: Merge "Add more fragments to valid list for Wifi activity" into klp-dev

Browse Source 
* commit '079c412def3472fc37750b7f778be3bb03114e38':
  Add more fragments to valid list for Wifi activity
This commit is contained in:
Amith Yamasani
2013-08-28 14:54:34 -07:00
committed by Android Git Automerger
parent 3d0992d811 079c412def
commit 2c3fedd0ac
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ package com.android.settings.wifi;
import com.android.settings.ButtonBarHandler; import com.android.settings.ButtonBarHandler;
import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.wifi.p2p.WifiP2pSettings;
import android.app.Fragment; import android.app.Fragment;
import android.content.Intent; import android.content.Intent;
@@ -45,7 +46,9 @@ public class WifiPickerActivity extends PreferenceActivity implements ButtonBarH
@Override @Override
protected boolean isValidFragment(String fragmentName) { protected boolean isValidFragment(String fragmentName) {
if (WifiSettings.class.getName().equals(fragmentName)) return true; if (WifiSettings.class.getName().equals(fragmentName)
|| WifiP2pSettings.class.getName().equals(fragmentName)
|| AdvancedWifiSettings.class.getName().equals(fragmentName)) return true;
return false; return false;
} }