commit 09c9bcec2856acd93ae23781d981ee839d345cb7
author Tony Mantler <nicoya@google.com> Sun Nov 02 19:52:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 02 19:52:59 2014 +0000
tree 3b0567e6ad875f6276240e3b7091b341b27ec583
parent 912ac2d10c7190536bb894f1257f3ffa9cce52fb
parent 8f27eff2e650c4794c6f60477891096ed9e2b841

am 8f27eff2: am d501dabc: am 570a7b00: am ec86c424: Don\'t allow starring messages in trash in CAB mode

* commit '8f27eff2e650c4794c6f60477891096ed9e2b841':
  Don't allow starring messages in trash in CAB mode

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);