diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 2a8eaf6b74e..06d8c2d22d5 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -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; diff --git a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java index 898d4a272d9..10e36100990 100644 --- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java @@ -70,11 +70,6 @@ public class AddUserWhenLockedPreferenceController extends PreferenceController } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return mUserCaps.isAdmin() && diff --git a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java index f782e9e60f7..5f700bd1b21 100644 --- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java +++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java @@ -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; diff --git a/src/com/android/settings/core/PreferenceController.java b/src/com/android/settings/core/PreferenceController.java index 93ffe36aab3..8f551dec98b 100644 --- a/src/com/android/settings/core/PreferenceController.java +++ b/src/com/android/settings/core/PreferenceController.java @@ -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. diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index 6b0018c24fe..eb99fb35934 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -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; diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index a372a49c2f4..fdeef296afd 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -40,11 +40,6 @@ public class AutoTimePreferenceController extends PreferenceController return true; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { if (!(preference instanceof RestrictedSwitchPreference)) { diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index 760b2a00253..c70289b8c13 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -44,11 +44,6 @@ public class AutoTimeZonePreferenceController extends PreferenceController return !(Utils.isWifiOnly(mContext) || mIsFromSUW); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_AUTO_TIME_ZONE; diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 57c1bc7e304..f0b604e4d5a 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -48,11 +48,6 @@ public class TimeZonePreferenceController extends PreferenceController { return true; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_TIMEZONE; diff --git a/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java b/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java index 3435b53d06d..8d35ecafaef 100644 --- a/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java +++ b/src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java @@ -28,11 +28,6 @@ public class AdditionalSystemUpdatePreferenceController extends PreferenceContro super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return mContext.getResources().getBoolean( diff --git a/src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java b/src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java index e64525bef35..f4dd14ea928 100644 --- a/src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java @@ -34,11 +34,6 @@ public class ManageStoragePreferenceController extends PreferenceController { return KEY_MANAGE_STORAGE; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled); diff --git a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java index 1029e203574..0362bbc8161 100644 --- a/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/SerialNumberPreferenceController.java @@ -55,11 +55,6 @@ public class SerialNumberPreferenceController extends PreferenceController { } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_SERIAL_NUMBER; diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index df2000ef417..1d644a441de 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -45,11 +45,6 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp return KEY_AUTO_BRIGHTNESS; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { int brightnessMode = Settings.System.getInt(mContext.getContentResolver(), diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index ee940a34186..11c933371aa 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -67,11 +67,6 @@ public class AutoRotatePreferenceController extends PreferenceController impleme 1 : 0); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return RotationPolicy.isRotationLockToggleVisible(mContext); diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index a3dc6cf0917..1b60721cb97 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -37,11 +37,6 @@ public class CameraGesturePreferenceController extends PreferenceController impl return KEY_CAMERA_GESTURE; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { int value = Settings.Secure.getInt(mContext.getContentResolver(), diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java index 5014bda6100..7528f18849f 100644 --- a/src/com/android/settings/display/FontSizePreferenceController.java +++ b/src/com/android/settings/display/FontSizePreferenceController.java @@ -51,9 +51,4 @@ public class FontSizePreferenceController extends PreferenceController { strEntryValues); preference.setSummary(entries[index]); } - - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } } diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index 81ba5f5a4ac..e8be936af3a 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -44,11 +44,6 @@ public class LiftToWakePreferenceController extends PreferenceController impleme return KEY_LIFT_TO_WAKE; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean onPreferenceChange(Preference preference, Object newValue) { boolean value = (Boolean) newValue; diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index 9cf240959dd..4b187788339 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -27,11 +27,6 @@ public class NightDisplayPreferenceController extends PreferenceController { super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return NightDisplayController.isAvailable(mContext); diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 874d84f1d3e..2eb64c09ef0 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -61,11 +61,6 @@ public class NightModePreferenceController extends PreferenceController } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean onPreferenceChange(Preference preference, Object newValue) { try { diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index 7335b1ffd26..fab9062bd73 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -38,11 +38,6 @@ public class ScreenSaverPreferenceController extends PreferenceController { return KEY_SCREEN_SAVER; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext)); diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index 18c877ae5d0..1f24d74f372 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -40,11 +40,6 @@ public class TapToWakePreferenceController extends PreferenceController implemen com.android.internal.R.bool.config_supportDoubleTapWake); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { int value = Settings.Secure.getInt( diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index d33f81374e8..d4096568d26 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -51,11 +51,6 @@ public class TimeoutPreferenceController extends PreferenceController implements return KEY_SCREEN_TIMEOUT; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference; diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 61c3ed29066..0eb1c88cd88 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -74,9 +74,4 @@ public class VrDisplayPreferenceController extends PreferenceController implemen } return true; } - - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } } diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 8352377fd69..aa29afcfbef 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -46,11 +46,6 @@ public class WallpaperPreferenceController extends PreferenceController { disablePreferenceIfManaged((RestrictedPreference) preference); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - private void disablePreferenceIfManaged(RestrictedPreference pref) { final String restriction = DISALLOW_SET_WALLPAPER; if (pref != null) { diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 67b1d13e429..99ff62e2af4 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -50,9 +50,4 @@ public abstract class AdminActionPreferenceControllerBase extends PreferenceCont public boolean isAvailable() { return true; } - - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } } diff --git a/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java index df1c6c4659c..a7afac0227a 100644 --- a/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/InstalledPackagesPreferenceController.java @@ -50,11 +50,6 @@ public class InstalledPackagesPreferenceController extends PreferenceController return true; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_NUMBER_INSTALLED_PACKAGES; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index 345f7b7cac6..ebfccb5a842 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -64,11 +64,6 @@ public abstract class GesturePreferenceController extends PreferenceController } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void onStop() { if (mVideoPreference != null) { diff --git a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java index 01af974f225..08dc614f2c6 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java @@ -31,11 +31,6 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo super(context, lifecycle); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return PREF_KEY_SWIPE_DOWN_FINGERPRINT; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index 17d3fdcd45a..8fcaa74043f 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -51,11 +51,6 @@ public class SpellCheckerPreferenceController extends PreferenceController { return true; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_SPELL_CHECKERS; diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index 2b87fd958dc..cd2f5390341 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -35,11 +35,6 @@ public class PhoneLanguagePreferenceController extends PreferenceController { return mContext.getAssets().getLocales().length > 1; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void updateState(Preference preference) { if (preference == null) { diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index ffc1eb1af9e..9b40b6d05bc 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -48,11 +48,6 @@ public class TtsPreferenceController extends PreferenceController { } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_TTS_SETTINGS; diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index d26761b8a20..01ce3aa2c3c 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -43,11 +43,6 @@ public class UserDictionaryPreferenceController extends PreferenceController { return localeSet != null; } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_USER_DICTIONARY_SETTINGS; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index 588d80caa80..7c8cd405459 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -39,11 +39,6 @@ public class MobileNetworkPreferenceController extends PreferenceController { mIsSecondaryUser = !mUserManager.isAdminUser(); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return !mIsSecondaryUser diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java index 2842139dd1d..e357fbe2456 100644 --- a/src/com/android/settings/network/NetworkResetPreferenceController.java +++ b/src/com/android/settings/network/NetworkResetPreferenceController.java @@ -31,11 +31,6 @@ public class NetworkResetPreferenceController extends PreferenceController { super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return !RestrictedLockUtils.hasBaseUserRestriction(mContext, diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index 54b8ca948e3..edec2474433 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -30,11 +30,6 @@ public class ProxyPreferenceController extends PreferenceController { super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { // proxy UI disabled until we have better app support diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index f6ef6784f65..e24c873b10b 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -48,11 +48,6 @@ public class TetherPreferenceController extends PreferenceController { mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index 146b4000de4..f7e230ffd05 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -40,11 +40,6 @@ public class VpnPreferenceController extends PreferenceController { mIsSecondaryUser = !UserManager.get(context).isAdminUser(); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/src/com/android/settings/network/WifiCallingPreferenceController.java b/src/com/android/settings/network/WifiCallingPreferenceController.java index 5036c461210..b35d4764a64 100644 --- a/src/com/android/settings/network/WifiCallingPreferenceController.java +++ b/src/com/android/settings/network/WifiCallingPreferenceController.java @@ -34,11 +34,6 @@ public class WifiCallingPreferenceController extends PreferenceController { mTm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 6303d5b3b5f..65c2d4c524f 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -95,11 +95,6 @@ public class NfcPreferenceController extends PreferenceController } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public boolean isAvailable() { return mNfcAdapter != null; diff --git a/src/com/android/settings/notification/CastPreferenceController.java b/src/com/android/settings/notification/CastPreferenceController.java index 2ec78213ff8..7de5c4873a3 100644 --- a/src/com/android/settings/notification/CastPreferenceController.java +++ b/src/com/android/settings/notification/CastPreferenceController.java @@ -31,11 +31,6 @@ public class CastPreferenceController extends PreferenceController { super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_WIFI_DISPLAY; diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 15f8c9f1011..a7ebbe13dc0 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -75,11 +75,6 @@ public class LockScreenNotificationPreferenceController extends PreferenceContro && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure)); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public void displayPreference(PreferenceScreen screen) { super.displayPreference(screen); diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index de365f13b75..3e37ab0fc0f 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -68,11 +68,6 @@ public class PulseNotificationPreferenceController extends PreferenceController } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_NOTIFICATION_PULSE; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index adc86b89da0..eeb9c282bb6 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.notification; import android.content.Context; - -import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.core.lifecycle.Lifecycle; @@ -31,13 +29,13 @@ import com.android.settings.notification.VolumeSeekBarPreference.Callback; * Base class for preference controller that handles VolumeSeekBarPreference */ public abstract class VolumeSeekBarPreferenceController extends - AdjustVolumeRestrictedPreferenceController implements LifecycleObserver, OnResume, OnPause { + AdjustVolumeRestrictedPreferenceController implements LifecycleObserver, OnResume, OnPause { protected VolumeSeekBarPreference mPreference; protected VolumeSeekBarPreference.Callback mVolumePreferenceCallback; public VolumeSeekBarPreferenceController(Context context, Callback callback, - Lifecycle lifecycle) { + Lifecycle lifecycle) { super(context); mVolumePreferenceCallback = callback; if (lifecycle != null) { @@ -70,11 +68,6 @@ public abstract class VolumeSeekBarPreferenceController extends } } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - protected abstract int getAudioStream(); protected abstract int getMuteIcon(); diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java index e554732e6b1..61bbe9aa3d3 100644 --- a/src/com/android/settings/notification/ZenModePreferenceController.java +++ b/src/com/android/settings/notification/ZenModePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; -import android.support.v7.preference.Preference; public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenceController { @@ -27,11 +26,6 @@ public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenc super(context); } - @Override - public boolean handlePreferenceTreeClick(Preference preference) { - return false; - } - @Override public String getPreferenceKey() { return KEY_ZEN_MODE;