commit 78d081dce1a32c8697f7a371ba3025b96bf94e31
author Flavio Lerda <flerda@google.com> Mon Oct 17 14:44:02 2011 +0100
committer Flavio Lerda <flerda@google.com> Tue Oct 18 14:29:38 2011 +0100
tree 85f3b708e2060f49a52517ef915a73965850f616
parent 4b92b45ec43f74e450b192d5adbf8d092df32a08

Only show options menu items when loaded.

Previously, we were showing the "Trash" option in the action bar before
the data was loaded, because we already knew this was a voicemail from
looking at the call log content, but we waited until the contact
information was loaded before showing the other options.

This lead to the set of options to change when the data is loaded, which
was confusing for the user which might already be interacting with the
action bar by that time.

Instead, this commit disables all options by default and enables the
needed ones only when the data has been fully loaded.

Bug: 5461913
Change-Id: I93c21c4afbfed62d0cb1b3649ff24278bfabf289

src/com/android/contacts/CallDetailActivity.java

diff --git a/src/com/android/contacts/CallDetailActivity.java b/src/com/android/contacts/CallDetailActivity.java
index 5437504..8f40055 100644
--- a/src/com/android/contacts/CallDetailActivity.java
+++ b/src/com/android/contacts/CallDetailActivity.java
@@ -121,7 +121,11 @@
     private TextView mStatusMessageAction;
 
     /** Whether we should show "edit number before call" in the options menu. */
-    private boolean mHasEditNumberBeforeCall;
+    private boolean mHasEditNumberBeforeCallOption;
+    /** Whether we should show "trash" in the options menu. */
+    private boolean mHasTrashOption;
+    /** Whether we should show "remove from call log" in the options menu. */
+    private boolean mHasRemoveFromCallLogOption;
 
     private ProximitySensorManager mProximitySensorManager;
     private final ProximitySensorListener mProximitySensorListener = new ProximitySensorListener();
@@ -491,7 +495,10 @@
                     disableCallButton();
                 }
 
-                mHasEditNumberBeforeCall = canPlaceCallsTo && !isSipNumber && !isVoicemailNumber;
+                mHasEditNumberBeforeCallOption =
+                        canPlaceCallsTo && !isSipNumber && !isVoicemailNumber;
+                mHasTrashOption = hasVoicemail();
+                mHasRemoveFromCallLogOption = !hasVoicemail();
                 invalidateOptionsMenu();
 
                 ListView historyList = (ListView) findViewById(R.id.history);
@@ -724,9 +731,9 @@
     public boolean onPrepareOptionsMenu(Menu menu) {
         // This action deletes all elements in the group from the call log.
         // We don't have this action for voicemails, because you can just use the trash button.
-        menu.findItem(R.id.menu_remove_from_call_log).setVisible(!hasVoicemail());
-        menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCall);
-        menu.findItem(R.id.menu_trash).setVisible(hasVoicemail());
+        menu.findItem(R.id.menu_remove_from_call_log).setVisible(mHasRemoveFromCallLogOption);
+        menu.findItem(R.id.menu_edit_number_before_call).setVisible(mHasEditNumberBeforeCallOption);
+        menu.findItem(R.id.menu_trash).setVisible(mHasTrashOption);
         return super.onPrepareOptionsMenu(menu);
     }