iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove more or less useless fullscreen mode

Browse Source
This commit is contained in:
Andrew Dolgov 2015-02-12 18:03:45 +03:00
parent 513c440484
commit 5af1199d9d
5 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
View File

@ -23,7 +23,6 @@ import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
@ -318,12 +317,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (m_prefs.getBoolean("full_screen_mode", false)) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
getSupportActionBar().hide();
}
} }

10
org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
View File

@ -14,7 +14,6 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.viewpagerindicator.UnderlinePageIndicator; import com.viewpagerindicator.UnderlinePageIndicator;
@ -281,15 +280,6 @@ public class ArticlePager extends Fragment {
} */ } */
m_activity.invalidateOptionsMenu(); 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() { public Article getSelectedArticle() {

9
org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java
View File

@ -37,7 +37,6 @@ public class CommonActivity extends ActionBarActivity {
private boolean m_smallScreenMode = true; private boolean m_smallScreenMode = true;
private String m_theme; private String m_theme;
private boolean m_fullScreen;
protected SharedPreferences m_prefs; protected SharedPreferences m_prefs;
@ -108,8 +107,7 @@ public class CommonActivity extends ActionBarActivity {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (!m_theme.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT)) || if (!m_theme.equals(m_prefs.getString("theme", CommonActivity.THEME_DEFAULT))) {
m_fullScreen != m_prefs.getBoolean("full_screen_mode", false)) {
Log.d(TAG, "theme changed, restarting"); Log.d(TAG, "theme changed, restarting");
@ -133,10 +131,8 @@ public class CommonActivity extends ActionBarActivity {
if (savedInstanceState != null) { if (savedInstanceState != null) {
m_theme = savedInstanceState.getString("theme"); m_theme = savedInstanceState.getString("theme");
m_fullScreen = savedInstanceState.getBoolean("fullscreen"); } else {
} else {
m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT);
m_fullScreen = m_prefs.getBoolean("full_screen_mode", false);
} }
initDatabase(); initDatabase();
@ -154,7 +150,6 @@ public class CommonActivity extends ActionBarActivity {
super.onSaveInstanceState(out); super.onSaveInstanceState(out);
out.putString("theme", m_theme); out.putString("theme", m_theme);
out.putBoolean("fullscreen", m_fullScreen);
} }
public boolean isSmallScreen() { public boolean isSmallScreen() {

10
org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
View File

@ -14,7 +14,6 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import com.viewpagerindicator.UnderlinePageIndicator; import com.viewpagerindicator.UnderlinePageIndicator;
@ -114,15 +113,6 @@ public class OfflineArticlePager extends Fragment {
@Override @Override
public void onResume() { public void onResume() {
super.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) { public void initialize(int articleId, int feedId, boolean isCat) {

4
org.fox.ttrss/src/main/res/xml/preferences.xml
View File

@ -142,10 +142,10 @@
android:key="use_volume_keys" android:key="use_volume_keys"
android:summary="@string/use_volume_keys_long" android:summary="@string/use_volume_keys_long"
android:title="@string/use_volume_keys" /> android:title="@string/use_volume_keys" />
<CheckBoxPreference <!-- <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="full_screen_mode" android:key="full_screen_mode"
android:title="@string/prefs_fullscreen_mode" /> android:title="@string/prefs_fullscreen_mode" /> -->
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="confirm_headlines_catchup" android:key="confirm_headlines_catchup"