diff options
author | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-13 11:11:42 +0100 |
---|---|---|
committer | Zoltan Szatmary-Ban <szatmz@google.com> | 2014-08-13 11:11:42 +0100 |
commit | 1e6653a1b516ad86f43dcb4032d21a27878c2618 (patch) | |
tree | c4ee5f48719419bde49a07de6dfa95106e836e0e /src/com/android/settings/vpn2 | |
parent | b51253cfed0796b20e03a104aaca4d8d3e2d3024 (diff) | |
download | packages_apps_Settings-1e6653a1b516ad86f43dcb4032d21a27878c2618.tar.gz packages_apps_Settings-1e6653a1b516ad86f43dcb4032d21a27878c2618.tar.bz2 packages_apps_Settings-1e6653a1b516ad86f43dcb4032d21a27878c2618.zip |
Remove spinner in Settings > VPN
This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209
Bug:16030111
Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
Diffstat (limited to 'src/com/android/settings/vpn2')
-rw-r--r-- | src/com/android/settings/vpn2/VpnSettings.java | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index 5be904656..c707b4473 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -16,13 +16,11 @@ package com.android.settings.vpn2; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -31,13 +29,10 @@ import android.os.Handler; import android.os.Message; import android.os.ServiceManager; import android.os.SystemProperties; -import android.os.UserHandle; import android.os.UserManager; -import android.os.Process; import android.preference.Preference; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; -import android.provider.Settings; import android.security.Credentials; import android.security.KeyStore; import android.text.TextUtils; @@ -49,14 +44,11 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; -import android.widget.AdapterView.OnItemSelectedListener; -import android.widget.Spinner; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; @@ -64,9 +56,6 @@ import com.android.internal.net.VpnProfile; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.UserSpinnerAdapter; -import com.android.settings.UserSpinnerAdapter.UserDetails; -import com.android.settings.Utils; import com.google.android.collect.Lists; @@ -76,12 +65,11 @@ import java.util.List; public class VpnSettings extends SettingsPreferenceFragment implements Handler.Callback, Preference.OnPreferenceClickListener, - DialogInterface.OnClickListener, DialogInterface.OnDismissListener, OnItemSelectedListener { + DialogInterface.OnClickListener, DialogInterface.OnDismissListener { private static final String TAG = "VpnSettings"; private static final String TAG_LOCKDOWN = "lockdown"; - private static final String ACTION_VPN_SETTINGS = "android.net.vpn.SETTINGS"; private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN"; // TODO: migrate to using DialogFragment when editing @@ -102,7 +90,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements private String mSelectedKey; private boolean mUnavailable; - private UserSpinnerAdapter mProfileSpinnerAdapter; @Override public void onCreate(Bundle savedState) { @@ -130,39 +117,6 @@ public class VpnSettings extends SettingsPreferenceFragment implements } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - Context context = getActivity(); - mProfileSpinnerAdapter = Utils.createUserSpinnerAdapter(mUm, getActivity()); - if (mProfileSpinnerAdapter != null) { - Spinner spinner = (Spinner) getActivity().getLayoutInflater().inflate( - R.layout.spinner_view, null); - - spinner.setAdapter(mProfileSpinnerAdapter); - spinner.setOnItemSelectedListener(this); - setPinnedHeaderView(spinner); - } - } - - @Override - public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { - UserHandle selectedUser = mProfileSpinnerAdapter.getUserHandle(position); - if (selectedUser.getIdentifier() != UserHandle.myUserId()) { - Intent intent = new Intent(ACTION_VPN_SETTINGS); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - Activity activity = getActivity(); - activity.startActivityAsUser(intent, selectedUser); - activity.finish(); - } - } - - @Override - public void onNothingSelected(AdapterView<?> parent) { - // Nothing to do - } - - @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.vpn, menu); |