summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2018-03-15 13:46:56 +0300
committerAndrew Dolgov <[email protected]>2018-03-15 13:46:56 +0300
commitb5047c9902180782e3d8976492a0c6e5779587da (patch)
tree544c539a9aba3b3ea25a4c88bcce13c19097f640 /org.fox.ttrss/src
parenta8f3cc815c82bd7a78d7d74ecdf270052565d59c (diff)
remove toggle_attachments menu item (no longer needed)
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java4
-rwxr-xr-x[-rw-r--r--]org.fox.ttrss/src/main/res/menu/activity_main.xml4
3 files changed, 6 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 4c3711e5..75637ac3 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -184,12 +184,12 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
/* 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);
+ //m_menu.findItem(R.id.toggle_attachments).setVisible(true);
} else {
/* if (!isCompatMode()) {
m_menu.findItem(R.id.toggle_attachments).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
} */
- m_menu.findItem(R.id.toggle_attachments).setVisible(false);
+ //m_menu.findItem(R.id.toggle_attachments).setVisible(false);
}
}
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
index 68104f8b..86e7b66f 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java
@@ -515,7 +515,7 @@ public class OnlineActivity extends CommonActivity {
Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class);
startActivityForResult(subscribe, 0);
return true;
- case R.id.toggle_attachments:
+ /*case R.id.toggle_attachments:
if (true) {
Article article = ap.getSelectedArticle();
@@ -523,7 +523,7 @@ public class OnlineActivity extends CommonActivity {
displayAttachments(article);
}
}
- return true;
+ return true; */
case R.id.donate:
if (true) {
openUnlockUrl();
diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml
index 04e2a2f4..fa6d586f 100644..100755
--- a/org.fox.ttrss/src/main/res/menu/activity_main.xml
+++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml
@@ -55,11 +55,11 @@
android:icon="@drawable/ic_email"
app:showAsAction="ifRoom"
android:title="@string/article_toggle_unread"/>
- <item
+ <!-- <item
android:id="@+id/toggle_attachments"
android:icon="@drawable/ic_attachment"
app:showAsAction=""
- android:title="@string/attachments_prompt"/>
+ android:title="@string/attachments_prompt"/> -->
<!-- <item
android:id="@+id/share_article"
android:icon="@drawable/ic_share"