Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a9b5104 authored by Marten Gajda's avatar Marten Gajda
Browse files

always expand current search group #21

parent 455b751d

src/org/dmfs/tasks/TaskGroupPagerAdapter.java

+3 −1
Original line number Diff line number Diff line
@@ -94,10 +94,12 @@ public class TaskGroupPagerAdapter extends FragmentStatePagerAdapter implements 
	@Override

	public Fragment getItem(int position)

	{

		AbstractGroupingFactory factory = getGroupingFactoryForId(mTabConfig.getVisibleItem(position).getId());

		int pageId = mTabConfig.getVisibleItem(position).getId();

		AbstractGroupingFactory factory = getGroupingFactoryForId(pageId);



		TaskListFragment fragment = TaskListFragment.newInstance(position, mTwoPaneLayout);

		fragment.setExpandableGroupDescriptor(factory.getExpandableGroupDescriptor());

		fragment.setPageId(pageId);

		return fragment;



	}

src/org/dmfs/tasks/TaskListActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ public class TaskListActivity extends FragmentActivity implements TaskListFragme 
		{

			TaskListFragment fragment = (TaskListFragment) mPagerAdapter.instantiateItem(mViewPager, mViewPager.getCurrentItem());

			fragment.notifyDataSetChanged(true);

			fragment.expandCurrentSearchGroup();

		}

	};

src/org/dmfs/tasks/TaskListFragment.java

+22 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import org.dmfs.tasks.utils.FlingDetector.OnFlingListener; 
import org.dmfs.tasks.utils.OnChildLoadedListener;

import org.dmfs.tasks.utils.OnModelLoadedListener;

import org.dmfs.tasks.utils.RetainExpandableListView;

import org.dmfs.tasks.utils.SearchHistoryDatabaseHelper.SearchHistoryColumns;



import android.accounts.Account;

import android.accounts.AccountManager;
@@ -129,6 +130,9 @@ public class TaskListFragment extends SupportFragment implements LoaderManager.L 
	private Loader<Cursor> mCursorLoader;

	private String mAuthority;



	@Retain

	private int mPageId = -1;



	private final OnChildClickListener mTaskItemClickListener = new OnChildClickListener()

	{
@@ -855,4 +859,22 @@ public class TaskListFragment extends SupportFragment implements LoaderManager.L 
		}

	}





	public void expandCurrentSearchGroup()

	{

		if (mPageId == R.id.task_group_search && mAdapter.getGroupCount() > 0)

		{

			Cursor c = mAdapter.getGroup(0);

			if (c != null && c.getInt(c.getColumnIndex(SearchHistoryColumns.HISTORIC)) < 1)

			{

				mExpandableListView.expandGroup(0);

			}

		}

	}





	public void setPageId(int pageId)

	{

		mPageId = pageId;

	}

}