From 5af1199d9dac6a4f7a238133a64db48046e0e1fd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 12 Feb 2015 18:03:45 +0300 Subject: remove more or less useless fullscreen mode --- .../main/java/org/fox/ttrss/ArticleImagesPagerActivity.java | 7 ------- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 10 ---------- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 9 ++------- .../main/java/org/fox/ttrss/offline/OfflineArticlePager.java | 10 ---------- org.fox.ttrss/src/main/res/xml/preferences.xml | 4 ++-- 5 files changed, 4 insertions(+), 36 deletions(-) (limited to 'org.fox.ttrss/src/main') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java index 01a6a324..7912233c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java @@ -23,7 +23,6 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import android.widget.FrameLayout; import android.widget.ProgressBar; import android.widget.TextView; @@ -318,12 +317,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur @Override public void onResume() { super.onResume(); - - if (m_prefs.getBoolean("full_screen_mode", false)) { - getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - getSupportActionBar().hide(); - } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index cda16c0d..8e3ffbc0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -14,7 +14,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import com.google.gson.JsonElement; import com.viewpagerindicator.UnderlinePageIndicator; @@ -281,15 +280,6 @@ public class ArticlePager extends Fragment { } */ m_activity.invalidateOptionsMenu(); - - if (m_prefs.getBoolean("full_screen_mode", false)) { - m_activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - - /* if (!m_activity.isCompatMode()) { - m_activity.getSupportActionBar().hide(); - } */ - } } public Article getSelectedArticle() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 23b14386..44c122d8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -37,7 +37,6 @@ public class CommonActivity extends ActionBarActivity { private boolean m_smallScreenMode = true; private String m_theme; - private boolean m_fullScreen; protected SharedPreferences m_prefs; @@ -108,8 +107,7 @@ public class CommonActivity extends ActionBarActivity { public void onResume() { super.onResume(); - if (!m_theme.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT)) || - m_fullScreen != m_prefs.getBoolean("full_screen_mode", false)) { + if (!m_theme.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) { Log.d(TAG, "theme changed, restarting"); @@ -133,10 +131,8 @@ public class CommonActivity extends ActionBarActivity { if (savedInstanceState != null) { m_theme = savedInstanceState.getString("theme"); - m_fullScreen = savedInstanceState.getBoolean("fullscreen"); - } else { + } else { m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); - m_fullScreen = m_prefs.getBoolean("full_screen_mode", false); } initDatabase(); @@ -154,7 +150,6 @@ public class CommonActivity extends ActionBarActivity { super.onSaveInstanceState(out); out.putString("theme", m_theme); - out.putBoolean("fullscreen", m_fullScreen); } public boolean isSmallScreen() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java index 1e651a97..37b6f8b5 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java @@ -14,7 +14,6 @@ import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.WindowManager; import com.viewpagerindicator.UnderlinePageIndicator; @@ -114,15 +113,6 @@ public class OfflineArticlePager extends Fragment { @Override public void onResume() { super.onResume(); - - if (m_prefs.getBoolean("full_screen_mode", false)) { - m_activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, - WindowManager.LayoutParams.FLAG_FULLSCREEN); - - /* if (!m_activity.isCompatMode()) { - m_activity.getSupportActionBar().hide(); - } */ - } } public void initialize(int articleId, int feedId, boolean isCat) { diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 62e7847e..e4dfe5ab 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -142,10 +142,10 @@ android:key="use_volume_keys" android:summary="@string/use_volume_keys_long" android:title="@string/use_volume_keys" /> - + android:title="@string/prefs_fullscreen_mode" /> -->