14c2ac4dcb
- Show admin support details when user taps on a cell and user restriction is on - Show always-on-vpn active status in preference summary - User can still open non-configurable per-VPN info page even when user restriction is applied - Rename ConfigPreference to LegacyVpnPreference - Move summary String handling into ManageablePreference - ManageablePreference inherits GearPreference to reuse the code - Don't show disconnect dialog when always-on is enabled BUG=26950700 Change-Id: I37b087879cf3b674df528e7787d7bb1eead3310f
97 lines
3.0 KiB
Java
97 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2015 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.vpn2;
|
|
|
|
import android.content.Context;
|
|
import android.support.v7.preference.Preference;
|
|
import android.view.View;
|
|
|
|
import com.android.internal.net.VpnProfile;
|
|
import com.android.settings.R;
|
|
import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED;
|
|
|
|
/**
|
|
* {@link android.support.v7.preference.Preference} tracks the underlying legacy vpn profile and
|
|
* its connection state.
|
|
*/
|
|
public class LegacyVpnPreference extends ManageablePreference {
|
|
private VpnProfile mProfile;
|
|
|
|
/** One of the STATE_* fields from LegacyVpnInfo, or STATE_NONE */
|
|
private int mState = STATE_NONE;
|
|
|
|
LegacyVpnPreference(Context context) {
|
|
super(context, null /* attrs */);
|
|
}
|
|
|
|
public VpnProfile getProfile() {
|
|
return mProfile;
|
|
}
|
|
|
|
public void setProfile(VpnProfile profile) {
|
|
mProfile = profile;
|
|
update();
|
|
}
|
|
|
|
public void setState(int state) {
|
|
mState = state;
|
|
update();
|
|
}
|
|
|
|
private void update() {
|
|
setSummary(getSummaryString(mState));
|
|
if (mProfile != null) {
|
|
setIcon(R.mipmap.ic_launcher_settings);
|
|
setTitle(mProfile.name);
|
|
}
|
|
notifyHierarchyChanged();
|
|
}
|
|
|
|
@Override
|
|
public int compareTo(Preference preference) {
|
|
if (preference instanceof LegacyVpnPreference) {
|
|
LegacyVpnPreference another = (LegacyVpnPreference) preference;
|
|
int result;
|
|
if ((result = another.mState - mState) == 0 &&
|
|
(result = mProfile.name.compareToIgnoreCase(another.mProfile.name)) == 0 &&
|
|
(result = mProfile.type - another.mProfile.type) == 0) {
|
|
result = mProfile.key.compareTo(another.mProfile.key);
|
|
}
|
|
return result;
|
|
} else if (preference instanceof AppPreference) {
|
|
// Try to sort connected VPNs first
|
|
AppPreference another = (AppPreference) preference;
|
|
if (mState != STATE_CONNECTED && another.getState() == AppPreference.STATE_CONNECTED) {
|
|
return 1;
|
|
}
|
|
// Show configured VPNs before app VPNs
|
|
return -1;
|
|
} else {
|
|
return super.compareTo(preference);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onClick(View v) {
|
|
if (v.getId() == R.id.settings_button && isDisabledByAdmin()) {
|
|
performClick();
|
|
return;
|
|
}
|
|
super.onClick(v);
|
|
}
|
|
|
|
} |