Wallet/controls - Migrate existing settings

Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91

tests/robotests/src/com/android/settings/display/ControlsPrivacyPreferenceControllerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.gestures;
+package com.android.settings.display;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -47,18 +47,15 @@ import org.robolectric.Shadows;
 import org.robolectric.shadows.ShadowPackageManager;
 
 @RunWith(RobolectricTestRunner.class)
-public class PowerMenuPrivacyPreferenceControllerTest {
+public class ControlsPrivacyPreferenceControllerTest {
 
     private static final String TEST_KEY = "test_key";
-    private static final String SETTING_KEY = Settings.Secure.POWER_MENU_LOCKED_SHOW_CONTENT;
-    private static final String CARDS_AVAILABLE_KEY =
-            Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
-    private static final String CARDS_ENABLED_KEY = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
+    private static final String SETTING_KEY = "lockscreen_show_controls";
 
     private Context mContext;
     private ContentResolver mContentResolver;
     private ShadowPackageManager mShadowPackageManager;
-    private PowerMenuPrivacyPreferenceController mController;
+    private ControlsPrivacyPreferenceController mController;
 
     @Mock
     private Preference mPreference;
@@ -77,85 +74,63 @@ public class PowerMenuPrivacyPreferenceControllerTest {
                 .thenReturn(mLockPatternUtils);
         when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
 
-        mController = new PowerMenuPrivacyPreferenceController(mContext, TEST_KEY);
+        mController = new ControlsPrivacyPreferenceController(mContext, TEST_KEY);
     }
 
     @Test
-    public void isChecked_POWER_MENU_LOCKED_SHOW_CONTENTIs1_returnTrue() {
+    public void isChecked_SettingIs1_returnTrue() {
         Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1);
 
         assertThat(mController.isChecked()).isTrue();
     }
 
     @Test
-    public void isChecked_POWER_MENU_LOCKED_SHOW_CONTENTIs0_returnFalse() {
+    public void isChecked_SettingIs0_returnFalse() {
         Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
-    public void isChecked_POWER_MENU_LOCKED_SHOW_CONTENTIsNotSet_returnFalse() {
+    public void isChecked_SettingIsNotSet_returnFalse() {
         Settings.Secure.putString(mContentResolver, SETTING_KEY, null);
 
         assertThat(mController.isChecked()).isFalse();
     }
 
     @Test
-    public void setChecked_true_POWER_MENU_LOCKED_SHOW_CONTENTIsNot0() {
+    public void setChecked_true_SettingIsNot0() {
         mController.setChecked(true);
 
         assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isNotEqualTo(0);
     }
 
     @Test
-    public void setChecked_false_POWER_MENU_LOCKED_SHOW_CONTENTIs0() {
+    public void setChecked_false_SettingIs0() {
         mController.setChecked(false);
 
         assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);
     }
 
     @Test
-    public void getSummary_notSecureLock_isPower_menu_privacy_not_secureString() {
+    public void getSummary_notSecureLock_lockscreen_privacy_not_secureString() {
         when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
 
         assertThat(mController.getSummary()).isEqualTo(
-                mContext.getText(R.string.power_menu_privacy_not_secure));
+                mContext.getText(R.string.lockscreen_privacy_not_secure));
     }
 
     @Test
-    public void getSummary_cardsControlsAvailable_isPower_menu_privacy_showString() {
-        Settings.Secure.putInt(mContentResolver, CARDS_AVAILABLE_KEY, 1);
+    public void getSummary_ControlsAvailable_lockscreen_privacy_showString() {
         mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, true);
 
         assertThat(mController.getSummary()).isEqualTo(
-                mContext.getText(R.string.power_menu_privacy_show));
-    }
-
-    @Test
-    public void
-        getSummary_cardsUnavailableControlsAvailable_isPower_menu_privacy_show_controlsString() {
-        Settings.Secure.putInt(mContentResolver, CARDS_AVAILABLE_KEY, 0);
-        mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, true);
-
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getText(R.string.power_menu_privacy_show_controls));
-    }
-
-    @Test
-    public void
-        getSummary_cardsAvailableControlsUnavailable_isPower_menu_privacy_show_cardsString() {
-        Settings.Secure.putInt(mContentResolver, CARDS_AVAILABLE_KEY, 1);
-        mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, false);
-
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getText(R.string.power_menu_privacy_show_cards));
+                mContext.getText(R.string.lockscreen_privacy_controls_summary));
     }
 
     @Test
     public void updateState_onPreferenceRefreshed_preferenceEnabledAndSummaryChanged() {
         mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, true);
-        Settings.Secure.putInt(mContentResolver, CARDS_AVAILABLE_KEY, 1);
 
         mController.updateState(mPreference);
 
@@ -164,12 +139,20 @@ public class PowerMenuPrivacyPreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_allOnNotSecure_returnsDisabled() {
+    public void getAvailabilityStatus_ControlsOnNotSecure_returnsDisabled() {
         when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
 
         mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, true);
-        Settings.Secure.putInt(mContentResolver, CARDS_AVAILABLE_KEY, 1);
-        Settings.Secure.putInt(mContentResolver, CARDS_ENABLED_KEY, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getAvailabilityStatus_ControlsOffSecure_returnsDisabled() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        mShadowPackageManager.setSystemFeature(PackageManager.FEATURE_CONTROLS, false);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
                 BasePreferenceController.DISABLED_DEPENDENT_SETTING);

tests/robotests/src/com/android/settings/display/WalletPrivacyPreferenceControllerTest.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2020 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.service.quickaccesswallet.QuickAccessWalletClient;
+
+import androidx.preference.Preference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+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;
+
+@RunWith(RobolectricTestRunner.class)
+public class WalletPrivacyPreferenceControllerTest {
+
+    private static final String TEST_KEY = "test_key";
+    private static final String SETTING_KEY = "lockscreen_show_wallet";
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private WalletPrivacyPreferenceController mController;
+
+    @Mock
+    private Preference mPreference;
+    @Mock
+    private LockPatternUtils mLockPatternUtils;
+    @Mock
+    private QuickAccessWalletClient mClient;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+
+        mContentResolver = mContext.getContentResolver();
+        FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
+        when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
+                .thenReturn(mLockPatternUtils);
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        when(mClient.isWalletServiceAvailable()).thenReturn(true);
+        mController = new WalletPrivacyPreferenceController(mContext, TEST_KEY) {
+            @Override
+            QuickAccessWalletClient initWalletClient() {
+                return mClient;
+            }
+        };
+    }
+
+    @Test
+    public void isChecked_SettingIs1_returnTrue() {
+        Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_SettingIs0_returnFalse() {
+        Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_SettingIsNotSet_returnFalse() {
+        Settings.Secure.putString(mContentResolver, SETTING_KEY, null);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_true_SettingIsNot0() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isNotEqualTo(0);
+    }
+
+    @Test
+    public void setChecked_false_POWER_MENU_LOCKED_SHOW_CONTENTIs0() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContentResolver, SETTING_KEY, 0)).isEqualTo(0);
+    }
+
+    @Test
+    public void getSummary_notSecureLock_lockscreen_privacy_not_secureString() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(false);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.lockscreen_privacy_not_secure));
+    }
+
+    @Test
+    public void getSummary_isSecure_lockscreen_privacy_showString() {
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.lockscreen_privacy_wallet_summary));
+    }
+
+    @Test
+    public void updateState_onPreferenceRefreshed_preferenceEnabledAndSummaryChanged() {
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(anyBoolean());
+        verify(mPreference, atLeastOnce()).setSummary(mController.getSummary());
+    }
+
+    @Test
+    public void getAvailabilityStatus_noService_returnsDisabled() {
+        when(mClient.isWalletServiceAvailable()).thenReturn(false);
+        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+}

tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerSummaryTest.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2020 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.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.annotation.StringRes;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.ParameterizedRobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-@RunWith(ParameterizedRobolectricTestRunner.class)
-public class PowerMenuPreferenceControllerSummaryTest {
-
-    private static final String KEY_GESTURE_POWER_MENU = "gesture_power_menu";
-    private static final String CARDS_ENABLED = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
-    private static final String CARDS_AVAILABLE = Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
-
-    @ParameterizedRobolectricTestRunner.Parameters(
-            name = "cards available={0}, cards enabled={1}")
-    public static Collection data() {
-        return Arrays.asList(new Object[][]{
-                // cards available, cards enabled, summary
-                {false, false, R.string.power_menu_none},
-                {false, true, R.string.power_menu_none},
-                {true, false, R.string.power_menu_none},
-                {true, true, R.string.power_menu_cards_passes}
-        });
-    }
-
-    private Context mContext;
-    private PowerMenuPreferenceController mController;
-
-    private boolean mCardsAvailable;
-    private boolean mCardsEnabled;
-    private @StringRes int mSummaryRes;
-
-    public PowerMenuPreferenceControllerSummaryTest(
-            boolean cardsAvailable,
-            boolean cardsEnabled,
-            @StringRes int summaryRes) {
-        mCardsAvailable = cardsAvailable;
-        mCardsEnabled = cardsEnabled;
-        mSummaryRes = summaryRes;
-    }
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new PowerMenuPreferenceController(mContext, KEY_GESTURE_POWER_MENU);
-    }
-
-    @Test
-    public void getSummary_possiblyAvailableAndEnabled() {
-        ContentResolver cr = mContext.getContentResolver();
-        Settings.Secure.putInt(cr, CARDS_AVAILABLE, mCardsAvailable ? 1 : 0);
-        Settings.Secure.putInt(cr, CARDS_ENABLED, mCardsEnabled ? 1 : 0);
-
-        assertThat(mController.getSummary()).isEqualTo(mContext.getText(mSummaryRes));
-    }
-}

tests/robotests/src/com/android/settings/gestures/PowerMenuPreferenceControllerTest.java

@@ -24,7 +24,6 @@ import static org.mockito.Mockito.when;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.provider.Settings;
 
 import com.android.settings.core.BasePreferenceController;
 
@@ -41,8 +40,6 @@ public class PowerMenuPreferenceControllerTest {
     private PowerMenuPreferenceController mController;
 
     private static final String KEY_GESTURE_POWER_MENU = "gesture_power_menu";
-    private static final String CARDS_ENABLED = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
-    private static final String CARDS_AVAILABLE = Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
 
 
     @Before
@@ -57,8 +54,7 @@ public class PowerMenuPreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_allAvailable_available() {
-        Settings.Secure.putInt(mContext.getContentResolver(), CARDS_AVAILABLE, 1);
+    public void getAvailabilityStatus_assistAvailable_available() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
                     .thenReturn(true);
@@ -68,41 +64,7 @@ public class PowerMenuPreferenceControllerTest {
     }
 
     @Test
-    public void getAvailabilityStatus_onlyCardsAvailable_available() {
-        Settings.Secure.putInt(mContext.getContentResolver(), CARDS_AVAILABLE, 1);
-        when(mResources.getBoolean(
-                com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
-                    .thenReturn(false);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_cardsAndAssistAvailable_available() {
-        Settings.Secure.putInt(mContext.getContentResolver(), CARDS_AVAILABLE, 1);
-        when(mResources.getBoolean(
-                com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
-                    .thenReturn(true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_onlyAssistAvailable_available() {
-        Settings.Secure.putInt(mContext.getContentResolver(), CARDS_AVAILABLE, 0);
-        when(mResources.getBoolean(
-                com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
-                    .thenReturn(true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_allUnavailable_unavailable() {
-        Settings.Secure.putInt(mContext.getContentResolver(), CARDS_AVAILABLE, 0);
+    public void getAvailabilityStatus_assistUnavailable_unavailable() {
         when(mResources.getBoolean(
                 com.android.internal.R.bool.config_longPressOnPowerForAssistantSettingAvailable))
                     .thenReturn(false);

tests/robotests/src/com/android/settings/gestures/PowerMenuPrivacyPreferenceControllerAvailabilityTest.java

@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2020 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.gestures;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.ParameterizedRobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.shadows.ShadowPackageManager;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-@RunWith(ParameterizedRobolectricTestRunner.class)
-public class PowerMenuPrivacyPreferenceControllerAvailabilityTest {
-
-    private static final String CONTROLS_FEATURE = PackageManager.FEATURE_CONTROLS;
-    private static final String CARDS_ENABLED = Settings.Secure.GLOBAL_ACTIONS_PANEL_ENABLED;
-    private static final String CARDS_AVAILABLE = Settings.Secure.GLOBAL_ACTIONS_PANEL_AVAILABLE;
-
-    @ParameterizedRobolectricTestRunner.Parameters(
-            name = "ctrls available={0} cards available={1}, cards enabled={2}")
-    public static Collection data() {
-        return Arrays.asList(new Object[][]{
-                // controls available, cards available, cards enabled, available
-                {false, false, false, BasePreferenceController.DISABLED_DEPENDENT_SETTING},
-                {false, false, true, BasePreferenceController.DISABLED_DEPENDENT_SETTING},
-                {false, true, false, BasePreferenceController.DISABLED_DEPENDENT_SETTING},
-                {false, true, true, BasePreferenceController.AVAILABLE},
-                {true, false, false, BasePreferenceController.AVAILABLE},
-                {true, false, true, BasePreferenceController.AVAILABLE},
-                {true, true, false, BasePreferenceController.AVAILABLE},
-                {true, true, true, BasePreferenceController.AVAILABLE}
-        });
-    }
-
-    private Context mContext;
-    private PowerMenuPrivacyPreferenceController mController;
-    private ShadowPackageManager mShadowPackageManager;
-
-    @Mock
-    private LockPatternUtils mLockPatternUtils;
-
-    private boolean mControlsAvailable;
-    private boolean mCardsAvailable;
-    private boolean mCardsEnabled;
-    private int mAvailable;
-
-    public PowerMenuPrivacyPreferenceControllerAvailabilityTest(
-            boolean controlsAvailable,
-            boolean cardsAvailable,
-            boolean cardsEnabled,
-            int available) {
-        mControlsAvailable = controlsAvailable;
-        mCardsAvailable = cardsAvailable;
-        mCardsEnabled = cardsEnabled;
-        mAvailable = available;
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
-        FakeFeatureFactory featureFactory = FakeFeatureFactory.setupForTest();
-
-        // For these tests we assume the device has a secure lock.
-        when(featureFactory.securityFeatureProvider.getLockPatternUtils(mContext))
-                .thenReturn(mLockPatternUtils);
-        when(mLockPatternUtils.isSecure(anyInt())).thenReturn(true);
-
-        mController = new PowerMenuPrivacyPreferenceController(mContext, "TEST_KEY");
-    }
-
-    @Test
-    public void getAvailabilityStatus_possiblyAvailableAndEnabled() {
-        mShadowPackageManager.setSystemFeature(CONTROLS_FEATURE, mControlsAvailable);
-        ContentResolver cr = mContext.getContentResolver();
-        Settings.Secure.putInt(cr, CARDS_AVAILABLE, mCardsAvailable ? 1 : 0);
-        Settings.Secure.putInt(cr, CARDS_ENABLED, mCardsEnabled ? 1 : 0);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(mAvailable);
-    }
-}