Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/issue-51-search-action-compat' of https://gitlab.com/pserwylo/fdroidclient

Browse Source
This commit is contained in:
Daniel Martí 2014-07-06 11:22:59 +02:00
commit 8af69afba6
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/menu/select_local_apps_activity.xml
View File

@ -1,15 +1,16 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" >
<item <item
android:id="@+id/action_search" android:id="@+id/action_search"
android:actionViewClass="android.widget.SearchView" app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="collapseActionView|always"
android:icon="@android:drawable/ic_menu_search" android:icon="@android:drawable/ic_menu_search"
android:showAsAction="collapseActionView|ifRoom"
android:title="@string/menu_search"/> android:title="@string/menu_search"/>
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:icon="@android:drawable/ic_menu_preferences" android:icon="@android:drawable/ic_menu_preferences"
android:showAsAction="never" android:title="@string/menu_preferences"
android:title="@string/menu_preferences"/> app:showAsAction="never"/>
</menu> </menu>

4
src/org/fdroid/fdroid/views/SelectLocalAppsActivity.java
View File

@ -5,11 +5,11 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarActivity;
import android.support.v7.widget.SearchView;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.SearchView;
import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.PreferencesActivity; import org.fdroid.fdroid.PreferencesActivity;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
@ -41,7 +41,7 @@ public class SelectLocalAppsActivity extends ActionBarActivity {
getMenuInflater().inflate(R.menu.select_local_apps_activity, menu); getMenuInflater().inflate(R.menu.select_local_apps_activity, menu);
searchView = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.action_search)); searchView = (SearchView) MenuItemCompat.getActionView(menu.findItem(R.id.action_search));
searchView.setOnQueryTextListener(selectLocalAppsFragment); searchView.setOnQueryTextListener(selectLocalAppsFragment);
return true; return super.onCreateOptionsMenu(menu);
} }
@Override @Override

2
src/org/fdroid/fdroid/views/fragments/SelectLocalAppsFragment.java
View File

@ -23,13 +23,13 @@ import android.support.v4.app.ListFragment;
import android.support.v4.app.LoaderManager; import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader; import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.support.v7.widget.SearchView.OnQueryTextListener;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.ListView; import android.widget.ListView;
import android.widget.SearchView.OnQueryTextListener;
import android.widget.SimpleCursorAdapter; import android.widget.SimpleCursorAdapter;
import android.widget.SimpleCursorAdapter.ViewBinder; import android.widget.SimpleCursorAdapter.ViewBinder;
import android.widget.TextView; import android.widget.TextView;