From 58eb43a2e4fe86665229318b96ab351b229c7000 Mon Sep 17 00:00:00 2001 From: Leslie Watkins Date: Fri, 9 Feb 2018 16:43:06 -0800 Subject: [PATCH] Remove all reference to SmsMirroring in Android Settings. Test: Robotests Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5 --- res/drawable/ic_sms_mirroring_24dp.xml | 25 ---------- res/values/strings.xml | 3 -- res/xml/connected_devices_advanced.xml | 7 --- res/xml/connected_devices_old.xml | 7 --- ...ancedConnectedDeviceDashboardFragment.java | 11 ----- .../ConnectedDeviceDashboardFragmentOld.java | 11 ----- .../SmsMirroringFeatureProvider.java | 28 ----------- .../SmsMirroringFeatureProviderImpl.java | 31 ------------- .../SmsMirroringPreferenceController.java | 45 ------------------ .../settings/overlay/FeatureFactory.java | 3 -- .../settings/overlay/FeatureFactoryImpl.java | 11 ----- ...dConnectedDeviceDashboardFragmentTest.java | 46 ------------------- ...ConnectedDeviceDashboardFragment2Test.java | 46 ------------------- .../testutils/FakeFeatureFactory.java | 8 ---- .../settings/core/UniquePreferenceTest.java | 1 - 15 files changed, 283 deletions(-) delete mode 100644 res/drawable/ic_sms_mirroring_24dp.xml delete mode 100644 src/com/android/settings/connecteddevice/SmsMirroringFeatureProvider.java delete mode 100644 src/com/android/settings/connecteddevice/SmsMirroringFeatureProviderImpl.java delete mode 100644 src/com/android/settings/connecteddevice/SmsMirroringPreferenceController.java diff --git a/res/drawable/ic_sms_mirroring_24dp.xml b/res/drawable/ic_sms_mirroring_24dp.xml deleted file mode 100644 index 5fe30030214..00000000000 --- a/res/drawable/ic_sms_mirroring_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/res/values/strings.xml b/res/values/strings.xml index 72db2537492..b1278a68ec8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8129,9 +8129,6 @@ and powering other device [CHAR LIMIT=NONE] --> MIDI and supplying power - - SMS Mirroring - Background check diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index 83a63e40c22..4ad94c8d76e 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -42,13 +42,6 @@ android:icon="@drawable/ic_android" android:order="-4"/> - - - - keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - mContext); - - assertThat(keys).isNotNull(); - assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey()); - } - - @Test - public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() { - when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true); - mSmsMirroringPreferenceController.mIsAvailable = true; - - final List keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - mContext); - - assertThat(keys).isNotNull(); - assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey()); - } - @Test public void testGetCategoryKey_returnCategoryDevice() { assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_DEVICE); diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java index 1bc8a1bcc67..3eacd7a4f96 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment2Test.java @@ -60,37 +60,15 @@ public class ConnectedDeviceDashboardFragment2Test { private PackageManager mManager; private FakeFeatureFactory mFeatureFactory; - private SmsMirroringFeatureProvider mFeatureProvider; private ConnectedDeviceDashboardFragmentOld mFragment; - private TestSmsMirroringPreferenceController mSmsMirroringPreferenceController; - - private static final class TestSmsMirroringPreferenceController - extends SmsMirroringPreferenceController implements PreferenceControllerMixin { - - private boolean mIsAvailable; - - public TestSmsMirroringPreferenceController(Context context) { - super(context); - } - - @Override - public boolean isAvailable() { - return mIsAvailable; - } - } @Before public void setUp() { MockitoAnnotations.initMocks(this); mFeatureFactory = FakeFeatureFactory.setupForTest(); - mFeatureProvider = mFeatureFactory.smsMirroringFeatureProvider; mFragment = new ConnectedDeviceDashboardFragmentOld(); when(mContext.getPackageManager()).thenReturn(mManager); - - mSmsMirroringPreferenceController = new TestSmsMirroringPreferenceController(mContext); - when(mFeatureProvider.getController(mContext)).thenReturn( - mSmsMirroringPreferenceController); } @Test @@ -130,30 +108,6 @@ public class ConnectedDeviceDashboardFragment2Test { assertThat(keys).doesNotContain(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS); } - @Test - public void testSearchIndexProvider_NoSmsMirroring_KeyAdded() { - when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(false); - mSmsMirroringPreferenceController.mIsAvailable = false; - - final List keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - mContext); - - assertThat(keys).isNotNull(); - assertThat(keys).contains(mSmsMirroringPreferenceController.getPreferenceKey()); - } - - @Test - public void testSearchIndexProvider_SmsMirroring_KeyNotAdded() { - when(mFeatureProvider.shouldShowSmsMirroring(mContext)).thenReturn(true); - mSmsMirroringPreferenceController.mIsAvailable = true; - - final List keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys( - mContext); - - assertThat(keys).isNotNull(); - assertThat(keys).doesNotContain(mSmsMirroringPreferenceController.getPreferenceKey()); - } - @Test public void testNonIndexableKeys_existInXmlLayout() { final Context context = RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index 57244c15ec0..601164032d5 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java @@ -24,7 +24,6 @@ import android.content.Context; import com.android.settings.accounts.AccountFeatureProvider; import com.android.settings.applications.ApplicationFeatureProvider; import com.android.settings.bluetooth.BluetoothFeatureProvider; -import com.android.settings.connecteddevice.SmsMirroringFeatureProvider; import com.android.settings.dashboard.DashboardFeatureProvider; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider; @@ -61,7 +60,6 @@ public class FakeFeatureFactory extends FeatureFactory { public final UserFeatureProvider userFeatureProvider; public final AssistGestureFeatureProvider assistGestureFeatureProvider; public final BluetoothFeatureProvider bluetoothFeatureProvider; - public final SmsMirroringFeatureProvider smsMirroringFeatureProvider; public final SlicesFeatureProvider slicesFeatureProvider; public SearchFeatureProvider searchFeatureProvider; public final AccountFeatureProvider mAccountFeatureProvider; @@ -101,7 +99,6 @@ public class FakeFeatureFactory extends FeatureFactory { userFeatureProvider = mock(UserFeatureProvider.class); assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class); bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class); - smsMirroringFeatureProvider = mock(SmsMirroringFeatureProvider.class); slicesFeatureProvider = mock(SlicesFeatureProvider.class); mAccountFeatureProvider = mock(AccountFeatureProvider.class); } @@ -176,11 +173,6 @@ public class FakeFeatureFactory extends FeatureFactory { return assistGestureFeatureProvider; } - @Override - public SmsMirroringFeatureProvider getSmsMirroringFeatureProvider() { - return smsMirroringFeatureProvider; - } - @Override public SlicesFeatureProvider getSlicesFeatureProvider() { return slicesFeatureProvider; diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java index 3daecce7aa7..aa1b55fc29e 100644 --- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java +++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java @@ -74,7 +74,6 @@ public class UniquePreferenceTest { "toggle_bluetooth", "toggle_nfc", "android_beam_settings", - "sms_mirroring", // Dup keys from About Phone v2 experiment. "ims_reg_state", "bt_address",