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

Remove WifiSetupActivity

Browse Source 
That activity was copied into setup wizard and is no longer used.

Also removed setup_illustration_lock_screen because that is also
not used in the current GLIF theme.

Test: Existing Robolectric tests pass
Bug: 33590605
Change-Id: Ib2ea02a5e4bce17a7ea829b854f73caf7d5c5f97
This commit is contained in:
Maurice Lam
2016-12-13 16:03:11 -08:00
parent af71eb20c8
commit f8a325c7c6
46 changed files with 3 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
View File

@@ -1,205 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi;
import android.app.Dialog;
import android.net.wifi.WifiConfiguration;
import android.os.Bundle;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.setupwizardlib.SetupWizardListLayout;
import com.android.setupwizardlib.view.NavigationBar;
/**
* This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
* is not shown, clicking on an access point will auto-advance to the next screen (once connected),
* and, if the user opts to skip ahead without a wifi connection, a warning message alerts of
* possible carrier data charges or missing software updates.
*/
public class WifiSettingsForSetupWizard extends WifiSettings {
private static final String TAG = "WifiSettingsForSetupWizard";
private SetupWizardListLayout mLayout;
private View mAddOtherNetworkItem;
private TextView mEmptyFooter;
private View mMacAddressFooter;
private boolean mListLastEmpty = false;
@Override
public View onCreateView(final LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mLayout = (SetupWizardListLayout)
inflater.inflate(R.layout.setup_wifi_layout, container, false);
final ListView list = mLayout.getListView();
mAddOtherNetworkItem = inflater.inflate(R.layout.setup_wifi_add_network, list, false);
list.addFooterView(mAddOtherNetworkItem, null, true);
mAddOtherNetworkItem.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
if (mWifiManager.isWifiEnabled()) {
onAddNetworkPressed();
}
}
});
mMacAddressFooter = inflater.inflate(R.layout.setup_wifi_mac_address, list, false);
list.addFooterView(mMacAddressFooter, null, false);
final NavigationBar navigationBar = mLayout.getNavigationBar();
if (navigationBar != null) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.onNavigationBarCreated(navigationBar);
}
return mLayout;
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (hasNextButton()) {
getNextButton().setVisibility(View.GONE);
}
updateMacAddress();
}
@Override
public void onAccessPointsChanged() {
super.onAccessPointsChanged();
PreferenceScreen preferenceScreen = getPreferenceScreen();
updateFooter(preferenceScreen == null || preferenceScreen.getPreferenceCount() == 0);
}
@Override
public void onWifiStateChanged(int state) {
super.onWifiStateChanged(state);
updateMacAddress();
}
@Override
public void registerForContextMenu(View view) {
// Suppressed during setup wizard
}
@Override
/* package */ WifiEnabler createWifiEnabler() {
// Not shown during setup wizard
return null;
}
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
// Do not show menu during setup wizard
}
@Override
public Dialog onCreateDialog(int dialogId) {
final Dialog dialog = super.onCreateDialog(dialogId);
SetupWizardUtils.applyImmersiveFlags(dialog);
return dialog;
}
@Override
protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.networkSelected();
super.connect(config, isSavedNetwork);
}
@Override
protected void connect(final int networkId, boolean isSavedNetwork) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.networkSelected();
super.connect(networkId, isSavedNetwork);
}
@Override
protected TextView initEmptyTextView() {
final LayoutInflater inflater = LayoutInflater.from(getActivity());
mEmptyFooter = (TextView) inflater.inflate(R.layout.setup_wifi_empty, getListView(), false);
return mEmptyFooter;
}
protected void updateFooter(boolean isEmpty) {
if (isEmpty != mListLastEmpty) {
if (isEmpty) {
setFooterView(mEmptyFooter);
} else {
LinearLayout layout = new LinearLayout(getContext());
layout.setOrientation(LinearLayout.VERTICAL);
layout.addView(mAddOtherNetworkItem);
layout.addView(mMacAddressFooter);
setFooterView(layout);
}
mListLastEmpty = isEmpty;
}
}
@Override
public View setPinnedHeaderView(int layoutResId) {
// Pinned header is not supported in setup wizard
return null;
}
@Override
public void setPinnedHeaderView(View pinnedHeader) {
// Pinned header is not supported in setup wizard
}
@Override
protected void setProgressBarVisible(boolean visible) {
if (mLayout != null) {
if (visible) {
mLayout.showProgressBar();
} else {
mLayout.hideProgressBar();
}
}
}
private void updateMacAddress() {
if (mMacAddressFooter != null) {
String macAddress = null;
if (mWifiManager != null) {
android.net.wifi.WifiInfo connectionInfo = mWifiManager.getConnectionInfo();
if (connectionInfo != null) {
macAddress = connectionInfo.getMacAddress();
}
}
final TextView macAddressTextView =
(TextView) mMacAddressFooter.findViewById(R.id.mac_address);
macAddressTextView.setText(!TextUtils.isEmpty(macAddress) ?
macAddress : getString(R.string.status_unavailable));
}
}
}

288
src/com/android/settings/wifi/WifiSetupActivity.java
View File

@@ -1,288 +0,0 @@
/*
* Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.wifi;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment;
import android.util.Log;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.ButtonBarHandler;
import com.android.settings.R;
import com.android.settings.SetupWizardUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.setupwizardlib.view.NavigationBar;
public class WifiSetupActivity extends WifiPickerActivity
implements ButtonBarHandler, NavigationBar.NavigationBarListener {
private static final String TAG = "WifiSetupActivity";
// this boolean extra specifies whether to auto finish when connection is established
private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
// This boolean extra specifies whether network is required
private static final String EXTRA_IS_NETWORK_REQUIRED = "is_network_required";
// This boolean extra specifies whether wifi is required
private static final String EXTRA_IS_WIFI_REQUIRED = "is_wifi_required";
// Whether auto finish is suspended until user connects to an access point
private static final String EXTRA_REQUIRE_USER_NETWORK_SELECTION =
"wifi_require_user_network_selection";
// Key for whether the user selected network in saved instance state bundle
private static final String PARAM_USER_SELECTED_NETWORK = "userSelectedNetwork";
// Activity result when pressing the Skip button
private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
// Whether to auto finish when the user selected a network and successfully connected
private boolean mAutoFinishOnConnection;
// Whether network is required to proceed. This is decided in SUW and passed in as an extra.
private boolean mIsNetworkRequired;
// Whether wifi is required to proceed. This is decided in SUW and passed in as an extra.
private boolean mIsWifiRequired;
// Whether the user connected to a network. This excludes the auto-connecting by the system.
private boolean mUserSelectedNetwork;
// Whether the device is connected to WiFi
private boolean mWifiConnected;
private NavigationBar mNavigationBar;
private IntentFilter mFilter = new IntentFilter();
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
// Refresh the connection state with the latest connection info. Use the connection info
// from ConnectivityManager instead of the one attached in the intent to make sure
// we have the most up-to-date connection state. b/17511772
refreshConnectionState();
}
};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
final Intent intent = getIntent();
mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
mFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
mAutoFinishOnConnection = intent.getBooleanExtra(EXTRA_AUTO_FINISH_ON_CONNECT, false);
mIsNetworkRequired = intent.getBooleanExtra(EXTRA_IS_NETWORK_REQUIRED, false);
mIsWifiRequired = intent.getBooleanExtra(EXTRA_IS_WIFI_REQUIRED, false);
// Behave like the user already selected a network if we do not require selection
mUserSelectedNetwork = !intent.getBooleanExtra(EXTRA_REQUIRE_USER_NETWORK_SELECTION, false);
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putBoolean(PARAM_USER_SELECTED_NETWORK, mUserSelectedNetwork);
}
@Override
protected void onRestoreInstanceState(Bundle savedInstanceState) {
super.onRestoreInstanceState(savedInstanceState);
mUserSelectedNetwork = savedInstanceState.getBoolean(PARAM_USER_SELECTED_NETWORK, true);
}
private boolean isWifiConnected() {
final ConnectivityManager connectivity = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
boolean wifiConnected = connectivity != null &&
connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected();
mWifiConnected = wifiConnected;
return wifiConnected;
}
private void refreshConnectionState() {
if (isWifiConnected()) {
if (mAutoFinishOnConnection && mUserSelectedNetwork) {
Log.d(TAG, "Auto-finishing with connection");
finish(Activity.RESULT_OK);
// Require a user selection before auto-finishing next time we are here. The user
// can either connect to a different network or press "next" to proceed.
mUserSelectedNetwork = false;
}
setNextButtonText(R.string.suw_next_button_label);
setNextButtonEnabled(true);
} else if (mIsWifiRequired || (mIsNetworkRequired && !isNetworkConnected())) {
// We do not want the user to skip wifi setting if
// - wifi is required, but wifi connection hasn't been established yet;
// - or network is required, but no valid connection has been established.
setNextButtonText(R.string.skip_label);
setNextButtonEnabled(false);
} else {
// In other cases, user can choose to skip. Specifically these cases are
// - wifi is not required;
// - and network is not required;
// - or network is required and a valid connection has been established.
setNextButtonText(R.string.skip_label);
setNextButtonEnabled(true);
}
}
private void setNextButtonEnabled(boolean enabled) {
if (mNavigationBar != null) {
mNavigationBar.getNextButton().setEnabled(enabled);
}
}
private void setNextButtonText(int resId) {
if (mNavigationBar != null) {
mNavigationBar.getNextButton().setText(resId);
}
}
/* package */ void networkSelected() {
Log.d(TAG, "Network selected by user");
mUserSelectedNetwork = true;
}
@Override
public void onResume() {
super.onResume();
registerReceiver(mReceiver, mFilter);
refreshConnectionState();
}
@Override
public void onPause() {
unregisterReceiver(mReceiver);
super.onPause();
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent());
super.onApplyThemeResource(theme, resid, first);
}
@Override
protected boolean isValidFragment(String fragmentName) {
return WifiSettingsForSetupWizard.class.getName().equals(fragmentName);
}
@Override
/* package */ Class<? extends PreferenceFragment> getWifiSettingsClass() {
return WifiSettingsForSetupWizard.class;
}
/**
* Complete this activity and return the results to the caller.
*/
public void finish(int resultCode) {
Log.d(TAG, "finishing, resultCode=" + resultCode);
setResult(resultCode);
finish();
}
public void onNavigationBarCreated(final NavigationBar bar) {
mNavigationBar = bar;
bar.setNavigationBarListener(this);
SetupWizardUtils.setImmersiveMode(this);
}
@Override
public void onNavigateBack() {
onBackPressed();
}
@Override
public void onNavigateNext() {
if (mWifiConnected) {
finish(RESULT_OK);
} else {
// Warn of possible data charges if there is a network connection, or lack of updates
// if there is none.
final int message = isNetworkConnected() ? R.string.wifi_skipped_message :
R.string.wifi_and_mobile_skipped_message;
WifiSkipDialog.newInstance(message).show(getFragmentManager(), "dialog");
}
}
/**
* @return True if there is a valid network connection, whether it is via WiFi, mobile data or
* other means.
*/
private boolean isNetworkConnected() {
final ConnectivityManager connectivity = (ConnectivityManager)
getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity == null) {
return false;
}
final NetworkInfo info = connectivity.getActiveNetworkInfo();
return info != null && info.isConnected();
}
public static class WifiSkipDialog extends InstrumentedDialogFragment {
public static WifiSkipDialog newInstance(int messageRes) {
final Bundle args = new Bundle();
args.putInt("messageRes", messageRes);
final WifiSkipDialog dialog = new WifiSkipDialog();
dialog.setArguments(args);
return dialog;
}
public WifiSkipDialog() {
// no-arg constructor for fragment
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DIALOG_WIFI_SKIP;
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
int messageRes = getArguments().getInt("messageRes");
final AlertDialog dialog = new AlertDialog.Builder(getActivity())
.setMessage(messageRes)
.setCancelable(false)
.setPositiveButton(R.string.wifi_skip_anyway,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
WifiSetupActivity activity = (WifiSetupActivity) getActivity();
activity.finish(RESULT_SKIP);
}
})
.setNegativeButton(R.string.wifi_dont_skip,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
}
})
.create();
SetupWizardUtils.applyImmersiveFlags(dialog);
return dialog;
}
}
}