compatibility fixes for ICS (galaxy nexus)

1 files changed, 13 insertions, 12 deletions

diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 3a439733..fb5733b7 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -38,6 +38,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.LinearLayout;
@@ -473,12 +474,14 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 		int width = display.getWidth();
 		int height = display.getHeight();
+		
+		Log.d(TAG, "WxH=" + width + "x" + height);
 
-		if (height > width) {
+		/* if (height > width) {
 			int tmp = width;
 			width = height;
 			height = tmp;
-		}
+		} */
 		
 		m_smallScreenMode = m_compatMode || (width < 960 || height < 720);
 
@@ -500,8 +503,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 		Log.d(TAG, "m_compatMode=" + m_compatMode);
 
 		if (!m_compatMode) {
-			new TransitionHelper((LinearLayout) findViewById(R.id.main));
-			
+			new TransitionHelper((ViewGroup) findViewById(R.id.main));
 			m_headlinesActionModeCallback = new HeadlinesActionModeCallback();
 		}
 
@@ -522,10 +524,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 				}
 			}
 
-			if (!m_compatMode && !m_smallScreenMode) {
-				// getActionBar().setDisplayHomeAsUpEnabled(true); TODO
-			}
-
 			if (m_smallScreenMode) {
 				if (m_selectedArticle != null) {
 					findViewById(R.id.feeds_fragment).setVisibility(View.GONE);
@@ -537,10 +535,11 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 					findViewById(R.id.article_fragment)
 							.setVisibility(View.GONE);
 					findViewById(R.id.cats_fragment).setVisibility(View.GONE);
-				} else {
-					findViewById(R.id.headlines_fragment).setVisibility(
-							View.GONE);
-					// findViewById(R.id.article_fragment).setVisibility(View.GONE);
+				} else {					
+					//findViewById(R.id.headlines_fragment).setVisibility(
+					//		View.GONE);
+					
+					//findViewById(R.id.article_fragment).setVisibility(View.GONE);
 
 					if (m_enableCats && m_activeCategory == null) {
 						findViewById(R.id.feeds_fragment).setVisibility(
@@ -550,6 +549,8 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 					} else {
 						findViewById(R.id.cats_fragment).setVisibility(
 								View.GONE);
+						//findViewById(R.id.feeds_fragment).setVisibility(
+						//		View.VISIBLE);
 					}
 				}
 			} else {