Merge "Make PreferenceController a mixin"

packages/SettingsLib/src/com/android/settingslib/core/AbstractPreferenceController.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceScreen;
-import java.util.List;
 
 /**
  * A controller that manages event for preference.
@@ -39,17 +38,6 @@ public abstract class AbstractPreferenceController {
 
   }
 
-  /**
-   * Updates non-indexable keys for search provider.
-   *
-   * Called by SearchIndexProvider#getNonIndexableKeys
-   */
-  public void updateNonIndexableKeys(List<String> keys) {
-      if (!isAvailable()) {
-          keys.add(getPreferenceKey());
-      }
-  }
-
   /**
    * Returns true if preference is available (should be displayed)
    */