Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
index 1c1bf21..dde4042 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
@@ -44,6 +44,7 @@
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 
@@ -166,6 +167,7 @@
             // old cursor once we return.)
             mAdapter.swapCursor(data);
             getActivity().invalidateOptionsMenu();
+            updateNoAlertTextVisibility();
         }
 
         @Override
@@ -206,6 +208,21 @@
                     }
                 };
 
+        private void updateNoAlertTextVisibility() {
+            TextView noAlertsTextView = getActivity().findViewById(R.id.empty);
+            if (noAlertsTextView != null) {
+                noAlertsTextView.setVisibility(!hasAlertsInHistory()
+                        ? View.VISIBLE : View.INVISIBLE);
+            }
+        }
+
+        /**
+         * @return {@code true} if the alert history database has any item
+         */
+        private boolean hasAlertsInHistory() {
+            return mAdapter.getCursor().getCount() > 0;
+        }
+
         @Override
         public boolean onContextItemSelected(MenuItem item) {
             Cursor cursor = mAdapter.getCursor();