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

Merge "Update summary for Connected devices->Printing." into oc-dev

Browse Source
This commit is contained in:
Doris Ling
2017-04-06 18:35:52 +00:00
committed by Android (Google) Code Review
parent 28e35fcf05 c5f4120484
commit 4bbfdb13e7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -529,7 +529,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
if (mPrintManager != null) { if (mPrintManager != null) {
if (isListening) { if (isListening) {
List<PrintServiceInfo> services = List<PrintServiceInfo> services =
mPrintManager.getPrintServices(PrintManager.ALL_SERVICES); mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES);
if (services == null || services.isEmpty()) { if (services == null || services.isEmpty()) {
mSummaryLoader.setSummary(this, mSummaryLoader.setSummary(this,
mContext.getString(R.string.print_settings_summary_no_service)); mContext.getString(R.string.print_settings_summary_no_service));

5
tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
View File

@@ -68,14 +68,15 @@ public class PrintSettingsFragmentTest {
when(printServices.isEmpty()).thenReturn(false); when(printServices.isEmpty()).thenReturn(false);
when(printServices.size()).thenReturn(2); when(printServices.size()).thenReturn(2);
// 2 services // 2 services
when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(printServices); when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES))
.thenReturn(printServices);
mSummaryProvider.setListening(true); mSummaryProvider.setListening(true);
verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2); verify(mRes).getQuantityString(R.plurals.print_settings_summary, 2, 2);
// No service // No service
when(mPrintManager.getPrintServices(PrintManager.ALL_SERVICES)).thenReturn(null); when(mPrintManager.getPrintServices(PrintManager.ENABLED_SERVICES)).thenReturn(null);
mSummaryProvider.setListening(true); mSummaryProvider.setListening(true);