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

Merge "Small corrections to the code that generates the print summary in the settings."

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-01-08 00:34:58 +00:00
committed by Android (Google) Code Review
parent c6e7d3001e 43335444ef
commit ef7c7fe196
1 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,7 +590,14 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
} }
return printJobInfos; return printJobInfos;
} }
}
/**
* Should the print job the shown to the user in the settings app.
*
* @param printJob The print job in question.
* @return true iff the print job should be shown.
*/
private static boolean shouldShowToUser(PrintJobInfo printJob) { private static boolean shouldShowToUser(PrintJobInfo printJob) {
switch (printJob.getState()) { switch (printJob.getState()) {
case PrintJobInfo.STATE_QUEUED: case PrintJobInfo.STATE_QUEUED:
@@ -602,7 +609,6 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
} }
return false; return false;
} }
}
/** /**
* Provider for the print settings summary * Provider for the print settings summary
@@ -624,29 +630,32 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
mSummaryLoader = summaryLoader; mSummaryLoader = summaryLoader;
mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE)) mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE))
.getGlobalPrintManagerForUser(context.getUserId()); .getGlobalPrintManagerForUser(context.getUserId());
mPrintManager.addPrintJobStateChangeListener(this);
} }
@Override @Override
public void setListening(boolean isListening) { public void setListening(boolean isListening) {
mPrintManager.removePrintJobStateChangeListener(this);
if (isListening) { if (isListening) {
mPrintManager.addPrintJobStateChangeListener(this); mPrintManager.addPrintJobStateChangeListener(this);
}
onPrintJobStateChanged(null); onPrintJobStateChanged(null);
} else {
mPrintManager.removePrintJobStateChangeListener(this);
}
} }
@Override @Override
public void onPrintJobStateChanged(PrintJobId printJobId) { public void onPrintJobStateChanged(PrintJobId printJobId) {
int numPrintJobs = mPrintManager.getPrintJobs().size(); List<PrintJob> printJobs = mPrintManager.getPrintJobs();
mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
R.plurals.print_settings_title, numPrintJobs, numPrintJobs)); int numActivePrintJobs = 0;
final int numPrintJobs = printJobs.size();
for (int i = 0; i < numPrintJobs; i++) {
if (shouldShowToUser(printJobs.get(i).getInfo())) {
numActivePrintJobs++;
}
} }
@Override mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
protected void finalize() { R.plurals.print_settings_title, numActivePrintJobs, numActivePrintJobs));
mPrintManager.removePrintJobStateChangeListener(this);
} }
} }