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

Enable Back during setup wizard

Browse Source 
Aside from enabling the system back button, updated the result codes
to distinguish back (RESULT_CANCEL) from skip (RESULT_SKIP).

This CL should have been uploaded along with http://ag/284254,
which has already been merged.

Bug: 6477759
Bug: 8409375
Change-Id: I031acda1d675ee79a3166a51073113093211709d
This commit is contained in:
Russell Brenner
2013-03-18 11:07:34 -07:00
parent 474958fc67
commit eca454ebc2
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
import android.app.ActionBar; import android.app.ActionBar;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog; import android.app.Dialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -45,7 +44,6 @@ import android.os.Message;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.security.Credentials;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
@@ -114,6 +112,9 @@ public class WifiSettings extends SettingsPreferenceFragment
private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode"; private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state"; private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
// Activity result when pressing the Skip button
private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
private final IntentFilter mFilter; private final IntentFilter mFilter;
private final BroadcastReceiver mReceiver; private final BroadcastReceiver mReceiver;
private final Scanner mScanner; private final Scanner mScanner;
@@ -277,8 +278,10 @@ public class WifiSettings extends SettingsPreferenceFragment
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
mConnectListener = new WifiManager.ActionListener() { mConnectListener = new WifiManager.ActionListener() {
@Override
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailure(int reason) { public void onFailure(int reason) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
@@ -290,8 +293,10 @@ public class WifiSettings extends SettingsPreferenceFragment
}; };
mSaveListener = new WifiManager.ActionListener() { mSaveListener = new WifiManager.ActionListener() {
@Override
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailure(int reason) { public void onFailure(int reason) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
@@ -303,8 +308,10 @@ public class WifiSettings extends SettingsPreferenceFragment
}; };
mForgetListener = new WifiManager.ActionListener() { mForgetListener = new WifiManager.ActionListener() {
@Override
public void onSuccess() { public void onSuccess() {
} }
@Override
public void onFailure(int reason) { public void onFailure(int reason) {
Activity activity = getActivity(); Activity activity = getActivity();
if (activity != null) { if (activity != null) {
@@ -363,7 +370,7 @@ public class WifiSettings extends SettingsPreferenceFragment
if (mSetupWizardMode) { if (mSetupWizardMode) {
getView().setSystemUiVisibility( getView().setSystemUiVisibility(
View.STATUS_BAR_DISABLE_BACK | // View.STATUS_BAR_DISABLE_BACK |
View.STATUS_BAR_DISABLE_HOME | View.STATUS_BAR_DISABLE_HOME |
View.STATUS_BAR_DISABLE_RECENT | View.STATUS_BAR_DISABLE_RECENT |
View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS | View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
@@ -634,7 +641,7 @@ public class WifiSettings extends SettingsPreferenceFragment
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
getActivity().setResult(Activity.RESULT_CANCELED); getActivity().setResult(RESULT_SKIP);
getActivity().finish(); getActivity().finish();
} }
}) })
@@ -653,7 +660,7 @@ public class WifiSettings extends SettingsPreferenceFragment
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int id) { public void onClick(DialogInterface dialog, int id) {
getActivity().setResult(Activity.RESULT_CANCELED); getActivity().setResult(RESULT_SKIP);
getActivity().finish(); getActivity().finish();
} }
}) })
@@ -941,6 +948,7 @@ public class WifiSettings extends SettingsPreferenceFragment
} }
} }
@Override
public void onClick(DialogInterface dialogInterface, int button) { public void onClick(DialogInterface dialogInterface, int button) {
if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) { if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
forget(); forget();