Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to Allowed/Not allowed - Remove some dead code in related files - Add a toast string in DevelopmentSettingsDisabledActivity to prompt user enable dev options before use. - Add search in SpecialAccessSettings Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf Fix: 38290299 Fix: 37469224 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -1,91 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2016 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.datausage;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.NetworkPolicy;
|
||||
import android.net.NetworkTemplate;
|
||||
import android.os.Bundle;
|
||||
import android.os.RemoteException;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.util.AttributeSet;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.datausage.CellDataPreference.DataStateListener;
|
||||
|
||||
public class BillingCyclePreference extends Preference implements TemplatePreference {
|
||||
|
||||
private NetworkTemplate mTemplate;
|
||||
private NetworkServices mServices;
|
||||
private NetworkPolicy mPolicy;
|
||||
private int mSubId;
|
||||
|
||||
public BillingCyclePreference(Context context, AttributeSet attrs) {
|
||||
super(context, attrs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttached() {
|
||||
super.onAttached();
|
||||
mListener.setListener(true, mSubId, getContext());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetached() {
|
||||
mListener.setListener(false, mSubId, getContext());
|
||||
super.onDetached();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTemplate(NetworkTemplate template, int subId,
|
||||
NetworkServices services) {
|
||||
mTemplate = template;
|
||||
mSubId = subId;
|
||||
mServices = services;
|
||||
mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
|
||||
setSummary(getContext().getString(R.string.billing_cycle_fragment_summary, mPolicy != null
|
||||
? mPolicy.cycleDay
|
||||
: "1"));
|
||||
setIntent(getIntent());
|
||||
}
|
||||
|
||||
private void updateEnabled() {
|
||||
try {
|
||||
setEnabled(mPolicy != null && mServices.mNetworkService.isBandwidthControlEnabled()
|
||||
&& mServices.mTelephonyManager.getDataEnabled(mSubId)
|
||||
&& mServices.mUserManager.isAdminUser());
|
||||
} catch (RemoteException e) {
|
||||
setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Intent getIntent() {
|
||||
Bundle args = new Bundle();
|
||||
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
|
||||
return Utils.onBuildStartFragmentIntent(getContext(), BillingCycleSettings.class.getName(),
|
||||
args, null, 0, getTitle(), false, MetricsProto.MetricsEvent.VIEW_UNKNOWN);
|
||||
}
|
||||
|
||||
private final DataStateListener mListener = new DataStateListener() {
|
||||
@Override
|
||||
public void onChange(boolean selfChange) {
|
||||
updateEnabled();
|
||||
}
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user