From 2e5bccb94290dae8fee7088283e8e3ecda6c764e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 26 Nov 2011 18:04:54 +0300 Subject: fix smallscreenmode being enabled in portrait --- src/org/fox/ttrss/MainActivity.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src') 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(); -- cgit v1.2.3-54-g00ecf