commit ec86c424934205dcbc21078543be116d50e1b183
author Tony Mantler <nicoya@google.com> Wed Sep 24 14:33:20 2014 -0700
committer Tony Mantler <nicoya@google.com> Wed Sep 24 14:33:20 2014 -0700
tree 49e588b2d0cfd63ae4f99eaf89ae6e19268693d5
parent 52fcfb47c49573f544cb05a8fa3c43254ab8e69d

Don't allow starring messages in trash in CAB mode

b/17460527

Change-Id: I8de879c3d3f4b89213810957fe0e4c7f1ebf8ccb

src/com/android/mail/browse/SelectedConversationsActionMenu.java

diff --git a/src/com/android/mail/browse/SelectedConversationsActionMenu.java b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
index e3b9581..7293a36 100644
--- a/src/com/android/mail/browse/SelectedConversationsActionMenu.java
+++ b/src/com/android/mail/browse/SelectedConversationsActionMenu.java
@@ -387,10 +387,11 @@
                 break;
             }
         }
+        final boolean canStar = mFolder != null && !mFolder.isTrash();
         final MenuItem star = menu.findItem(R.id.star);
-        star.setVisible(showStar);
+        star.setVisible(showStar && canStar);
         final MenuItem unstar = menu.findItem(R.id.remove_star);
-        unstar.setVisible(!showStar);
+        unstar.setVisible(!showStar && canStar);
         final MenuItem read = menu.findItem(R.id.read);
         read.setVisible(!showMarkUnread);
         final MenuItem unread = menu.findItem(R.id.unread);