From 3af7f8277fd99b8b52ef4ba7976fd6c614091352 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Wed, 26 Oct 2016 09:15:26 -0700
Subject: [PATCH] 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
---
 packages/PrintSpooler/AndroidManifest.xml            |  2 ++
 .../printspooler/ui/SelectPrinterActivity.java       | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/packages/PrintSpooler/AndroidManifest.xml b/packages/PrintSpooler/AndroidManifest.xml
index 2da4d6a25dd31..4b9415e2a2ca1 100644
--- a/packages/PrintSpooler/AndroidManifest.xml
+++ b/packages/PrintSpooler/AndroidManifest.xml
@@ -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>
 
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
index 293665a208ba6..74582f3da2031 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/SelectPrinterActivity.java
@@ -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) {