Add PreferenceControllers to Network page.
- Also made tiles refresh more efficient: when category changes, only refresh dynamic tiles. Static tiles from xml will not change due to category change. Bug: 31799836 Test: RunSettingsRoboTests Change-Id: I1e4c85f2c122c65ec99729e43a66c80acdd863c8
This commit is contained in:
@@ -0,0 +1,116 @@
|
||||
/*
|
||||
* 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.network;
|
||||
|
||||
import android.app.Fragment;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.os.SystemProperties;
|
||||
import android.support.v14.preference.SwitchPreference;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.internal.telephony.TelephonyIntents;
|
||||
import com.android.internal.telephony.TelephonyProperties;
|
||||
import com.android.settings.AirplaneModeEnabler;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
|
||||
import com.android.settings.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settings.core.lifecycle.events.OnPause;
|
||||
import com.android.settings.core.lifecycle.events.OnResume;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
public class AirplaneModePreferenceController extends PreferenceController
|
||||
implements LifecycleObserver, OnResume, OnPause {
|
||||
|
||||
public static final int REQUEST_CODE_EXIT_ECM = 1;
|
||||
|
||||
public static final String KEY_TOGGLE_AIRPLANE = "toggle_airplane";
|
||||
|
||||
private static final String EXIT_ECM_RESULT = "exit_ecm_result";
|
||||
|
||||
private final Fragment mFragment;
|
||||
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
||||
private final PackageManager mPackageManager;
|
||||
private AirplaneModeEnabler mAirplaneModeEnabler;
|
||||
private SwitchPreference mAirplaneModePreference;
|
||||
|
||||
|
||||
public AirplaneModePreferenceController(Context context, Fragment hostFragment) {
|
||||
super(context);
|
||||
mFragment = hostFragment;
|
||||
mPackageManager = context.getPackageManager();
|
||||
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
if (KEY_TOGGLE_AIRPLANE.equals(preference.getKey()) && Boolean.parseBoolean(
|
||||
SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
|
||||
// In ECM mode launch ECM app dialog
|
||||
if (mFragment != null) {
|
||||
mFragment.startActivityForResult(
|
||||
new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),
|
||||
REQUEST_CODE_EXIT_ECM);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
if (isAvailable()) {
|
||||
mAirplaneModePreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
|
||||
if (mAirplaneModePreference != null) {
|
||||
mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, mAirplaneModePreference,
|
||||
mMetricsFeatureProvider);
|
||||
}
|
||||
} else {
|
||||
removePreference(screen, getPreferenceKey());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isAvailable() {
|
||||
return !mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPreferenceKey() {
|
||||
return KEY_TOGGLE_AIRPLANE;
|
||||
}
|
||||
|
||||
public void onResume() {
|
||||
mAirplaneModeEnabler.resume();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPause() {
|
||||
mAirplaneModeEnabler.pause();
|
||||
}
|
||||
|
||||
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
if (requestCode == REQUEST_CODE_EXIT_ECM) {
|
||||
Boolean isChoiceYes = data.getBooleanExtra(EXIT_ECM_RESULT, false);
|
||||
// Set Airplane mode based on the return value and checkbox state
|
||||
mAirplaneModeEnabler.setAirplaneModeInECM(isChoiceYes,
|
||||
mAirplaneModePreference.isChecked());
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
* 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.network;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
|
||||
import static android.os.UserHandle.myUserId;
|
||||
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
|
||||
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
|
||||
|
||||
public class MobileNetworkPreferenceController extends PreferenceController {
|
||||
|
||||
private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
|
||||
|
||||
private final UserManager mUserManager;
|
||||
private final boolean mIsSecondaryUser;
|
||||
|
||||
public MobileNetworkPreferenceController(Context context) {
|
||||
super(context);
|
||||
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
mIsSecondaryUser = !mUserManager.isAdminUser();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isAvailable() {
|
||||
return mIsSecondaryUser
|
||||
|| Utils.isWifiOnly(mContext)
|
||||
|| hasBaseUserRestriction(mContext, DISALLOW_CONFIG_MOBILE_NETWORKS, myUserId());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPreferenceKey() {
|
||||
return KEY_MOBILE_NETWORK_SETTINGS;
|
||||
}
|
||||
}
|
@@ -22,6 +22,7 @@ import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class NetworkDashboardFragment extends DashboardFragment {
|
||||
@@ -50,6 +51,15 @@ public class NetworkDashboardFragment extends DashboardFragment {
|
||||
|
||||
@Override
|
||||
protected List<PreferenceController> getPreferenceControllers(Context context) {
|
||||
return null;
|
||||
final AirplaneModePreferenceController airplaneModePreferenceController =
|
||||
new AirplaneModePreferenceController(context, this /* fragment */);
|
||||
getLifecycle().addObserver(airplaneModePreferenceController);
|
||||
|
||||
final List<PreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(airplaneModePreferenceController);
|
||||
controllers.add(new TetherPreferenceController(context));
|
||||
controllers.add(new MobileNetworkPreferenceController(context));
|
||||
controllers.add(new VpnPreferenceController(context));
|
||||
return controllers;
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* 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.network;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.TetherSettings;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
|
||||
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
|
||||
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
|
||||
|
||||
public class TetherPreferenceController extends PreferenceController {
|
||||
|
||||
private static final String KEY_TETHER_SETTINGS = "tether_settings";
|
||||
|
||||
private final boolean mAdminDisallowedTetherConfig;
|
||||
private final ConnectivityManager mConnectivityManager;
|
||||
private final UserManager mUserManager;
|
||||
|
||||
public TetherPreferenceController(Context context) {
|
||||
super(context);
|
||||
mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
|
||||
context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
|
||||
mConnectivityManager =
|
||||
(ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
final Preference preference = screen.findPreference(KEY_TETHER_SETTINGS);
|
||||
if (preference != null && !mAdminDisallowedTetherConfig) {
|
||||
preference.setTitle(
|
||||
com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));
|
||||
|
||||
// Grey out if provisioning is not available.
|
||||
preference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isAvailable() {
|
||||
final boolean isBlocked =
|
||||
(!mConnectivityManager.isTetheringSupported() && !mAdminDisallowedTetherConfig)
|
||||
|| hasBaseUserRestriction(mContext, DISALLOW_CONFIG_TETHERING,
|
||||
UserHandle.myUserId());
|
||||
return !isBlocked;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateNonIndexableKeys(List<String> keys) {
|
||||
if (!mUserManager.isAdminUser() || !mConnectivityManager.isTetheringSupported()) {
|
||||
keys.add(KEY_TETHER_SETTINGS);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPreferenceKey() {
|
||||
return KEY_TETHER_SETTINGS;
|
||||
}
|
||||
}
|
@@ -0,0 +1,71 @@
|
||||
/*
|
||||
* 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.network;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import android.provider.Settings;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
|
||||
|
||||
public class VpnPreferenceController extends PreferenceController {
|
||||
|
||||
private static final String KEY_VPN_SETTINGS = "vpn_settings";
|
||||
|
||||
private final String mToggleable;
|
||||
private final boolean mIsSecondaryUser;
|
||||
|
||||
public VpnPreferenceController(Context context) {
|
||||
super(context);
|
||||
mToggleable = Settings.Global.getString(context.getContentResolver(),
|
||||
Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
|
||||
mIsSecondaryUser = !UserManager.get(context).isAdminUser();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
// Manually set dependencies for Wifi when not toggleable.
|
||||
if (mToggleable == null || !mToggleable.contains(Settings.Global.RADIO_WIFI)) {
|
||||
final Preference pref = screen.findPreference(KEY_VPN_SETTINGS);
|
||||
if (pref != null) {
|
||||
pref.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isAvailable() {
|
||||
// TODO: http://b/23693383
|
||||
return mIsSecondaryUser || RestrictedLockUtils.hasBaseUserRestriction(mContext,
|
||||
UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getPreferenceKey() {
|
||||
return KEY_VPN_SETTINGS;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user