From 56d0be3e0a8075b07e8daa86f67e67081d26aa60 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 17 Jan 2012 18:43:11 +0300
Subject: move libraries to libs/ properly detect xlarge screens update ACP
 library link against API 14 (ICS) various fixes for ICS bump version

---
 src/org/fox/ttrss/MainActivity.java    | 21 ++++-----------------
 src/org/fox/ttrss/OfflineActivity.java | 18 +++---------------
 2 files changed, 7 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 06647e11..f34e4977 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.net.ConnectivityManager;
@@ -470,21 +471,9 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 		m_enableCats = m_prefs.getBoolean("enable_cats", false);
 
-		Display display = getWindowManager().getDefaultDisplay();
-
-		int width = display.getWidth();
-		int height = display.getHeight();
-		
-		Log.d(TAG, "WxH=" + width + "x" + height);
-
-		/* if (height > width) {
-			int tmp = width;
-			width = height;
-			height = tmp;
-		} */
+		m_smallScreenMode = m_compatMode || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != 
+				Configuration.SCREENLAYOUT_SIZE_XLARGE;
 		
-		m_smallScreenMode = m_compatMode || (width < 960 || height < 720);
-
 		setContentView(R.layout.main);
 
 		IntentFilter filter = new IntentFilter();
@@ -1266,8 +1255,7 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 
 	private void loginSuccess() {
 		findViewById(R.id.loading_container).setVisibility(View.INVISIBLE);
-		findViewById(R.id.main).setVisibility(View.VISIBLE);
-
+		
 		m_isOffline = false;
 
 		initMainMenu();
@@ -1538,7 +1526,6 @@ public class MainActivity extends FragmentActivity implements OnlineServices {
 		m_sessionId = null;
 
 		findViewById(R.id.loading_container).setVisibility(View.VISIBLE);
-		findViewById(R.id.main).setVisibility(View.INVISIBLE);
 
 		TextView tv = (TextView) findViewById(R.id.loading_message);
 
diff --git a/src/org/fox/ttrss/OfflineActivity.java b/src/org/fox/ttrss/OfflineActivity.java
index 16dd7064..3eccf474 100644
--- a/src/org/fox/ttrss/OfflineActivity.java
+++ b/src/org/fox/ttrss/OfflineActivity.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
@@ -120,20 +121,8 @@ public class OfflineActivity extends FragmentActivity implements
 
 		m_enableCats = m_prefs.getBoolean("enable_cats", false);
 
-		Display display = getWindowManager().getDefaultDisplay();
-
-		int width = display.getWidth();
-		int height = display.getHeight();
-
-		Log.d(TAG, "WxH=" + width + "x" + height);
-
-		/* if (height > width) {
-			int tmp = width;
-			width = height;
-			height = tmp;
-		} */
-		
-		m_smallScreenMode = m_compatMode || (width < 960 || height < 720);
+		m_smallScreenMode = m_compatMode || (getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) != 
+				Configuration.SCREENLAYOUT_SIZE_XLARGE;
 
 		setContentView(R.layout.main);
 
@@ -149,7 +138,6 @@ public class OfflineActivity extends FragmentActivity implements
 		initMainMenu();
 
 		findViewById(R.id.loading_container).setVisibility(View.INVISIBLE);
-		findViewById(R.id.main).setVisibility(View.VISIBLE);
 
 		if (m_smallScreenMode) {
 			if (m_selectedArticleId != 0) {
-- 
cgit v1.2.3-54-g00ecf