Move default payment app to special app access.

Bug: 124452117
Bug: 124522992
Test: build
Change-Id: I58e7127920d939dc3635bcc2e608cee6baa21998

res/xml/app_default_settings.xml

@@ -54,13 +54,6 @@
         android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
         settings:keywords="@string/keywords_more_default_sms_app" />
 
-    <com.android.settingslib.widget.apppreference.AppPreference
-        android:key="default_payment_app"
-        android:title="@string/nfc_payment_settings_title"
-        android:summary="@string/summary_placeholder"
-        android:fragment="com.android.settings.nfc.PaymentSettings"
-        settings:keywords="@string/keywords_default_payment_app"/>
-
     <com.android.settingslib.widget.apppreference.AppPreference
         android:key="default_emergency_app"
         android:title="@string/default_emergency_app"

res/xml/special_access.xml

@@ -84,6 +84,13 @@
         android:fragment="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess"
         settings:controller="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsController" />
 
+    <Preference
+        android:key="default_payment_app"
+        android:title="@string/nfc_payment_settings_title"
+        android:fragment="com.android.settings.nfc.PaymentSettings"
+        settings:keywords="@string/keywords_default_payment_app"
+        settings:controller="com.android.settings.applications.specialaccess.DefaultPaymentSettingsPreferenceController" />
+
     <Preference
         android:key="data_saver"
         android:title="@string/unrestricted_data_saver"

src/com/android/settings/applications/DefaultAppSettings.java

@@ -27,7 +27,6 @@ import com.android.settings.applications.assist.DefaultAssistPreferenceControlle
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultEmergencyPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultHomePreferenceController;
-import com.android.settings.applications.defaultapps.DefaultPaymentSettingsPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultPhonePreferenceController;
 import com.android.settings.applications.defaultapps.DefaultSmsPreferenceController;
 import com.android.settings.applications.defaultapps.DefaultWorkBrowserPreferenceController;
@@ -87,7 +86,6 @@ public class DefaultAppSettings extends DashboardFragment {
         controllers.add(new DefaultSmsPreferenceController(context));
         controllers.add(new DefaultEmergencyPreferenceController(context));
         controllers.add(new DefaultHomePreferenceController(context));
-        controllers.add(new DefaultPaymentSettingsPreferenceController(context));
         return controllers;
     }
 

src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java

@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2017 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.applications.defaultapps;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.nfc.NfcAdapter;
-import android.os.UserManager;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.nfc.PaymentBackend;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-public class DefaultPaymentSettingsPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
-
-    private final NfcAdapter mNfcAdapter;
-    private final PackageManager mPackageManager;
-    private final UserManager mUserManager;
-    private PaymentBackend mPaymentBackend;
-
-    public DefaultPaymentSettingsPreferenceController(Context context) {
-        super(context);
-        mPackageManager = context.getPackageManager();
-        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
-        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)
-                && mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)
-                && mUserManager.isAdminUser()
-                && mNfcAdapter != null
-                && mNfcAdapter.isEnabled();
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        if (mPaymentBackend == null) {
-            if (mNfcAdapter != null) {
-                mPaymentBackend = new PaymentBackend(mContext);
-            } else {
-                mPaymentBackend = null;
-            }
-        }
-        if (mPaymentBackend == null) {
-            return;
-        }
-        mPaymentBackend.refresh();
-        final PaymentBackend.PaymentAppInfo app = mPaymentBackend.getDefaultApp();
-        if (app != null) {
-            preference.setSummary(app.label);
-        } else {
-            preference.setSummary(R.string.app_list_preference_none);
-        }
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return "default_payment_app";
-    }
-}

src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceController.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2017 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.applications.specialaccess;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.nfc.NfcAdapter;
+import android.os.UserManager;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class DefaultPaymentSettingsPreferenceController extends BasePreferenceController {
+
+    private final NfcAdapter mNfcAdapter;
+    private final PackageManager mPackageManager;
+    private final UserManager mUserManager;
+
+    public DefaultPaymentSettingsPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+
+        mPackageManager = context.getPackageManager();
+        mUserManager = context.getSystemService(UserManager.class);
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)
+                || !mPackageManager.hasSystemFeature(
+                        PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        if (!mUserManager.isAdminUser()) {
+            return DISABLED_FOR_USER;
+        }
+        if (mNfcAdapter == null || !mNfcAdapter.isEnabled()) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return AVAILABLE;
+    }
+}

tests/robotests/src/com/android/settings/applications/specialaccess/DefaultPaymentSettingsPreferenceControllerTest.java

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications.defaultapps;
+package com.android.settings.applications.specialaccess;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -28,17 +26,12 @@ import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
 import android.os.UserManager;
 
-import androidx.preference.Preference;
-
-import com.android.settings.nfc.PaymentBackend;
-
 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;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
@@ -52,11 +45,8 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
     private UserManager mUserManager;
     @Mock
     private PackageManager mPackageManager;
-    @Mock
-    private PaymentBackend mPaymentBackend;
 
     private DefaultPaymentSettingsPreferenceController mController;
-    private Preference mPreference;
 
     @Before
     public void setUp() {
@@ -64,11 +54,9 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
-        mController = new DefaultPaymentSettingsPreferenceController(mContext);
+        mController = new DefaultPaymentSettingsPreferenceController(mContext, "key");
         ReflectionHelpers.setField(mController, "mNfcAdapter", mNfcAdapter);
-
-        mPreference = new Preference(RuntimeEnvironment.application);
     }
 
     @Test
@@ -88,17 +76,4 @@ public class DefaultPaymentSettingsPreferenceControllerTest {
 
         assertThat(mController.isAvailable()).isFalse();
     }
-
-    @Test
-    public void updateState_shouldSetSummaryToDefaultPaymentApp() {
-        final PaymentBackend.PaymentAppInfo defaultApp = mock(PaymentBackend.PaymentAppInfo.class);
-        defaultApp.label = "test_payment_app";
-        when(mPaymentBackend.getDefaultApp()).thenReturn(defaultApp);
-        ReflectionHelpers.setField(mController, "mPaymentBackend", mPaymentBackend);
-
-        mController.updateState(mPreference);
-
-        verify(mPaymentBackend).refresh();
-        assertThat(mPreference.getSummary()).isEqualTo(defaultApp.label);
-    }
 }