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

Commit 9d3df42f authored by Marten Gajda's avatar Marten Gajda
Browse files

Merge branch 'OSE' of ssh://git.dmfs.org:23023/android-tasks/tasks into OSE

parents 3efd9083 9e56347a

project.properties

+4 −4
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt



# Project target.

target=android-22

target=android-23

android.library=false

android.library.reference.1=../task-provider

android.library.reference.2=../color-picker

android.library.reference.3=../pagerslidingtabstrip/library

android.library.reference.2=../android-support-v7-appcompat

android.library.reference.3=../color-picker

proguard.config=proguard.cfg

android.library.reference.4=../android-support-v7-appcompat
 
android.library.reference.4=../PagerSlidingTabStrip/library

src/org/dmfs/tasks/SettingsListFragment.java

+6 −5
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class SettingsListFragment extends ListFragment implements AbsListView.On 
	private String mListSelectionArguments;

	private String[] mListSelectionParam;

	private String mListCompareColumnName;

	private boolean mSaveOnDetach;

	private boolean mSaveOnPause;

	private int mFragmentLayout;

	private String mAuthority;
@@ -122,7 +122,7 @@ public class SettingsListFragment extends ListFragment implements AbsListView.On 
		mListSelectionArguments = args.getString(LIST_SELECTION_ARGS);

		mListSelectionParam = args.getStringArray(LIST_STRING_PARAMS);

		mFragmentLayout = args.getInt(LIST_FRAGMENT_LAYOUT);

		mSaveOnDetach = args.getBoolean(LIST_ONDETACH_SAVE);

		mSaveOnPause = args.getBoolean(LIST_ONDETACH_SAVE);

		mListCompareColumnName = args.getString(COMPARE_COLUMN_NAME);

		View view = inflater.inflate(mFragmentLayout, container, false);

		return view;
@@ -245,13 +245,14 @@ public class SettingsListFragment extends ListFragment implements AbsListView.On 




	@Override

	public void onDetach()

	public void onPause()

	{

		if (mSaveOnDetach)

		super.onPause();

		if (mSaveOnPause)

		{

			saveListState();

			doneSaveListState();

		}

		super.onDetach();

	}