From a9c226358d83cbfe6b31ac2750fd641fd561a2d7 Mon Sep 17 00:00:00 2001
From: Nancy Chen <nancychen@google.com>
Date: Thu, 7 Aug 2014 16:25:08 -0700
Subject: Moving pinned header disabling to superclass

Pinned headers will be disabled for all contacts and dialer lists.

Bug: 15596340

Change-Id: I49387acb8d2ce1b5e5984c0f55866881de851d49
---
 src/com/android/dialer/list/SearchFragment.java    |  9 ---
 .../dialer/list/SmartDialNumberPickerFragment.java | 76 ----------------------
 2 files changed, 85 deletions(-)
 delete mode 100644 src/com/android/dialer/list/SmartDialNumberPickerFragment.java

(limited to 'src/com/android')

diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index d993b237f..3bea170aa 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -145,15 +145,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
         return adapter;
     }
 
-    @Override
-    protected void configureAdapter() {
-        super.configureAdapter();
-        final ContactEntryListAdapter adapter = getAdapter();
-        if (adapter != null) {
-            getAdapter().setPinnedPartitionHeadersEnabled(false);
-        }
-    }
-
     @Override
     protected void onItemClick(int position, long id) {
         final DialerPhoneNumberListAdapter adapter = (DialerPhoneNumberListAdapter) getAdapter();
diff --git a/src/com/android/dialer/list/SmartDialNumberPickerFragment.java b/src/com/android/dialer/list/SmartDialNumberPickerFragment.java
deleted file mode 100644
index 0892de64a..000000000
--- a/src/com/android/dialer/list/SmartDialNumberPickerFragment.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.dialer.list;
-
-import android.content.Loader;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.ContactsContract.Directory;
-import android.util.Log;
-
-import com.android.contacts.common.list.ContactEntryListAdapter;
-import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.dialer.dialpad.SmartDialCursorLoader;
-
-/**
- * Implements a fragment to load and display SmartDial search results.
- */
-public class SmartDialNumberPickerFragment extends PhoneNumberPickerFragment {
-
-    private static final String TAG = SmartDialNumberPickerFragment.class.getSimpleName();
-
-    /**
-     * Creates a SmartDialListAdapter to display and operate on search results.
-     * @return
-     */
-    @Override
-    protected ContactEntryListAdapter createListAdapter() {
-        SmartDialNumberListAdapter adapter = new SmartDialNumberListAdapter(getActivity());
-        adapter.setDisplayPhotos(true);
-        adapter.setUseCallableUri(super.usesCallableUri());
-        return adapter;
-    }
-
-    /**
-     * Creates a SmartDialCursorLoader object to load query results.
-     */
-    @Override
-    public Loader<Cursor> onCreateLoader(int id, Bundle args) {
-        /** SmartDial does not support Directory Load, falls back to normal search instead. */
-        if (id == getDirectoryLoaderId()) {
-            Log.v(TAG, "Directory load");
-            return super.onCreateLoader(id, args);
-        } else {
-            Log.v(TAG, "Creating loader");
-            final SmartDialNumberListAdapter adapter = (SmartDialNumberListAdapter) getAdapter();
-            SmartDialCursorLoader loader = new SmartDialCursorLoader(super.getContext());
-            adapter.configureLoader(loader);
-            return loader;
-        }
-    }
-
-    /**
-     * Gets the Phone Uri of an entry for calling.
-     * @param position Location of the data of interest.
-     * @return Phone Uri to establish a phone call.
-     */
-    @Override
-    protected Uri getPhoneUri(int position) {
-        final SmartDialNumberListAdapter adapter = (SmartDialNumberListAdapter) getAdapter();
-        return adapter.getDataUri(position);
-    }
-}
-- 
cgit v1.2.3