Messaging: Remove VisibleForTesting

Since we removed all tests, no need to keep those flags around either

Change-Id: Icaf71832c459cecbcbddc75f552c60e48ae95189

src/com/android/messaging/ui/AsyncImageView.java

@@ -47,7 +47,6 @@ import com.android.messaging.util.Assert;
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.ThreadUtil;
 import com.android.messaging.util.UiUtils;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.HashSet;
 
@@ -65,7 +64,6 @@ public class AsyncImageView extends ImageView implements MediaResourceLoadListen
     // issues, so that when the image is loaded, the ImageRequest (which extends BindableData)
     // will be able to figure out whether the binding is still valid and whether the loaded image
     // should be delivered to the AsyncImageView via onMediaResourceLoaded() callback.
-    @VisibleForTesting
     public final Binding<BindableMediaRequest<ImageResource>> mImageRequestBinding;
 
     /** True if we want the image to fade in when it loads */

src/com/android/messaging/ui/FixedViewPagerAdapter.java

@@ -27,7 +27,6 @@ import android.view.ViewGroup;
 import com.android.messaging.Factory;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.UiUtils;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * A PagerAdapter that provides a fixed number of paged Views provided by a fixed set of
@@ -79,7 +78,6 @@ public class FixedViewPagerAdapter<T extends PagerViewHolder> extends PagerAdapt
         return getViewHolder(i, true /* rtlAware */);
     }
 
-    @VisibleForTesting
     public T getViewHolder(final int i, final boolean rtlAware) {
         return mViewHolders[rtlAware ? getRtlPosition(i) : i];
     }

src/com/android/messaging/ui/attachmentchooser/AttachmentChooserFragment.java

@@ -43,7 +43,6 @@ import com.android.messaging.datamodel.data.MessagePartData;
 import com.android.messaging.ui.BugleActionBarActivity;
 import com.android.messaging.ui.UIIntents;
 import com.android.messaging.ui.attachmentchooser.AttachmentGridView.AttachmentGridHost;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +57,6 @@ public class AttachmentChooserFragment extends Fragment implements DraftMessageD
     private AttachmentGridAdapter mAdapter;
     private AttachmentChooserFragmentHost mHost;
 
-    @VisibleForTesting
     final Binding<DraftMessageData> mBinding = BindingBase.createBinding(this);
 
     @Override
@@ -94,7 +92,6 @@ public class AttachmentChooserFragment extends Fragment implements DraftMessageD
         return super.onOptionsItemSelected(item);
     }
 
-    @VisibleForTesting
     void confirmSelection() {
         if (mBinding.isBound()) {
             mBinding.getData().removeExistingAttachments(

src/com/android/messaging/ui/attachmentchooser/AttachmentGridItemView.java

@@ -29,7 +29,6 @@ import com.android.messaging.R;
 import com.android.messaging.datamodel.data.MessagePartData;
 import com.android.messaging.ui.AttachmentPreviewFactory;
 import com.android.messaging.util.Assert;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * Shows an item in the attachment picker grid.
@@ -41,7 +40,6 @@ public class AttachmentGridItemView extends FrameLayout {
         void onItemClicked(AttachmentGridItemView view, MessagePartData attachment);
     }
 
-    @VisibleForTesting
     MessagePartData mAttachmentData;
     private FrameLayout mAttachmentViewContainer;
     private CheckBox mCheckBox;
@@ -89,11 +87,6 @@ public class AttachmentGridItemView extends FrameLayout {
         }
     }
 
-    @VisibleForTesting
-    HostInterface testGetHostInterface() {
-        return mHostInterface;
-    }
-
     public void updateSelectedState() {
         mCheckBox.setChecked(mHostInterface.isItemSelected(mAttachmentData));
     }

src/com/android/messaging/ui/contact/ContactListItemView.java

@@ -35,7 +35,6 @@ import com.android.messaging.datamodel.data.ParticipantData;
 import com.android.messaging.ui.ContactIconView;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.AvatarUriUtil;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * The view for a single entry in a contact list.
@@ -46,7 +45,6 @@ public class ContactListItemView extends LinearLayout implements OnClickListener
         boolean isContactSelected(ContactListItemData item);
     }
 
-    @VisibleForTesting
     final ContactListItemData mData;
     private TextView mContactNameTextView;
     private TextView mContactDetailsTextView;

src/com/android/messaging/ui/contact/ContactPickerFragment.java

@@ -66,7 +66,6 @@ import com.android.messaging.util.ImeUtil;
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.PhoneUtils;
 import com.android.messaging.util.UiUtils;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.Set;
@@ -105,7 +104,6 @@ public class ContactPickerFragment extends Fragment implements ContactPickerData
         void invalidateActionBar();
     }
 
-    @VisibleForTesting
     final Binding<ContactPickerData> mBinding = BindingBase.createBinding(this);
 
     private ContactPickerFragmentHost mHost;

src/com/android/messaging/ui/conversation/ConversationActivityUiState.java

@@ -23,7 +23,6 @@ import androidx.annotation.NonNull;
 
 import com.android.messaging.ui.contact.ContactPickerFragment;
 import com.android.messaging.util.Assert;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * Keeps track of the different UI states that the ConversationActivity may be in. This acts as
@@ -299,12 +298,4 @@ public class ConversationActivityUiState implements Parcelable, Cloneable {
         }
         return null;
     }
-
-    /**
-     * allows for overridding the internal UI state. Should never be called except by test code.
-     */
-    @VisibleForTesting
-    void testSetUiState(final int uiState) {
-        mConversationContactUiState = uiState;
-    }
 }

src/com/android/messaging/ui/conversation/ConversationFragment.java

@@ -110,7 +110,6 @@ import com.android.messaging.util.SafeAsyncTask;
 import com.android.messaging.util.TextUtil;
 import com.android.messaging.util.UiUtils;
 import com.android.messaging.util.UriUtil;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -160,7 +159,6 @@ public class ConversationFragment extends Fragment implements ConversationDataLi
     // This binding keeps track of our associated ConversationData instance
     // A binding should have the lifetime of the owning component,
     //  don't recreate, unbind and bind if you need new data
-    @VisibleForTesting
     final Binding<ConversationData> mBinding = BindingBase.createBinding(this);
 
     // Saved Instance State Data - only for temporal data which is nice to maintain but not

src/com/android/messaging/ui/conversationlist/ConversationListFragment.java

@@ -58,7 +58,6 @@ import com.android.messaging.util.ImeUtil;
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.UiUtils;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -101,7 +100,6 @@ public class ConversationListFragment extends Fragment implements ConversationLi
             "conversationListViewState";
     private Parcelable mListState;
 
-    @VisibleForTesting
     final Binding<ConversationListData> mListBinding = BindingBase.createBinding(this);
 
     public static ConversationListFragment createArchivedConversationListFragment() {

src/com/android/messaging/ui/mediapicker/AudioRecordView.java

@@ -49,7 +49,6 @@ import com.android.messaging.util.MediaUtil.OnCompletionListener;
 import com.android.messaging.util.SafeAsyncTask;
 import com.android.messaging.util.ThreadUtil;
 import com.android.messaging.util.UiUtils;
-import com.google.common.annotations.VisibleForTesting;
 
 /**
  * Hosts an audio recorder with tap and hold to record functionality.
@@ -236,7 +235,6 @@ public class AudioRecordView extends FrameLayout implements
         mRecordButtonVisual.setBackground(backgroundDrawable);
     }
 
-    @VisibleForTesting
     void onRecordButtonTouchDown() {
         if (!mMediaRecorder.isRecording() && mCurrentMode == MODE_IDLE) {
             setMode(MODE_STARTING);
@@ -255,7 +253,6 @@ public class AudioRecordView extends FrameLayout implements
         }
     }
 
-    @VisibleForTesting
     boolean onRecordButtonTouchUp() {
         if (System.currentTimeMillis() - mAudioRecordStartTimeMillis <
                 AUDIO_RECORD_MINIMUM_DURATION_MILLIS) {

src/com/android/messaging/ui/mediapicker/MediaPicker.java

@@ -52,7 +52,6 @@ import com.android.messaging.ui.FixedViewPagerAdapter;
 import com.android.messaging.util.AccessibilityUtil;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.UiUtils;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -156,7 +155,6 @@ public class MediaPicker extends Fragment implements DraftMessageSubscriptionDat
     /** The theme color to use to make the media picker match the rest of the UI */
     private int mThemeColor;
 
-    @VisibleForTesting
     final Binding<MediaPickerData> mBinding = BindingBase.createBinding(this);
 
     /** Provides subscription-related data to access per-subscription configurations. */