fix disappearing up arrow on actionbar; import cleanup

3 files changed, 16 insertions, 4 deletions

diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index a1b22094..56df22b4 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -21,16 +21,14 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;

 import android.provider.BaseColumns;

 import android.support.v4.app.Fragment;

-import android.text.Html;

-import android.text.method.LinkMovementMethod;

 import android.util.Log;

 import android.util.TypedValue;

 import android.view.ContextMenu;

 import android.view.ContextMenu.ContextMenuInfo;

-import android.view.View.OnClickListener;

 import android.view.LayoutInflater;

 import android.view.MenuItem;

 import android.view.View;

+import android.view.View.OnClickListener;

 import android.view.ViewGroup;

 import android.webkit.WebChromeClient;

 import android.webkit.WebSettings;

diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java
index bc138bb0..74eb8ca9 100644
--- a/src/org/fox/ttrss/offline/OfflineArticlePager.java
+++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java
@@ -1,7 +1,6 @@
 package org.fox.ttrss.offline;

 

 import org.fox.ttrss.R;

-import org.fox.ttrss.types.Article;

 

 import android.app.Activity;

 import android.content.SharedPreferences;

diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
index 5abf8b12..99351849 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
@@ -1,5 +1,6 @@
 package org.fox.ttrss.offline;

 

+import org.fox.ttrss.GlobalState;

 import org.fox.ttrss.R;

 

 import android.annotation.SuppressLint;

@@ -17,6 +18,8 @@ import android.view.View;
 public class OfflineFeedsActivity extends OfflineActivity implements OfflineHeadlinesEventListener {

 	private final String TAG = this.getClass().getSimpleName();

 	

+	private boolean m_actionbarUpEnabled = false;

+	

 	@SuppressLint("NewApi")

 	@Override

 	public void onCreate(Bundle savedInstanceState) {

@@ -35,8 +38,16 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
 		

 		setSmallScreen(findViewById(R.id.headlines_fragment) == null); 

 		

+		GlobalState.getInstance().load(savedInstanceState);

+		

 		if (savedInstanceState != null) {

 			

+			m_actionbarUpEnabled = savedInstanceState.getBoolean("actionbarUpEnabled");

+			

+			if (!isCompatMode() && m_actionbarUpEnabled) {

+				getActionBar().setDisplayHomeAsUpEnabled(true);

+			}

+			

 		} else {

 			Intent intent = getIntent();

 			

@@ -45,6 +56,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
 				

 				if (!isCompatMode()) {

 					getActionBar().setDisplayHomeAsUpEnabled(true);

+					

 				}

 				

 				FragmentTransaction ft = getSupportFragmentManager().beginTransaction();

@@ -115,6 +127,9 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
 	public void onSaveInstanceState(Bundle out) {

 		super.onSaveInstanceState(out);

 

+		out.putBoolean("actionbarUpEnabled", m_actionbarUpEnabled);

+		

+		GlobalState.getInstance().save(out);

 	}

 	

 	public void initMenu() {