diff options
author | Andrew Dolgov <[email protected]> | 2013-07-11 09:22:12 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-07-11 09:31:46 +0400 |
commit | 739d1c4abed7412d85b4f8f4f7559f48f670b78e (patch) | |
tree | 11c1ed7f8f370bff21ae169a189d5b2f81cbb326 | |
parent | b3657d0fe32e521017cf16395e2164b30979e564 (diff) |
disable attachment icon in actionbar on tablets in portrait (screws with
other icons because android is so awesome)
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 2 | ||||
-rw-r--r-- | src/org/fox/ttrss/HeadlinesActivity.java | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a7526b3c..cc686e1c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="189" - android:versionName="1.8.9" > + android:versionCode="190" + android:versionName="1.8.10" > <uses-sdk android:minSdkVersion="8" diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 282da0c5..9484bd76 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -109,7 +109,7 @@ <item android:id="@+id/toggle_attachments" android:icon="@drawable/ic_menu_attaches_light" - android:showAsAction="ifRoom" + android:showAsAction="" android:title="@string/attachments_prompt"/> <item android:id="@+id/share_article" diff --git a/src/org/fox/ttrss/HeadlinesActivity.java b/src/org/fox/ttrss/HeadlinesActivity.java index 2d3ff4f7..c25c755e 100644 --- a/src/org/fox/ttrss/HeadlinesActivity.java +++ b/src/org/fox/ttrss/HeadlinesActivity.java @@ -150,7 +150,7 @@ public class HeadlinesActivity extends OnlineActivity implements HeadlinesEventL if (af != null) { if (af.getSelectedArticle() != null && af.getSelectedArticle().attachments != null && af.getSelectedArticle().attachments.size() > 0) { - if (!isCompatMode()) { + if (!isCompatMode() && (isSmallScreen() || !isPortrait())) { m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); } m_menu.findItem(R.id.toggle_attachments).setVisible(true); |