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

am d94e78b4: Merge "Fixed crash when changing orientation in the Add Networks dialog." into lmp-dev

Browse Source 
* commit 'd94e78b4b2434259abb72563ee431b8312210ce0':
  Fixed crash when changing orientation in the Add Networks dialog.
This commit is contained in:
PauloftheWest
2014-07-30 22:26:36 +00:00
committed by Android Git Automerger
parent c39fcc87a7 d94e78b4b2
commit 52d98cac7f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -300,7 +300,6 @@ public class WifiConfigController implements TextWatcher,
}
}
if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
}else{

8
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -345,10 +345,12 @@ public class WifiSettings extends RestrictedSettingsFragment
}
};
if (savedInstanceState != null
&& savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
if (savedInstanceState != null) {
mDlgEdit = savedInstanceState.getBoolean(SAVE_DIALOG_EDIT_MODE);
mAccessPointSavedState = savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
mAccessPointSavedState =
savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
}
}
// if we're supposed to enable/disable the Next button based on our current connection