summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-09-02 19:48:48 +0400
committerAndrew Dolgov <[email protected]>2012-09-02 19:48:48 +0400
commitbcd4b562a47cc9c56e196c15d73a73efb63b5eec (patch)
tree71cb4220db7c96b97c78cece5337610c0ef6ceaf
parent1f831645ee32aaffc3611e2c15a7df2339302031 (diff)
move small tablet stuff detection to CommonActivity
use small tablet UI on screens up to 9"
-rw-r--r--src/org/fox/ttrss/CommonActivity.java6
-rw-r--r--src/org/fox/ttrss/MainActivity.java2
-rw-r--r--src/org/fox/ttrss/offline/OfflineActivity.java2
3 files changed, 4 insertions, 6 deletions
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index e497eb52..f0b678ae 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -31,7 +31,7 @@ public class CommonActivity extends FragmentActivity {
m_smallScreenMode = smallScreen;
}
- protected void setupSmallTabletFlag() {
+ protected void detectSmallTablet() {
DisplayMetrics displayMetrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
@@ -45,7 +45,7 @@ public class CommonActivity extends FragmentActivity {
m_smallTablet = true;
}
- Log.d(TAG, "m_smallTabletMode=" + m_smallTablet);
+ Log.d(TAG, "m_smallTabletMode=" + m_smallTablet + " " + inDiag);
}
private void initDatabase() {
@@ -80,6 +80,8 @@ public class CommonActivity extends FragmentActivity {
Log.d(TAG, "m_compatMode=" + m_compatMode);
+ detectSmallTablet();
+
super.onCreate(savedInstanceState);
}
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java
index 4a4c3eee..bb72543c 100644
--- a/src/org/fox/ttrss/MainActivity.java
+++ b/src/org/fox/ttrss/MainActivity.java
@@ -645,8 +645,6 @@ public class MainActivity extends CommonActivity implements OnlineServices {
setContentView(R.layout.main);
setSmallScreen(findViewById(R.id.headlines_fragment) == null);
-
- setupSmallTabletFlag();
IntentFilter filter = new IntentFilter();
filter.addAction(OfflineDownloadService.INTENT_ACTION_SUCCESS);
diff --git a/src/org/fox/ttrss/offline/OfflineActivity.java b/src/org/fox/ttrss/offline/OfflineActivity.java
index 496603fc..82241c89 100644
--- a/src/org/fox/ttrss/offline/OfflineActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineActivity.java
@@ -291,8 +291,6 @@ public class OfflineActivity extends CommonActivity implements
setContentView(R.layout.main);
setSmallScreen(findViewById(R.id.headlines_fragment) == null);
-
- setupSmallTabletFlag();
if (!isCompatMode()) {
if (!isSmallScreen()) {