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

Merge changes Idb448ea3,I7dc26369

Browse Source 
* changes:
  Fix crash on "Set up Wi-Fi NFC tag" dialog
  Fix bug about Wi-Fi dialog rotation
This commit is contained in:
TreeHugger Robot
2018-08-17 15:35:20 +00:00
committed by Android (Google) Code Review
parent 090d9b22df 5f7c991162
commit a439fec1c8
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -87,7 +88,7 @@ import java.util.List;
@SearchIndexable @SearchIndexable
public class WifiSettings extends RestrictedSettingsFragment public class WifiSettings extends RestrictedSettingsFragment
implements Indexable, WifiTracker.WifiListener, AccessPointListener, implements Indexable, WifiTracker.WifiListener, AccessPointListener,
WifiDialog.WifiDialogListener { WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener {
private static final String TAG = "WifiSettings"; private static final String TAG = "WifiSettings";
@@ -432,9 +433,8 @@ public class WifiSettings extends RestrictedSettingsFragment
@Override @Override
public void onSaveInstanceState(Bundle outState) { public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState); super.onSaveInstanceState(outState);
// If dialog has been shown, save its state.
// If the dialog is showing, save its state. if (mDialog != null) {
if (mDialog != null && mDialog.isShowing()) {
outState.putInt(SAVE_DIALOG_MODE, mDialogMode); outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
if (mDlgAccessPoint != null) { if (mDlgAccessPoint != null) {
mAccessPointSavedState = new Bundle(); mAccessPointSavedState = new Bundle();
@@ -443,7 +443,7 @@ public class WifiSettings extends RestrictedSettingsFragment
} }
} }
if (mWifiToNfcDialog != null && mWifiToNfcDialog.isShowing()) { if (mWifiToNfcDialog != null) {
Bundle savedState = new Bundle(); Bundle savedState = new Bundle();
mWifiToNfcDialog.saveState(savedState); mWifiToNfcDialog.saveState(savedState);
outState.putBundle(SAVED_WIFI_NFC_DIALOG_STATE, savedState); outState.putBundle(SAVED_WIFI_NFC_DIALOG_STATE, savedState);
@@ -617,12 +617,24 @@ public class WifiSettings extends RestrictedSettingsFragment
mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(getActivity(), mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(getActivity(),
mWifiNfcDialogSavedState); mWifiNfcDialogSavedState);
} }
return mWifiToNfcDialog; return mWifiToNfcDialog;
} }
return super.onCreateDialog(dialogId); return super.onCreateDialog(dialogId);
} }
@Override
public void onDialogShowing() {
super.onDialogShowing();
setOnDismissListener(this);
}
@Override
public void onDismiss(DialogInterface dialog) {
// We don't keep any dialog object when dialog was dismissed.
mDialog = null;
mWifiToNfcDialog = null;
}
@Override @Override
public int getDialogMetricsCategory(int dialogId) { public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) { switch (dialogId) {