* #36914: New navigation working
This commit impacts the whole structure app, because we now have
nested Fragments. To keep retro-compatibility, we switched from normal
Fragment to Fragment from the support library.
diff --git a/src/org/sflphone/fragments/HistoryFragment.java b/src/org/sflphone/fragments/HistoryFragment.java
index f602020..e2df862 100644
--- a/src/org/sflphone/fragments/HistoryFragment.java
+++ b/src/org/sflphone/fragments/HistoryFragment.java
@@ -43,13 +43,12 @@
import org.sflphone.service.ISipService;
import android.app.Activity;
-import android.app.ListFragment;
-import android.app.LoaderManager.LoaderCallbacks;
import android.content.Context;
import android.content.Intent;
-import android.content.Loader;
import android.os.Bundle;
import android.os.RemoteException;
+import android.support.v4.app.ListFragment;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -57,14 +56,11 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.ImageButton;
-import android.widget.ImageView;
import android.widget.ListAdapter;
import android.widget.TextView;
-import android.widget.Toast;
public class HistoryFragment extends ListFragment implements LoaderCallbacks<ArrayList<HistoryEntry>> {
@@ -157,29 +153,6 @@
mCallbacks.onCallDialed(mAdapter.getItem(position).getNumber());
}
- @Override
- public Loader<ArrayList<HistoryEntry>> onCreateLoader(int id, Bundle args) {
-
- HistoryLoader loader = new HistoryLoader(getActivity(), mCallbacks.getService());
- loader.forceLoad();
- return loader;
-
- }
-
- @Override
- public void onLoadFinished(Loader<ArrayList<HistoryEntry>> arg0, ArrayList<HistoryEntry> history) {
- mAdapter.clear();
- mAdapter.addAll(history);
- mAdapter.notifyDataSetChanged();
-
- }
-
- @Override
- public void onLoaderReset(Loader<ArrayList<HistoryEntry>> arg0) {
- // TODO Auto-generated method stub
-
- }
-
public class HistoryAdapter extends BaseAdapter implements ListAdapter {
Context mContext;
@@ -303,4 +276,24 @@
}
+ @Override
+ public android.support.v4.content.Loader<ArrayList<HistoryEntry>> onCreateLoader(int arg0, Bundle arg1) {
+ HistoryLoader loader = new HistoryLoader(getActivity(), mCallbacks.getService());
+ loader.forceLoad();
+ return loader;
+ }
+
+ @Override
+ public void onLoadFinished(android.support.v4.content.Loader<ArrayList<HistoryEntry>> arg0, ArrayList<HistoryEntry> history) {
+ mAdapter.clear();
+ mAdapter.addAll(history);
+ mAdapter.notifyDataSetChanged();
+ }
+
+ @Override
+ public void onLoaderReset(android.support.v4.content.Loader<ArrayList<HistoryEntry>> arg0) {
+ // TODO Stub de la méthode généré automatiquement
+
+ }
+
}