ICS: Migrate SearchViewCompat to SearchView.

KolinB · Oct 2, 2014 · a3de8ad · a3de8ad
1 parent 3668ff2
commit a3de8ad
Showing 1 changed file with 19 additions and 21 deletions.
diff --git a/wallet/src/de/schildbach/wallet/ui/ExchangeRatesFragment.java b/wallet/src/de/schildbach/wallet/ui/ExchangeRatesFragment.java
@@ -34,14 +34,15 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.widget.SearchViewCompat;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.ResourceCursorAdapter;
+import android.widget.SearchView;
+import android.widget.SearchView.OnQueryTextListener;
 import android.widget.TextView;
 
 import com.google.bitcoin.core.Wallet;
@@ -158,32 +159,29 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater)
 	{
 		inflater.inflate(R.menu.exchange_rates_fragment_options, menu);
 
-		final View searchView = menu.findItem(R.id.exchange_rates_options_search).getActionView();
-		if (searchView != null)
+		final SearchView searchView = (SearchView) menu.findItem(R.id.exchange_rates_options_search).getActionView();
+		searchView.setOnQueryTextListener(new OnQueryTextListener()
 		{
-			SearchViewCompat.setOnQueryTextListener(searchView, new SearchViewCompat.OnQueryTextListenerCompat()
+			@Override
+			public boolean onQueryTextChange(final String newText)
 			{
-				@Override
-				public boolean onQueryTextChange(final String newText)
-				{
-					query = newText.trim();
-					if (query.isEmpty())
-						query = null;
+				query = newText.trim();
+				if (query.isEmpty())
+					query = null;
 
-					getLoaderManager().restartLoader(ID_RATE_LOADER, null, rateLoaderCallbacks);
+				getLoaderManager().restartLoader(ID_RATE_LOADER, null, rateLoaderCallbacks);
 
-					return true;
-				}
+				return true;
+			}
 
-				@Override
-				public boolean onQueryTextSubmit(final String query)
-				{
-					searchView.clearFocus();
+			@Override
+			public boolean onQueryTextSubmit(final String query)
+			{
+				searchView.clearFocus();
 
-					return true;
-				}
-			});
-		}
+				return true;
+			}
+		});
 
 		super.onCreateOptionsMenu(menu, inflater);
 	}