Previously, a string resource was deleted by mistake in commit
cce4e61260
. This bug went uncaught by
local and presubmit build checks. We add the missing string back to
strings.xml to fix the build. The affected string is referenced in
ManageablePreference.java.
Apologies for any inconvenience.
Test: make SettingsRoboTests; manually navigate through VPN settings
Bug: 36815998
Change-Id: Ibc2ef9ad43cad73ef5f078714faf5c52bc7198c6
97 lines
2.8 KiB
Java
97 lines
2.8 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.content.res.Resources;
|
|
import android.os.UserHandle;
|
|
import android.os.UserManager;
|
|
import android.text.TextUtils;
|
|
import android.util.AttributeSet;
|
|
|
|
import com.android.settings.widget.GearPreference;
|
|
import com.android.settings.R;
|
|
|
|
/**
|
|
* This class sets appropriate enabled state and user admin message when userId is set
|
|
*/
|
|
public abstract class ManageablePreference extends GearPreference {
|
|
|
|
public static int STATE_NONE = -1;
|
|
|
|
boolean mIsAlwaysOn = false;
|
|
int mState = STATE_NONE;
|
|
int mUserId;
|
|
|
|
public ManageablePreference(Context context, AttributeSet attrs) {
|
|
super(context, attrs);
|
|
setPersistent(false);
|
|
setOrder(0);
|
|
setUserId(UserHandle.myUserId());
|
|
}
|
|
|
|
public int getUserId() {
|
|
return mUserId;
|
|
}
|
|
|
|
public void setUserId(int userId) {
|
|
mUserId = userId;
|
|
checkRestrictionAndSetDisabled(UserManager.DISALLOW_CONFIG_VPN, userId);
|
|
}
|
|
|
|
public boolean isAlwaysOn() {
|
|
return mIsAlwaysOn;
|
|
}
|
|
|
|
public int getState() {
|
|
return mState;
|
|
}
|
|
|
|
public void setState(int state) {
|
|
if (mState != state) {
|
|
mState = state;
|
|
updateSummary();
|
|
notifyHierarchyChanged();
|
|
}
|
|
}
|
|
|
|
public void setAlwaysOn(boolean isEnabled) {
|
|
if (mIsAlwaysOn != isEnabled) {
|
|
mIsAlwaysOn = isEnabled;
|
|
updateSummary();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Update the preference summary string (see {@see Preference#setSummary}) with a string
|
|
* reflecting connection status and always-on setting.
|
|
*
|
|
* State is not shown for {@code STATE_NONE}.
|
|
*/
|
|
protected void updateSummary() {
|
|
final Resources res = getContext().getResources();
|
|
final String[] states = res.getStringArray(R.array.vpn_states);
|
|
String summary = (mState == STATE_NONE ? "" : states[mState]);
|
|
if (mIsAlwaysOn) {
|
|
final String alwaysOnString = res.getString(R.string.vpn_always_on_summary_active);
|
|
summary = TextUtils.isEmpty(summary) ? alwaysOnString : res.getString(
|
|
R.string.join_two_unrelated_items, summary, alwaysOnString);
|
|
}
|
|
setSummary(summary);
|
|
}
|
|
}
|