PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Using static method to get summary resource id am: 7f1345c3cd

Browse Source 
am: 6a4174a079

Change-Id: I91b805e89e9f3d5a3259f10401a9963d25cb32e1
This commit is contained in:
hughchen
2018-05-21 00:12:18 -07:00
committed by android-build-merger
parent 6a23d41ddb 6a4174a079
commit 5a8b5dd431
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -74,25 +74,17 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
private final Context mContext; private final Context mContext;
private final SummaryLoader mSummaryLoader; private final SummaryLoader mSummaryLoader;
private final NfcPreferenceController mNfcPreferenceController;
public SummaryProvider(Context context, SummaryLoader summaryLoader) { public SummaryProvider(Context context, SummaryLoader summaryLoader) {
mContext = context; mContext = context;
mSummaryLoader = summaryLoader; mSummaryLoader = summaryLoader;
mNfcPreferenceController = new NfcPreferenceController(context);
} }
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening) {
if (mNfcPreferenceController.isAvailable()) { mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
mSummaryLoader.setSummary(this, getConnectedDevicesSummaryResourceId(mContext)));
mContext.getString(R.string.connected_devices_dashboard_summary));
} else {
mSummaryLoader.setSummary(this, mContext.getString(
R.string.connected_devices_dashboard_no_nfc_summary));
}
} }
} }
} }

1
tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
View File

@@ -30,7 +30,6 @@ import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothPan; import com.android.settings.testutils.shadow.ShadowBluetoothPan;
import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowConnectivityManager;