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

Commit 9b6f1813 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove no-op handlePerferenceTreeClick from PrefControllers 

Bug: 33429853
Test: RunSettingsRoboTests
Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686
parent 2425a528

src/com/android/settings/accounts/AccountPreferenceController.java

+0 −5
Original line number Diff line number Diff line
@@ -146,11 +146,6 @@ public class AccountPreferenceController extends PreferenceController 
        return !mUm.isManagedProfile();

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    @Override

    public String getPreferenceKey() {

        return null;

src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java

+0 −5
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ public class AddUserWhenLockedPreferenceController extends PreferenceController 
        }

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    @Override

    public boolean isAvailable() {

        return mUserCaps.isAdmin() &&

src/com/android/settings/connecteddevice/UsbModePreferenceController.java

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ public class UsbModePreferenceController extends PreferenceController 
        updataSummary(preference);

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    @Override

    public boolean isAvailable() {

        return true;

src/com/android/settings/core/PreferenceController.java

+5 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.core; 
import android.content.Context;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.search.SearchIndexableRaw;



import java.util.List;
@@ -27,7 +28,7 @@ import java.util.List; 
 */

public abstract class PreferenceController {



    protected Context mContext;

    protected final Context mContext;



    public PreferenceController(Context context) {

        mContext = context;
@@ -85,7 +86,9 @@ public abstract class PreferenceController { 
     * @param preference the preference being clicked

     * @return true if click is handled

     */

    public abstract boolean handlePreferenceTreeClick(Preference preference);

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    /**

     * Returns the key for this preference.

src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java

+0 −5
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ class DashboardTilePlaceholderPreferenceController extends PreferenceController 
        return false;

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        return false;

    }



    @Override

    public String getPreferenceKey() {

        return KEY_PLACEHOLDER;