From a33272bdc71b8d103e6fd395e4abe9dcf8c0de5a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 Dec 2011 22:19:04 +0300
Subject: [PATCH] use actionbar home button to close article on HC

---
 res/menu/main_menu.xml                 |  6 ------
 res/menu/offline_menu.xml              |  6 ------
 src/org/fox/ttrss/MainActivity.java    | 13 +++++++------
 src/org/fox/ttrss/OfflineActivity.java | 13 +++++++------
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index fb5cb50b..f8865d90 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -108,12 +108,6 @@
                 android:showAsAction=""
                 android:title="@string/article_set_unread"/>
 
-            <item
-                android:id="@+id/close_article"
-                android:icon="@android:drawable/ic_menu_close_clear_cancel"
-                android:showAsAction="ifRoom"
-                android:title="@string/close_article"/>
-
             <item
                 android:id="@+id/catchup_above"
                 android:icon="@drawable/ic_menu_tick"
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 04818aac..fd5ed0c2 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -96,12 +96,6 @@
             android:showAsAction=""
             android:title="@string/article_set_unread"/>
 
-        <item
-            android:id="@+id/close_article"
-            android:icon="@android:drawable/ic_menu_close_clear_cancel"
-            android:showAsAction="ifRoom"
-            android:title="@string/close_article"/>
-
         <item
             android:id="@+id/catchup_above"
             android:icon="@drawable/ic_menu_tick"
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 38cf4098..cb090dba 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -828,6 +828,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 				.findFragmentById(R.id.headlines_fragment);
 
 		switch (item.getItemId()) {
+		case android.R.id.home:
+			closeArticle();
+			return true;
 		case R.id.preferences:
 			Intent intent = new Intent(MainActivity.this,
 					PreferencesActivity.class);
@@ -848,12 +851,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 		case R.id.go_offline:
 			switchOffline();
 			return true;
-		case R.id.close_article:
-			closeArticle();
-			return true;
-			/*
-			 * case R.id.back_to_categories: closeCategory(); return true;
-			 */
 		case R.id.headlines_select:
 			if (hf != null) {
 				Dialog dialog = new Dialog(this);
@@ -1114,6 +1111,10 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 					m_headlinesActionMode.finish();
 				}
 
+				if (!m_compatMode) {
+					getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticle != null);
+				}
+				
 			} else {
 				m_menu.setGroupVisible(R.id.menu_group_logged_in, false);
 				m_menu.setGroupVisible(R.id.menu_group_logged_out, true);
diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java
index 58e84fbd..4f6a0089 100644
--- a/src/org/fox/ttrss/OfflineActivity.java
+++ b/src/org/fox/ttrss/OfflineActivity.java
@@ -427,6 +427,9 @@ public class OfflineActivity extends FragmentActivity implements
 				.findFragmentById(R.id.headlines_fragment);
 
 		switch (item.getItemId()) {
+		case android.R.id.home:
+			closeArticle();
+			return true;
 		case R.id.preferences:
 			Intent intent = new Intent(this, PreferencesActivity.class);
 			startActivityForResult(intent, 0);
@@ -434,12 +437,6 @@ public class OfflineActivity extends FragmentActivity implements
 		case R.id.go_online:
 			switchOnline();
 			return true;
-		case R.id.close_article:
-			closeArticle();
-			return true;
-		/* case R.id.back_to_categories:
-			// closeCategory();
-			return true; */
 		case R.id.headlines_select:
 			if (ohf != null) {
 				Dialog dialog = new Dialog(this);
@@ -670,6 +667,10 @@ public class OfflineActivity extends FragmentActivity implements
 			if (numSelected == 0 && m_headlinesActionMode != null) {
 				m_headlinesActionMode.finish();
 			}
+			
+			if (!m_compatMode) {
+				getActionBar().setDisplayHomeAsUpEnabled(m_selectedArticleId != 0);
+			}
 		}
 	}