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

[WifiSettings] Add Wi-Fi dialog activity

Browse Source 
Add a Wi-Fi dialog activity that can be started by setup wizard to
connect to a Wi-Fi access point.

Also refactored mEdit and mModify in WifiConfigController into an
int-enum mMode, with modes view, connect and modify. This is how the
new modes maps to the old flags:

MODE_VIEW     --  mEdit = false, mModify = *
MODE_CONNECT  --  mEdit = true, mModify = false
MODE_MODIFY   --  mEdit = true, mModify = true

Bug: 23426311
Change-Id: I8e2221fd3c42577068e07686dab245dd5888e0ae
This commit is contained in:
Maurice Lam
2015-09-08 10:36:43 -07:00
parent 2662df8433
commit 771fac591f
8 changed files with 187 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.view.View;
import android.view.WindowManager;
import android.widget.Button;
class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterface.OnClickListener {
@@ -36,8 +37,7 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
private static final int BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE;
private static final int BUTTON_FORGET = DialogInterface.BUTTON_NEUTRAL;
private final boolean mEdit;
private final boolean mModify;
private final int mMode;
private final WifiDialogListener mListener;
private final AccessPoint mAccessPoint;
@@ -46,19 +46,17 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
private boolean mHideSubmitButton;
private boolean mHideForgetButton;
public WifiDialog(Context context, WifiDialogListener listener,
AccessPoint accessPoint, boolean edit, boolean modify,
boolean hideSubmitButton, boolean hideForgetButton) {
this(context, listener, accessPoint, edit, modify);
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
int mode, boolean hideSubmitButton, boolean hideForgetButton) {
this(context, listener, accessPoint, mode);
mHideSubmitButton = hideSubmitButton;
mHideForgetButton = hideForgetButton;
}
public WifiDialog(Context context, WifiDialogListener listener,
AccessPoint accessPoint, boolean edit, boolean modify) {
public WifiDialog(Context context, WifiDialogListener listener, AccessPoint accessPoint,
int mode) {
super(context);
mEdit = edit;
mModify = modify;
mMode = mode;
mListener = listener;
mAccessPoint = accessPoint;
mHideSubmitButton = false;
@@ -75,7 +73,7 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
mView = getLayoutInflater().inflate(R.layout.wifi_dialog, null);
setView(mView);
setInverseBackgroundForced(true);
mController = new WifiConfigController(this, mView, mAccessPoint, mEdit, mModify);
mController = new WifiConfigController(this, mView, mAccessPoint, mMode);
super.onCreate(savedInstanceState);
if (mHideSubmitButton) {
@@ -119,8 +117,8 @@ class WifiDialog extends AlertDialog implements WifiConfigUiBase, DialogInterfac
}
@Override
public boolean isEdit() {
return mEdit;
public int getMode() {
return mMode;
}
@Override