Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 558c541f authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Update print jobs appropriately in the print settings." into nyc-dev 

am: badb7625

* commit 'badb7625':
  Update print jobs appropriately in the print settings.

Change-Id: Ie353c3ed8956fe8587de16db4e30be6a318a016b
parents 9412c5a6 badb7625

src/com/android/settings/print/PrintJobSettingsFragment.java

+15 −15
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 
    private Preference mMessagePreference;



    private PrintJobId mPrintJobId;

    private PrintJob mPrintJob;



    @Override

    protected int getMetricsCategory() {
@@ -134,19 +133,23 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 


    @Override

    public boolean onOptionsItemSelected(MenuItem item) {

        PrintJob printJob = getPrintJob();



        if (printJob != null) {

            switch (item.getItemId()) {

                case MENU_ITEM_ID_CANCEL: {

                getPrintJob().cancel();

                    printJob.cancel();

                    finish();

                    return true;

                }



                case MENU_ITEM_ID_RESTART: {

                getPrintJob().restart();

                    printJob.restart();

                    finish();

                    return true;

                }

            }

        }



        return super.onOptionsItemSelected(item);

    }
@@ -161,10 +164,7 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 
    }



    private PrintJob getPrintJob() {

        if (mPrintJob == null) {

            mPrintJob = mPrintManager.getPrintJob(mPrintJobId);

        }

        return mPrintJob;

        return mPrintManager.getPrintJob(mPrintJobId);

    }



    private void updateUi() {

src/com/android/settings/print/PrintServiceSettingsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
        @Override

        public Loader<List<PrinterInfo>> onCreateLoader(int id, Bundle args) {

            if (id == LOADER_ID_PRINTERS_LOADER) {

                return new PrintersLoader(getActivity());

                return new PrintersLoader(getContext());

            }

            return null;

        }

src/com/android/settings/print/PrintSettingsFragment.java

+3 −5
Original line number Diff line number Diff line
@@ -115,12 +115,10 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 
        getPreferenceScreen().removePreference(mActivePrintJobsCategory);



        mPrintJobsController = new PrintJobsController();

        getActivity().getLoaderManager().initLoader(LOADER_ID_PRINT_JOBS_LOADER, null,

                mPrintJobsController);

        getLoaderManager().initLoader(LOADER_ID_PRINT_JOBS_LOADER, null, mPrintJobsController);



        mPrintServicesController = new PrintServicesController();

        getActivity().getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null,

                mPrintServicesController);

        getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);

    }



    @Override
@@ -294,7 +292,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 
        @Override

        public Loader<List<PrintJobInfo>> onCreateLoader(int id, Bundle args) {

            if (id == LOADER_ID_PRINT_JOBS_LOADER) {

                return new PrintJobsLoader(getActivity());

                return new PrintJobsLoader(getContext());

            }

            return null;

        }