Merge "Add the PrintSpoolerLib module in Soong"

This commit is contained in:
Yuntao Xu
2022-01-18 20:42:35 +00:00
committed by Android (Google) Code Review
2 changed files with 19 additions and 14 deletions

View File

@@ -34,18 +34,23 @@ license {
android_app {
name: "PrintSpooler",
defaults: ["platform_app_defaults"],
resource_dirs: [],
platform_apis: true,
jni_libs: ["libprintspooler_jni"],
static_libs: [
"PrintSpoolerLib",
],
}
android_library {
name: "PrintSpoolerLib",
resource_dirs: ["res"],
srcs: [
"src/**/*.java",
"src/com/android/printspooler/renderer/IPdfRenderer.aidl",
"src/com/android/printspooler/renderer/IPdfEditor.aidl",
],
platform_apis: true,
jni_libs: ["libprintspooler_jni"],
static_libs: [
"android-support-v7-recyclerview",
"android-support-compat",
@@ -55,4 +60,5 @@ android_app {
"android-support-fragment",
"android-support-annotations",
],
manifest: "AndroidManifest.xml",
}

View File

@@ -314,16 +314,15 @@ public final class SelectPrinterActivity extends Activity implements
@Override
public boolean onContextItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.string.print_select_printer: {
PrinterInfo printer = item.getIntent().getParcelableExtra(EXTRA_PRINTER);
onPrinterSelected(printer);
} return true;
case R.string.print_forget_printer: {
PrinterId printerId = item.getIntent().getParcelableExtra(EXTRA_PRINTER_ID);
mPrinterRegistry.forgetFavoritePrinter(printerId);
} return true;
final int itemId = item.getItemId();
if (itemId == R.string.print_select_printer) {
PrinterInfo printer = item.getIntent().getParcelableExtra(EXTRA_PRINTER);
onPrinterSelected(printer);
return true;
} else if (itemId == R.string.print_forget_printer) {
PrinterId printerId = item.getIntent().getParcelableExtra(EXTRA_PRINTER_ID);
mPrinterRegistry.forgetFavoritePrinter(printerId);
return true;
}
return false;
}