From 7f1345c3cd8cb894eddd0245c03a3ae08372a528 Mon Sep 17 00:00:00 2001
From: hughchen <hughchen@google.com>
Date: Wed, 9 May 2018 14:33:52 +0800
Subject: [PATCH] Using static method to get summary resource id

* Using getConnectedDevicesSummaryResourceId() to get the resource id to shown the summary.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I268de4d989fe01eff463a5ec1c0a174e094e56c0
---
 .../ConnectedDeviceDashboardFragment.java            | 12 ++----------
 .../ConnectedDeviceDashboardFragmentTest.java        |  1 -
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 26ff930558a..c57c0b595f7 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -72,25 +72,17 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
         private final Context mContext;
         private final SummaryLoader mSummaryLoader;
-        private final NfcPreferenceController mNfcPreferenceController;
 
         public SummaryProvider(Context context, SummaryLoader summaryLoader) {
             mContext = context;
             mSummaryLoader = summaryLoader;
-            mNfcPreferenceController = new NfcPreferenceController(context);
         }
 
-
         @Override
         public void setListening(boolean listening) {
             if (listening) {
-                if (mNfcPreferenceController.isAvailable()) {
-                    mSummaryLoader.setSummary(this,
-                            mContext.getString(R.string.connected_devices_dashboard_summary));
-                } else {
-                    mSummaryLoader.setSummary(this, mContext.getString(
-                            R.string.connected_devices_dashboard_no_nfc_summary));
-                }
+                mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
+                        getConnectedDevicesSummaryResourceId(mContext)));
             }
         }
     }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 90641792639..cea258d67ce 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
-import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowBluetoothPan;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;