From c5f4120484386fe841f1123cff96f806e56e111e Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Mon, 3 Apr 2017 13:38:06 -0700 Subject: [PATCH] Update summary for Connected devices->Printing. The summary text now shows the number of enabled print services. Update the flag to only select enabled service from PrintManager. Bug: 36234108 Test: make RunSettingsRoboTests Change-Id: I81e1584182edd1f290faa941c7d3ee711a9d67b8 --- src/com/android/settings/print/PrintSettingsFragment.java | 2 +- .../android/settings/print/PrintSettingsFragmentTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index fad577cfb01..a1c166068a7 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -529,7 +529,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment if (mPrintManager != null) { if (isListening) { List services = - mPrintManager.getPrintServices(PrintManager.ALL_SERVICES); + mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES); if (services == null || services.isEmpty()) { mSummaryLoader.setSummary(this, mContext.getString(R.string.print_settings_summary_no_service)); diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java index 265472e69ee..0e2a2f6e1bc 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java @@ -68,14 +68,15 @@ public class PrintSettingsFragmentTest { when(printServices.isEmpty()).thenReturn(false); when(printServices.size()).thenReturn(2); // 2 services - when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(printServices); + when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)) + .thenReturn(printServices); mSummaryProvider.setListening(true); verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2); // No service - when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(null); + when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null); mSummaryProvider.setListening(true);