Merge "Move SimStatus and ImeiInfo Pref Controllers to SettingsLib" (3ec4dcb5) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/Utils.java

+1 −11

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.annotation.Nullable;
		import android.app.ActivityManager;
		import android.app.AlertDialog;
		import android.app.AppGlobals;
		import android.app.AppOpsManager;
		import android.app.Dialog;
		import android.app.Fragment;
		import android.app.IActivityManager;
		@@ -103,9 +102,6 @@ import android.util.TypedValue;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.animation.Animation;
		import android.view.animation.Animation.AnimationListener;
		import android.view.animation.AnimationUtils;
		import android.widget.EditText;
		import android.widget.ListView;
		import android.widget.TabWidget;
		@@ -114,8 +110,8 @@ import com.android.internal.app.UnlaunchableAppActivity;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.UserIcons;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.wrapper.FingerprintManagerWrapper;
		import com.android.settings.wrapper.DevicePolicyManagerWrapper;
		import com.android.settings.wrapper.FingerprintManagerWrapper;

		import java.io.IOException;
		import java.io.InputStream;
		@@ -242,12 +238,6 @@ public final class Utils extends com.android.settingslib.Utils {
		return telephony != null && telephony.isVoiceCapable();
		}

		public static boolean isWifiOnly(Context context) {
		ConnectivityManager cm = (ConnectivityManager)context.getSystemService(
		Context.CONNECTIVITY_SERVICE);
		return (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE) == false);
		}

		/**
		* Returns the WIFI IP Addresses, if any, taking into account IPv4 and IPv6 style addresses.
		* @param context the application context

src/com/android/settings/datetime/AutoTimeZonePreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ import android.provider.Settings;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;

		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.AbstractPreferenceController;

		public class AutoTimeZonePreferenceController extends AbstractPreferenceController

src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ import android.os.SystemProperties;
		import android.support.v7.preference.Preference;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.AbstractPreferenceController;

		public class BasebandVersionPreferenceController extends AbstractPreferenceController implements

src/com/android/settings/deviceinfo/ImeiInfoPreferenceController.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -17,13 +17,11 @@
		package com.android.settings.deviceinfo;

		import android.content.Context;
		import android.os.UserManager;

		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;

		public class ImeiInfoPreferenceController extends AbstractPreferenceController
		public class ImeiInfoPreferenceController extends AbstractSimStatusImeiInfoPreferenceController
		implements PreferenceControllerMixin {

		private static final String KEY_IMEI_INFO = "imei_info";
		@@ -32,12 +30,6 @@ public class ImeiInfoPreferenceController extends AbstractPreferenceController
		super(context);
		}

		@Override
		public boolean isAvailable() {
		return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser()
		&& !Utils.isWifiOnly(mContext);
		}

		@Override
		public String getPreferenceKey() {
		return KEY_IMEI_INFO;

src/com/android/settings/deviceinfo/SimStatusPreferenceController.java

+2 −10

Original line number	Diff line number	Diff line
		@@ -17,13 +17,11 @@
		package com.android.settings.deviceinfo;

		import android.content.Context;
		import android.os.UserManager;

		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;

		public class SimStatusPreferenceController extends AbstractPreferenceController
		public class SimStatusPreferenceController extends AbstractSimStatusImeiInfoPreferenceController
		implements PreferenceControllerMixin {

		private static final String KEY_SIM_STATUS = "sim_status";
		@@ -32,12 +30,6 @@ public class SimStatusPreferenceController extends AbstractPreferenceController
		super(context);
		}

		@Override
		public boolean isAvailable() {
		return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser()
		&& !Utils.isWifiOnly(mContext);
		}

		@Override
		public String getPreferenceKey() {
		return KEY_SIM_STATUS;