moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 08:28:50 -05:00
Code Issues Releases Wiki Activity

Remove key list filter for now

Browse Source
This commit is contained in:
Dominik Schürmann 2014-10-13 15:53:39 +02:00
parent bfafc44a33
commit e9abe57aa7
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
View File

@ -102,12 +102,12 @@ public class KeyListFragment extends LoaderFragment
private KeyListAdapter mAdapter; private KeyListAdapter mAdapter;
private StickyListHeadersListView mStickyList; private StickyListHeadersListView mStickyList;
private ListAwareSwipeRefreshLayout mSwipeRefreshLayout; private ListAwareSwipeRefreshLayout mSwipeRefreshLayout;
private Spinner mFilterSpinner; // private Spinner mFilterSpinner;
// saves the mode object for multiselect, needed for reset at some point // saves the mode object for multiselect, needed for reset at some point
private ActionMode mActionMode = null; private ActionMode mActionMode = null;
private boolean mShowAllKeys = false; private boolean mShowAllKeys = true;
private String mQuery; private String mQuery;
private SearchView mSearchView; private SearchView mSearchView;
@ -237,7 +237,7 @@ public class KeyListFragment extends LoaderFragment
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
mFilterSpinner = (Spinner) getActivity().findViewById(R.id.key_list_filter_spinner); // mFilterSpinner = (Spinner) getActivity().findViewById(R.id.key_list_filter_spinner);
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
list.add(getString(R.string.key_list_filter_show_certified)); list.add(getString(R.string.key_list_filter_show_certified));
list.add(getString(R.string.key_list_filter_show_all)); list.add(getString(R.string.key_list_filter_show_all));
@ -248,30 +248,30 @@ public class KeyListFragment extends LoaderFragment
dataAdapter.setDropDownViewResource dataAdapter.setDropDownViewResource
(android.R.layout.simple_spinner_dropdown_item); (android.R.layout.simple_spinner_dropdown_item);
mFilterSpinner.setAdapter(dataAdapter); // mFilterSpinner.setAdapter(dataAdapter);
mFilterSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { // mFilterSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override // @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { // public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
switch (position) { // switch (position) {
case 0: { // case 0: {
mShowAllKeys = false; // mShowAllKeys = false;
getLoaderManager().restartLoader(0, null, KeyListFragment.this); // getLoaderManager().restartLoader(0, null, KeyListFragment.this);
break; // break;
} // }
case 1: { // case 1: {
mShowAllKeys = true; // mShowAllKeys = true;
getLoaderManager().restartLoader(0, null, KeyListFragment.this); // getLoaderManager().restartLoader(0, null, KeyListFragment.this);
break; // break;
} // }
} // }
} // }
//
@Override // @Override
public void onNothingSelected(AdapterView<?> parent) { // public void onNothingSelected(AdapterView<?> parent) {
//
} // }
}); // });
mStickyList.setOnItemClickListener(this); mStickyList.setOnItemClickListener(this);
mStickyList.setAreHeadersSticky(true); mStickyList.setAreHeadersSticky(true);

4
OpenKeychain/src/main/res/layout/key_list_content.xml
View File

@ -13,7 +13,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <!--<LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:background="@color/holo_gray_bright" android:background="@color/holo_gray_bright"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -33,7 +33,7 @@
android:layout_height="1dip" android:layout_height="1dip"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
</LinearLayout> </LinearLayout>-->
<fragment <fragment
android:id="@+id/key_list_fragment" android:id="@+id/key_list_fragment"