From c37b18509d47f1024212090adeffb333b326e5b4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Apr 2013 15:45:01 -0700
Subject: [PATCH] Fix flash of descriptive text before recent cats shown

Switch from hiding the "skip" text after looking up cats,
to hiding it initially and showing it after doing the local
search for recent cats.
---
 commons/res/layout/fragment_categorization.xml      |  1 +
 .../wikimedia/commons/CategorizationFragment.java   | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/commons/res/layout/fragment_categorization.xml b/commons/res/layout/fragment_categorization.xml
index cbf99fa8b..2a75bd92e 100644
--- a/commons/res/layout/fragment_categorization.xml
+++ b/commons/res/layout/fragment_categorization.xml
@@ -51,6 +51,7 @@
         android:gravity="center"
         android:focusable="true"
         android:text="@string/categories_skip_explanation"
+        android:visibility="gone"
         />
 
     <ListView
diff --git a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
index a95172937..8b90e68b4 100644
--- a/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
+++ b/commons/src/main/java/org/wikimedia/commons/CategorizationFragment.java
@@ -96,10 +96,7 @@ public class CategorizationFragment extends SherlockFragment{
             categoriesSearchInProgress.setVisibility(View.VISIBLE);
             categoriesNotFoundView.setVisibility(View.GONE);
 
-            if(!TextUtils.isEmpty(filter)) {
-                // Only hide this on first count of non-empty filter
-                categoriesSkip.setVisibility(View.GONE);
-            }
+            categoriesSkip.setVisibility(View.GONE);
         }
 
         @Override
@@ -122,13 +119,13 @@ public class CategorizationFragment extends SherlockFragment{
             categoriesAdapter.notifyDataSetInvalidated();
             categoriesSearchInProgress.setVisibility(View.GONE);
             if (categories.size() == 0) {
-                if(!TextUtils.isEmpty(filter)) {
+                if(TextUtils.isEmpty(filter)) {
+                    // If we found no recent cats, show the skip message!
+                    categoriesSkip.setVisibility(View.VISIBLE);
+                } else {
                     categoriesNotFoundView.setText(getString(R.string.categories_not_found, filter));
                     categoriesNotFoundView.setVisibility(View.VISIBLE);
                 }
-            } else {
-                // If we found recent cats, hide the skip message!
-                categoriesSkip.setVisibility(View.GONE);
             }
         }