0b4fdc49fb
Add a gear on Settings menu, and move a bunch of stuff from overflow and advanced screen to there. Also move add network to be the last item in the list rather than in overflow. Also fix WifiP2p breakage. Change-Id: I5c84c25e5ba9224f77dcd988b0b2850ae6e71168
114 lines
4.1 KiB
Java
114 lines
4.1 KiB
Java
/*
|
|
* Copyright (C) 2011 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.app.DialogFragment;
|
|
import android.content.Context;
|
|
import android.content.Intent;
|
|
import android.net.wifi.WpsInfo;
|
|
import android.os.Bundle;
|
|
import android.security.Credentials;
|
|
import android.support.v7.preference.Preference;
|
|
import android.support.v7.preference.Preference.OnPreferenceClickListener;
|
|
import com.android.internal.logging.MetricsLogger;
|
|
import com.android.settings.R;
|
|
import com.android.settings.SettingsPreferenceFragment;
|
|
|
|
public class AdvancedWifiSettings extends SettingsPreferenceFragment {
|
|
private static final String TAG = "AdvancedWifiSettings";
|
|
|
|
private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
|
|
private static final String KEY_WIFI_DIRECT = "wifi_direct";
|
|
private static final String KEY_WPS_PUSH = "wps_push_button";
|
|
private static final String KEY_WPS_PIN = "wps_pin_entry";
|
|
|
|
@Override
|
|
protected int getMetricsCategory() {
|
|
return MetricsLogger.WIFI_ADVANCED;
|
|
}
|
|
|
|
@Override
|
|
public void onCreate(Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
addPreferencesFromResource(R.xml.wifi_advanced_settings);
|
|
}
|
|
|
|
@Override
|
|
public void onResume() {
|
|
super.onResume();
|
|
initPreferences();
|
|
}
|
|
|
|
private void initPreferences() {
|
|
final Context context = getActivity();
|
|
Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);
|
|
intent.setClassName("com.android.certinstaller",
|
|
"com.android.certinstaller.CertInstallerMain");
|
|
intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, android.os.Process.WIFI_UID);
|
|
Preference pref = findPreference(KEY_INSTALL_CREDENTIALS);
|
|
pref.setIntent(intent);
|
|
|
|
|
|
Intent wifiDirectIntent = new Intent(context,
|
|
com.android.settings.Settings.WifiP2pSettingsActivity.class);
|
|
Preference wifiDirectPref = findPreference(KEY_WIFI_DIRECT);
|
|
wifiDirectPref.setIntent(wifiDirectIntent);
|
|
|
|
// WpsDialog: Create the dialog like WifiSettings does.
|
|
Preference wpsPushPref = findPreference(KEY_WPS_PUSH);
|
|
wpsPushPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
public boolean onPreferenceClick(Preference arg0) {
|
|
WpsFragment wpsFragment = new WpsFragment(WpsInfo.PBC);
|
|
wpsFragment.show(getFragmentManager(), KEY_WPS_PUSH);
|
|
return true;
|
|
}
|
|
});
|
|
|
|
// WpsDialog: Create the dialog like WifiSettings does.
|
|
Preference wpsPinPref = findPreference(KEY_WPS_PIN);
|
|
wpsPinPref.setOnPreferenceClickListener(new OnPreferenceClickListener(){
|
|
public boolean onPreferenceClick(Preference arg0) {
|
|
WpsFragment wpsFragment = new WpsFragment(WpsInfo.DISPLAY);
|
|
wpsFragment.show(getFragmentManager(), KEY_WPS_PIN);
|
|
return true;
|
|
}
|
|
});
|
|
}
|
|
|
|
/* Wrapper class for the WPS dialog to properly handle life cycle events like rotation. */
|
|
public static class WpsFragment extends DialogFragment {
|
|
private static int mWpsSetup;
|
|
|
|
// Public default constructor is required for rotation.
|
|
public WpsFragment() {
|
|
super();
|
|
}
|
|
|
|
public WpsFragment(int wpsSetup) {
|
|
super();
|
|
mWpsSetup = wpsSetup;
|
|
}
|
|
|
|
@Override
|
|
public Dialog onCreateDialog(Bundle savedInstanceState) {
|
|
return new WpsDialog(getActivity(), mWpsSetup);
|
|
}
|
|
}
|
|
|
|
}
|