From 43335444ef9089e3b68ad759ee28303cbb4bcc5a Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Thu, 7 Jan 2016 10:09:12 -0800
Subject: [PATCH] Small corrections to the code that generates the print
 summary in the settings.

- Optimize when the listener is active and rely on it to be cleaned up
  automatically
- Only count print jobs that should be shown (i.e. not ones that are
  already finished.)

Change-Id: Idba995f1036e736f47ca7402d493210600eae91c
---
 .../settings/print/PrintSettingsFragment.java | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 405b23970b6..d5cd9c53e58 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -590,18 +590,24 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
             }
             return printJobInfos;
         }
+    }
 
-        private static boolean shouldShowToUser(PrintJobInfo printJob) {
-            switch (printJob.getState()) {
-                case PrintJobInfo.STATE_QUEUED:
-                case PrintJobInfo.STATE_STARTED:
-                case PrintJobInfo.STATE_BLOCKED:
-                case PrintJobInfo.STATE_FAILED: {
-                    return true;
-                }
+    /**
+     * 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) {
+        switch (printJob.getState()) {
+            case PrintJobInfo.STATE_QUEUED:
+            case PrintJobInfo.STATE_STARTED:
+            case PrintJobInfo.STATE_BLOCKED:
+            case PrintJobInfo.STATE_FAILED: {
+                return true;
             }
-            return false;
         }
+        return false;
     }
 
     /**
@@ -624,29 +630,32 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
             mSummaryLoader = summaryLoader;
             mPrintManager = ((PrintManager) context.getSystemService(Context.PRINT_SERVICE))
                     .getGlobalPrintManagerForUser(context.getUserId());
-            mPrintManager.addPrintJobStateChangeListener(this);
         }
 
         @Override
         public void setListening(boolean isListening) {
-            mPrintManager.removePrintJobStateChangeListener(this);
-
             if (isListening) {
                 mPrintManager.addPrintJobStateChangeListener(this);
+                onPrintJobStateChanged(null);
+            } else {
+                mPrintManager.removePrintJobStateChangeListener(this);
             }
-            onPrintJobStateChanged(null);
         }
 
         @Override
         public void onPrintJobStateChanged(PrintJobId printJobId) {
-            int numPrintJobs = mPrintManager.getPrintJobs().size();
-            mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
-                    R.plurals.print_settings_title, numPrintJobs, numPrintJobs));
-        }
+            List<PrintJob> printJobs = mPrintManager.getPrintJobs();
 
-        @Override
-        protected void finalize() {
-            mPrintManager.removePrintJobStateChangeListener(this);
+            int numActivePrintJobs = 0;
+            final int numPrintJobs = printJobs.size();
+            for (int i = 0; i < numPrintJobs; i++) {
+                if (shouldShowToUser(printJobs.get(i).getInfo())) {
+                    numActivePrintJobs++;
+                }
+            }
+
+            mSummaryLoader.setSummary(this, mContext.getResources().getQuantityString(
+                    R.plurals.print_settings_title, numActivePrintJobs, numActivePrintJobs));
         }
     }