Remove no-op handlePerferenceTreeClick from PrefControllers
Bug: 33429853 Test: RunSettingsRoboTests Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686
This commit is contained in:
@@ -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;
|
||||
|
@@ -70,11 +70,6 @@ public class AddUserWhenLockedPreferenceController extends PreferenceController
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mUserCaps.isAdmin() &&
|
||||
|
@@ -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;
|
||||
|
@@ -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.
|
||||
|
@@ -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;
|
||||
|
@@ -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)) {
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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(
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
|
@@ -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(),
|
||||
|
@@ -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);
|
||||
|
@@ -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(),
|
||||
|
@@ -51,9 +51,4 @@ public class FontSizePreferenceController extends PreferenceController {
|
||||
strEntryValues);
|
||||
preference.setSummary(entries[index]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
@@ -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 {
|
||||
|
@@ -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));
|
||||
|
@@ -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(
|
||||
|
@@ -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;
|
||||
|
@@ -74,9 +74,4 @@ public class VrDisplayPreferenceController extends PreferenceController implemen
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -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) {
|
||||
|
@@ -50,9 +50,4 @@ public abstract class AdminActionPreferenceControllerBase extends PreferenceCont
|
||||
public boolean isAvailable() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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) {
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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) {
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -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
|
||||
|
@@ -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,
|
||||
|
@@ -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
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -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);
|
||||
|
@@ -95,11 +95,6 @@ public class NfcPreferenceController extends PreferenceController
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handlePreferenceTreeClick(Preference preference) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
return mNfcAdapter != null;
|
||||
|
@@ -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;
|
||||
|
@@ -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);
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
@@ -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();
|
||||
|
@@ -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;
|
||||
|
Reference in New Issue
Block a user