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

Commit 3af7f827 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Show up button in select printer activity

Test: Selected a printer via select printer activity
      Pressed up button in select printer activity (no printer get
      selected)

Change-Id: Ifcd133eb0ceb973464cbd35b6ee87c9f09221af4
parent 34a6b577
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@
            android:name=".ui.SelectPrinterActivity"
            android:label="@string/all_printers_label"
            android:theme="@style/Theme.SelectPrinterActivity"
            android:parentActivityName=".ui.PrintActivity"
            android:exported="false">
        </activity>

@@ -78,6 +79,7 @@
            android:name=".ui.AddPrinterActivity"
            android:label="@string/print_add_printer"
            android:theme="@style/Theme.AddPrinterActivity"
            android:parentActivityName=".ui.SelectPrinterActivity"
            android:exported="false">
        </activity>

+12 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ public final class SelectPrinterActivity extends Activity implements

        setContentView(R.layout.select_printer_activity);

        getActionBar().setDisplayHomeAsUpEnabled(true);

        mEnabledPrintServices = new ArrayMap<>();

        mPrinterRegistry = new PrinterRegistry(this, null, LOADER_ID_PRINT_REGISTRY,
@@ -267,6 +269,16 @@ public final class SelectPrinterActivity extends Activity implements
        return true;
    }

    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == android.R.id.home) {
            finish();
            return true;
        } else {
            return super.onOptionsItemSelected(item);
        }
    }

    @Override
    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
        if (view == mListView) {