Merge "[Settings] Mobile data usage code refactor" into rvc-dev
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 547a45a..d530a56 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -191,9 +191,7 @@
case DialogEnums.DISABLE_WARNING_FROM_TOGGLE:
return SettingsEnums.DIALOG_ACCESSIBILITY_SERVICE_DISABLE;
case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
- return AccessibilityUtil.isGestureNavigateEnabled(getPrefContext())
- ? SettingsEnums.DIALOG_TOGGLE_SCREEN_GESTURE_NAVIGATION
- : SettingsEnums.DIALOG_TOGGLE_SCREEN_ACCESSIBILITY_BUTTON;
+ return SettingsEnums.DIALOG_ACCESSIBILITY_TUTORIAL;
default:
return super.getDialogMetricsCategory(dialogId);
}
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 87bfe48..c0ee0a5 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -38,9 +38,9 @@
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.telephony.TelephonyBasePreferenceController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.NetworkPolicyEditor;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -55,7 +55,7 @@
* subscriptions framework API if available. The controller reads subscription information from the
* framework and falls back to legacy usage data if none are available.
*/
-public class DataUsageSummaryPreferenceController extends BasePreferenceController
+public class DataUsageSummaryPreferenceController extends TelephonyBasePreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart {
private static final String TAG = "DataUsageController";
@@ -64,7 +64,6 @@
private static final float RELATIVE_SIZE_LARGE = 1.25f * 1.25f; // (1/0.8)^2
private static final float RELATIVE_SIZE_SMALL = 1.0f / RELATIVE_SIZE_LARGE; // 0.8^2
- private final Activity mActivity;
private final EntityHeaderController mEntityHeaderController;
private final Lifecycle mLifecycle;
private final PreferenceFragmentCompat mFragment;
@@ -97,8 +96,6 @@
private long mCycleStart;
/** The ending time of the billing cycle in ms since the epoch */
private long mCycleEnd;
- /** The subscription that we should show usage for. */
- private int mSubscriptionId;
private Intent mManageSubscriptionIntent;
@@ -106,7 +103,6 @@
Lifecycle lifecycle, PreferenceFragmentCompat fragment, int subscriptionId) {
super(activity, KEY);
- mActivity = activity;
mEntityHeaderController = EntityHeaderController.newInstance(activity,
fragment, null);
mLifecycle = lifecycle;
@@ -119,18 +115,18 @@
* @param subscriptionId is the target subscriptionId
*/
public void init(int subscriptionId) {
- mSubscriptionId = subscriptionId;
+ mSubId = subscriptionId;
- mDefaultTemplate = DataUsageUtils.getDefaultTemplate(mContext, mSubscriptionId);
+ mDefaultTemplate = DataUsageUtils.getDefaultTemplate(mContext, mSubId);
final NetworkPolicyManager policyManager =
mContext.getSystemService(NetworkPolicyManager.class);
mPolicyEditor = new NetworkPolicyEditor(policyManager);
- mHasMobileData = SubscriptionManager.isValidSubscriptionId(mSubscriptionId)
+ mHasMobileData = SubscriptionManager.isValidSubscriptionId(mSubId)
&& DataUsageUtils.hasMobileData(mContext);
mDataUsageController = new DataUsageController(mContext);
- mDataUsageController.setSubscriptionId(mSubscriptionId);
+ mDataUsageController.setSubscriptionId(mSubId);
mDataInfoController = new DataUsageInfoController();
if (mHasMobileData) {
@@ -161,18 +157,17 @@
mPolicyEditor = policyEditor;
mDataUsageTemplate = dataUsageTemplate;
mHasMobileData = true;
- mActivity = activity;
mLifecycle = lifecycle;
mEntityHeaderController = entityHeaderController;
mFragment = fragment;
- mSubscriptionId = subscriptionId;
+ mSubId = subscriptionId;
}
@Override
public void onStart() {
RecyclerView view = mFragment.getListView();
mEntityHeaderController.setRecyclerView(view, mLifecycle);
- mEntityHeaderController.styleActionBar(mActivity);
+ mEntityHeaderController.styleActionBar((Activity) mContext);
}
@VisibleForTesting
@@ -193,7 +188,7 @@
}
@Override
- public int getAvailabilityStatus() {
+ public int getAvailabilityStatus(int subId) {
return hasSim()
|| DataUsageUtils.hasWifiRadio(mContext) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@@ -203,7 +198,7 @@
DataUsageSummaryPreference summaryPreference = (DataUsageSummaryPreference) preference;
final DataUsageController.DataUsageInfo info;
- final SubscriptionInfo subInfo = getSubscriptionInfo(mSubscriptionId);
+ final SubscriptionInfo subInfo = getSubscriptionInfo(mSubId);
if (hasSim()) {
info = mDataUsageController.getDataUsageInfo(mDefaultTemplate);
mDataInfoController.updateDataLimit(info, mPolicyEditor.getPolicy(mDefaultTemplate));
@@ -276,7 +271,7 @@
if (subInfo != null && mHasMobileData) {
mCarrierName = subInfo.getCarrierName();
- final List<SubscriptionPlan> plans = getSubscriptionPlans(mSubscriptionId);
+ final List<SubscriptionPlan> plans = getSubscriptionPlans(mSubId);
final SubscriptionPlan primaryPlan = getPrimaryPlan(plans);
if (primaryPlan != null) {
@@ -296,8 +291,8 @@
mSnapshotTime = primaryPlan.getDataUsageTime();
}
}
- mManageSubscriptionIntent = createManageSubscriptionIntent(mSubscriptionId);
- Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubscriptionId
+ mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
+ Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubId
+ ", intent " + mManageSubscriptionIntent);
}
@@ -334,7 +329,7 @@
intent.setPackage(owner);
intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
- if (mActivity.getPackageManager().queryIntentActivities(intent,
+ if (mContext.getPackageManager().queryIntentActivities(intent,
PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {
return null;
}
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 5da6e2c..f9eccfa 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -68,6 +68,7 @@
private final static boolean VDBG = false; // STOPSHIP if true
private final static String KEY_AUTH_TYPE = "auth_type";
+ private static final String KEY_APN_TYPE = "apn_type";
private final static String KEY_PROTOCOL = "apn_protocol";
private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
@@ -344,6 +345,7 @@
public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
super.onViewStateRestored(savedInstanceState);
fillUI(savedInstanceState == null);
+ setCarrierCustomizedConfigToUi();
}
@VisibleForTesting
@@ -645,7 +647,9 @@
* return null.
*/
private String protocolDescription(String raw, ListPreference protocol) {
- final int protocolIndex = protocol.findIndexOfValue(raw);
+ String uRaw = checkNull(raw).toUpperCase();
+ uRaw = uRaw.equals("IPV4") ? "IP" : uRaw;
+ final int protocolIndex = protocol.findIndexOfValue(uRaw);
if (protocolIndex == -1) {
return null;
} else {
@@ -745,6 +749,13 @@
} catch (NumberFormatException e) {
return false;
}
+ } else if (KEY_APN_TYPE.equals(key)) {
+ String data = (TextUtils.isEmpty((String) newValue)
+ && !ArrayUtils.isEmpty(mDefaultApnTypes))
+ ? getEditableApnType(mDefaultApnTypes) : (String) newValue;
+ if (!TextUtils.isEmpty(data)) {
+ mApnType.setSummary(data);
+ }
} else if (KEY_PROTOCOL.equals(key)) {
final String protocol = protocolDescription((String) newValue, mProtocol);
if (protocol == null) {
@@ -780,7 +791,6 @@
} else {
preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));
}
-
return true;
}
@@ -1002,13 +1012,13 @@
callUpdate = setStringValueAndCheckIfDiff(values,
Telephony.Carriers.PROTOCOL,
- getUserEnteredApnProtocol(mProtocol, mDefaultApnProtocol),
+ checkNotSet(mProtocol.getValue()),
callUpdate,
PROTOCOL_INDEX);
callUpdate = setStringValueAndCheckIfDiff(values,
Telephony.Carriers.ROAMING_PROTOCOL,
- getUserEnteredApnProtocol(mRoamingProtocol, mDefaultApnRoamingProtocol),
+ checkNotSet(mRoamingProtocol.getValue()),
callUpdate,
ROAMING_PROTOCOL_INDEX);
@@ -1205,33 +1215,17 @@
}
@VisibleForTesting
- String getUserEnteredApnProtocol(ListPreference preference, String defaultApnProtocol) {
- // if user has not specified a protocol or enter empty type, map it just for default
- final String userEnteredApnProtocol = checkNotSet(
- ((preference == null) ? null : preference.getValue()));
- if (TextUtils.isEmpty(userEnteredApnProtocol)) {
- return defaultApnProtocol;
- }
- return userEnteredApnProtocol.trim();
- }
-
- @VisibleForTesting
String getUserEnteredApnType() {
// if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
// but if user enter empty type, map it just for default
String userEnteredApnType = mApnType.getText();
if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
if ((TextUtils.isEmpty(userEnteredApnType)
- || APN_TYPE_ALL.equals(userEnteredApnType))
- && !ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
- String[] apnTypeList = APN_TYPES;
- if (TextUtils.isEmpty(userEnteredApnType) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
- apnTypeList = mDefaultApnTypes;
- }
- userEnteredApnType = getEditableApnType(apnTypeList);
- Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
- + userEnteredApnType);
+ || APN_TYPE_ALL.equals(userEnteredApnType))) {
+ userEnteredApnType = getEditableApnType(APN_TYPES);
}
+ Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
+ + userEnteredApnType);
return userEnteredApnType;
}
@@ -1324,6 +1318,26 @@
}
}
+ private void setCarrierCustomizedConfigToUi() {
+ if (TextUtils.isEmpty(mApnType.getText()) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
+ String value = getEditableApnType(mDefaultApnTypes);
+ mApnType.setText(value);
+ mApnType.setSummary(value);
+ }
+
+ String protocol = protocolDescription(mDefaultApnProtocol, mProtocol);
+ if (TextUtils.isEmpty(mProtocol.getValue()) && !TextUtils.isEmpty(protocol)) {
+ mProtocol.setValue(mDefaultApnProtocol);
+ mProtocol.setSummary(protocol);
+ }
+
+ String roamingProtocol = protocolDescription(mDefaultApnRoamingProtocol, mRoamingProtocol);
+ if (TextUtils.isEmpty(mRoamingProtocol.getValue()) && !TextUtils.isEmpty(roamingProtocol)) {
+ mRoamingProtocol.setValue(mDefaultApnRoamingProtocol);
+ mRoamingProtocol.setSummary(roamingProtocol);
+ }
+ }
+
public static class ErrorDialog extends InstrumentedDialogFragment {
public static void showError(ApnEditor editor) {
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
index 24cb10d..5327792 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
@@ -62,6 +62,7 @@
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -132,6 +133,7 @@
}
@Test
+ @Ignore
public void testGetAggregatedUsageEvents_onlyNotificationEvents() throws Exception {
List<Event> events = new ArrayList<>();
Event good = new Event();
@@ -154,6 +156,7 @@
}
@Test
+ @Ignore
public void testGetAggregatedUsageEvents_multipleEventsAgg() throws Exception {
List<Event> events = new ArrayList<>();
Event good = new Event();
@@ -177,6 +180,7 @@
}
@Test
+ @Ignore
public void testGetAggregatedUsageEvents_multiplePkgs() throws Exception {
List<Event> events = new ArrayList<>();
Event good = new Event();
@@ -215,6 +219,7 @@
}
@Test
+ @Ignore
public void testLoadAllExtraInfo_multipleEventsAgg() throws RemoteException {
List<Event> events = new ArrayList<>();
for (int i = 0; i < 7; i++) {
@@ -244,6 +249,7 @@
}
@Test
+ @Ignore
public void testLoadAllExtraInfo_multiplePkgs() throws RemoteException {
List<Event> events = new ArrayList<>();
for (int i = 0; i < 8; i++) {
@@ -281,6 +287,7 @@
}
@Test
+ @Ignore
public void testLoadAllExtraInfo_multipleUsers() throws RemoteException {
// has work profile
when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{1});
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesPreferenceControllerTest.java
index 8479035..37f4635 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesPreferenceControllerTest.java
@@ -30,6 +30,7 @@
import com.google.common.collect.ImmutableList;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -49,6 +50,7 @@
new InteractAcrossProfilesDetailsPreferenceController(mContext, "test_key");
@Test
+ @Ignore
public void getAvailabilityStatus_requestedCrossProfilePermission_returnsAvailable() {
mController.setPackageName(CROSS_PROFILE_PACKAGE_NAME);
shadowOf(mPackageManager).setInstalledPackagesForUserId(
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java
index dac3e22..ee1ff63 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java
@@ -37,6 +37,7 @@
import com.google.common.collect.ImmutableList;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -73,6 +74,7 @@
private final AppOpsManager mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
@Test
+ @Ignore
public void collectConfigurableApps_fromPersonal_returnsCombinedPackages() {
shadowOf(mUserManager).addUser(
PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
@@ -98,6 +100,7 @@
}
@Test
+ @Ignore
public void collectConfigurableApps_fromWork_returnsCombinedPackages() {
shadowOf(mUserManager).addUser(
PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
@@ -139,6 +142,7 @@
}
@Test
+ @Ignore
public void getNumberOfEnabledApps_returnsNumberOfEnabledApps() {
shadowOf(mUserManager).addUser(
PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
index ad546f3..3d6f162 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
@@ -22,13 +22,14 @@
import android.text.format.DateUtils;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
public class AppInfoTest {
@@ -55,6 +56,7 @@
}
@Test
+ @Ignore
public void testParcel() {
Parcel parcel = Parcel.obtain();
mAppInfo.writeToParcel(parcel, mAppInfo.describeContents());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
index ffe8b20..c0f237b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
@@ -28,6 +28,7 @@
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -65,6 +66,7 @@
}
@Test
+ @Ignore
public void testParcelable() {
Parcel parcel = Parcel.obtain();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
index 11dffcd..ed3a446 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
@@ -26,6 +26,7 @@
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -53,6 +54,7 @@
}
@Test
+ @Ignore
public void testParcelable() {
Parcel parcel = Parcel.obtain();
mLowBatteryTip.writeToParcel(parcel, mLowBatteryTip.describeContents());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index b95040a..8e4398b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -34,21 +34,21 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
-import com.android.settings.testutils.BatteryTestUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
-import org.robolectric.util.ReflectionHelpers;
@RunWith(RobolectricTestRunner.class)
public class RestrictAppTipTest {
@@ -110,6 +110,7 @@
}
@Test
+ @Ignore
public void parcelable() {
Parcel parcel = Parcel.obtain();
mNewBatteryTip.writeToParcel(parcel, mNewBatteryTip.describeContents());
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
index 5688045..dea180c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTipTest.java
@@ -22,12 +22,14 @@
import com.android.settings.fuelgauge.batterytip.AppInfo;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class)
+@Ignore
public class UnrestrictAppTipTest {
private static final String PACKAGE_NAME = "com.android.app";
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSliceTest.java
index 335e99f..b105ddf 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSliceTest.java
@@ -54,6 +54,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -114,6 +115,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_hasSuggestedApp_shouldHaveNotificationChannelTitle() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
@@ -129,6 +131,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_hasSuggestedApp_shouldSortByNotificationSentCount() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
@@ -224,6 +227,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_exceedDefaultRowCount_shouldOnlyShowDefaultRows() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
@@ -241,6 +245,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_channelCountIsLessThanDefaultRows_subTitleShouldNotHaveTapToManagerAll() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
@@ -257,6 +262,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_channelCountIsEqualToDefaultRows_subTitleShouldNotHaveTapToManagerAll() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
@@ -272,6 +278,7 @@
@Test
@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+ @Ignore
public void getSlice_channelCountIsMoreThanDefaultRows_subTitleShouldHaveTapToManagerAll() {
addMockPackageToPackageManager(true /* isRecentlyInstalled */,
ApplicationInfo.FLAG_INSTALLED);
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelWorkerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelWorkerTest.java
index 6ac8b70..a72f018 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/NotificationChannelWorkerTest.java
@@ -33,6 +33,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -80,6 +81,7 @@
}
@Test
+ @Ignore
public void onSliceUnpinned_interactedPackageIsInstalled_shouldKeepPackage() {
mockInteractedPackageAsInstalled();
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index 20334e0..7ec1174 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -81,11 +81,11 @@
"" /* MMS port */,
0 /* Authentication type */,
"default,supl,ia" /* APN type */,
- "IPv6" /* APN protocol */,
+ "IP" /* APN protocol */,
1 /* APN enable/disable */,
0 /* Bearer */,
0 /* Bearer BITMASK*/,
- "IPv4" /* APN roaming protocol */,
+ "IPV6" /* APN roaming protocol */,
"None" /* MVNO type */,
"", /* MVNO value */
};
@@ -464,33 +464,25 @@
}
@Test
- public void getUserEnteredApnProtocol_emptyApnProtocol_shouldReturnDefaultIPv4v6() {
- // GIVEN read default APN protocol with IPV4V6
- mApnEditorUT.mDefaultApnProtocol = "IPV4V6";
+ public void testOnViewStateRestored_customizedValueWithoutDefault_shouldShowCustomized() {
+ mApnEditorUT.mDefaultApnProtocol = "IP";
+ mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = null;
+ mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
- // Input empty in TYPE
- mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "";
- mApnEditorUT.fillUI(true /* firstTime */);
+ mApnEditorUT.onViewStateRestored(null);
- // THEN APN type should be IPV4V6
- assertThat(mApnEditorUT.getUserEnteredApnProtocol(
- mApnEditorUT.mProtocol, mApnEditorUT.mDefaultApnProtocol))
- .isEqualTo("IPV4V6");
+ assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv4");
}
@Test
- public void getUserEnteredApnProtocol_emptyApnProtocol_shouldReturnDefaultIP() {
- // GIVEN read default APN protocol with IP
+ public void testOnViewStateRestored_customizedValueWithDefault_shouldShowDefault() {
mApnEditorUT.mDefaultApnProtocol = "IP";
+ mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "IPV6";
+ mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
- // Input empty in TYPE
- mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "";
- mApnEditorUT.fillUI(true /* firstTime */);
+ mApnEditorUT.onViewStateRestored(null);
- // THEN APN type should be IPV4V6
- assertThat(mApnEditorUT.getUserEnteredApnProtocol(
- mApnEditorUT.mProtocol, mApnEditorUT.mDefaultApnProtocol))
- .isEqualTo("IP");
+ assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv6");
}
@Test
@@ -503,7 +495,7 @@
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
- mApnEditorUT.fillUI(true /* firstTime */);
+ mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be default
assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
@@ -516,7 +508,7 @@
// Input empty in TYPE
mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
- mApnEditorUT.fillUI(true /* firstTime */);
+ mApnEditorUT.onViewStateRestored(null);
// THEN APN type should be default
assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index cb50609..2bbf006 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -33,6 +33,7 @@
import com.android.settings.notification.NotificationBackend.AppRow;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -93,6 +94,7 @@
}
@Test
+ @Ignore
public void testGetAggregatedUsageEvents_multipleEventsAgg() {
List<UsageEvents.Event> events = new ArrayList<>();
UsageEvents.Event good = new UsageEvents.Event();
diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
index 6226b9a..a567966 100644
--- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
@@ -47,12 +47,19 @@
import android.service.notification.NotifyingApp;
import android.text.TextUtils;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
@@ -67,12 +74,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(RobolectricTestRunner.class)
public class RecentNotifyingAppsPreferenceControllerTest {
@@ -152,6 +153,7 @@
}
@Test
+ @Ignore
public void display_showRecents() throws Exception {
List<Event> events = new ArrayList<>();
Event app = new Event();
@@ -199,6 +201,7 @@
}
@Test
+ @Ignore
public void display_showRecentsWithInstantApp() throws Exception {
List<Event> events = new ArrayList<>();
Event app = new Event();
@@ -254,6 +257,7 @@
}
@Test
+ @Ignore
public void display_showRecents_formatSummary() throws Exception {
List<Event> events = new ArrayList<>();
Event app = new Event();
@@ -278,6 +282,7 @@
}
@Test
+ @Ignore
public void reloadData() throws Exception {
when(mUserManager.getProfileIdsWithDisabled(0)).thenReturn(new int[] {0, 10});
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 8749514..4ce9fa8 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -47,6 +47,7 @@
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -309,6 +310,7 @@
* preference title.
*/
@Test
+ @Ignore
public void testWebViewVersionAddedAfterLabel() {
final DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext,
mContext.getPackageManager(),