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

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

Browse Source
This commit is contained in:
Philip P. Moltmann
2016-04-22 17:32:36 +00:00
committed by Android (Google) Code Review
parent dc1e59a314 eb01628ba8
commit badb762523
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/print/PrintJobSettingsFragment.java
View File

@@ -63,7 +63,6 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
private Preference mMessagePreference;
private PrintJobId mPrintJobId;
private PrintJob mPrintJob;
@Override
protected int getMetricsCategory() {
@@ -134,17 +133,21 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case MENU_ITEM_ID_CANCEL: {
getPrintJob().cancel();
finish();
return true;
}
PrintJob printJob = getPrintJob();
case MENU_ITEM_ID_RESTART: {
getPrintJob().restart();
finish();
return true;
if (printJob != null) {
switch (item.getItemId()) {
case MENU_ITEM_ID_CANCEL: {
printJob.cancel();
finish();
return true;
}
case MENU_ITEM_ID_RESTART: {
printJob.restart();
finish();
return true;
}
}
}
@@ -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() {

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

@@ -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;
}

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

@@ -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;
}