vpn2: show third-party VPN services
VPN apps are shown alongside configured VPNs now. The requirement that a password is set is now only enforced when setting up a configured VPN as this is not necessary for apps. Some UI redesign. Bug: 19573824 Bug: 17474682 Bug: 19575658 Change-Id: I02bd977136929647d65b9784fb4cc5df24b45428
This commit is contained in:
50
src/com/android/settings/vpn2/ManageablePreference.java
Normal file
50
src/com/android/settings/vpn2/ManageablePreference.java
Normal file
@@ -0,0 +1,50 @@
|
||||
/*
|
||||
* 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.preference.Preference;
|
||||
import android.util.AttributeSet;
|
||||
import android.view.View;
|
||||
import android.view.View.OnClickListener;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* Preference with an additional gear icon. Touching the gear icon triggers an
|
||||
* onChange event.
|
||||
*/
|
||||
public class ManageablePreference extends Preference {
|
||||
OnClickListener mListener;
|
||||
View mManageView;
|
||||
|
||||
public ManageablePreference(Context context, AttributeSet attrs, OnClickListener onManage) {
|
||||
super(context, attrs);
|
||||
mListener = onManage;
|
||||
setPersistent(false);
|
||||
setOrder(0);
|
||||
setWidgetLayoutResource(R.layout.preference_vpn);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onBindView(View view) {
|
||||
mManageView = view.findViewById(R.id.manage);
|
||||
mManageView.setOnClickListener(mListener);
|
||||
mManageView.setTag(this);
|
||||
super.onBindView(view);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user