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

Commit bf04c8a9 authored by Chiao Cheng's avatar Chiao Cheng Committed by Android (Google) Code Review
Browse files

Merge "Remove call log filter option from being persisted." into jb-mr1-dev

parents 5ef45ca1 fd4d9c0f
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.app.KeyguardManager;
import android.app.ListFragment;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
@@ -29,7 +28,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.preference.PreferenceManager;
import android.provider.CallLog;
import android.provider.CallLog.Calls;
import android.provider.ContactsContract;
@@ -71,8 +69,6 @@ public class CallLogFragment extends ListFragment
     */
    private static final int EMPTY_LOADER_ID = 0;

    private static final String PREF_CALL_LOG_FILTER_LAST_CALL_TYPE = "CallLogFragment_last_filter";

    private CallLogAdapter mAdapter;
    private CallLogQueryHandler mCallLogQueryHandler;
    private boolean mScrollToTop;
@@ -128,11 +124,6 @@ public class CallLogFragment extends ListFragment
        getActivity().getContentResolver().registerContentObserver(
                ContactsContract.Contacts.CONTENT_URI, true, mContactsObserver);
        setHasOptionsMenu(true);

        // Load the last filter used.
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
        mCallTypeFilter = prefs.getInt(PREF_CALL_LOG_FILTER_LAST_CALL_TYPE,
                CallLogQueryHandler.CALL_TYPE_ALL);
    }

    /** Called by the CallLogQueryHandler when the list of calls has been fetched or updated. */
@@ -297,11 +288,6 @@ public class CallLogFragment extends ListFragment
        super.onPause();
        // Kill the requests thread
        mAdapter.stopRequestProcessing();

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
        prefs.edit()
                .putInt(PREF_CALL_LOG_FILTER_LAST_CALL_TYPE, mCallTypeFilter)
                .apply();
    }

    @Override