summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-26 18:04:54 +0300
committerAndrew Dolgov <[email protected]>2011-11-26 18:04:54 +0300
commit2e5bccb94290dae8fee7088283e8e3ecda6c764e (patch)
tree05298d3ff6f8cf94eeacb79a4110a7574f33665b /src
parent084b059577551df4c6ae909bbd5eb43ffa0c8ad7 (diff)
fix smallscreenmode being enabled in portrait
Diffstat (limited to 'src')
-rw-r--r--src/org/fox/ttrss/MainActivity.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 2574c9e3..fb16a3d3 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -110,18 +110,23 @@ public class MainActivity extends FragmentActivity implements FeedsFragment.OnFe
m_canLoadMore = savedInstanceState.getBoolean("canLoadMore");
}
- Display display = getWindowManager().getDefaultDisplay();
+ Display display = getWindowManager().getDefaultDisplay();
+ int orientation = display.getOrientation();
+ int minWidth = orientation == 0 ? 1024 : 600;
+ int minHeight = orientation == 0 ? 600 : 1024;
- if (display.getWidth() > 1000 && display.getHeight() >= 600) {
+ if (display.getWidth() > minWidth && display.getHeight() >= minHeight) {
m_smallScreenMode = false;
-
+
setContentView(R.layout.main);
} else {
m_smallScreenMode = true;
setContentView(R.layout.main_small);
}
-
+
+ Log.d(TAG, "m_smallScreenMode=" + m_smallScreenMode);
+ Log.d(TAG, "orientation=" + display.getOrientation());
if (android.os.Build.VERSION.SDK_INT > 10) {
LayoutTransition transitioner = new LayoutTransition();