Remove no-op handlePerferenceTreeClick from PrefControllers

Bug: 33429853
Test: RunSettingsRoboTests
Change-Id: I5633953e3d7b07f9006e541b96a24a2a769e2686
This commit is contained in:
Fan Zhang
2016-12-07 15:34:31 -08:00
parent 2425a528ad
commit 9b6f181340
43 changed files with 7 additions and 217 deletions

View File

@@ -146,11 +146,6 @@ public class AccountPreferenceController extends PreferenceController
return !mUm.isManagedProfile(); return !mUm.isManagedProfile();
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return null; return null;

View File

@@ -70,11 +70,6 @@ public class AddUserWhenLockedPreferenceController extends PreferenceController
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return mUserCaps.isAdmin() && return mUserCaps.isAdmin() &&

View File

@@ -57,11 +57,6 @@ public class UsbModePreferenceController extends PreferenceController
updataSummary(preference); updataSummary(preference);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return true; return true;

View File

@@ -18,6 +18,7 @@ package com.android.settings.core;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import com.android.settings.search.SearchIndexableRaw; import com.android.settings.search.SearchIndexableRaw;
import java.util.List; import java.util.List;
@@ -27,7 +28,7 @@ import java.util.List;
*/ */
public abstract class PreferenceController { public abstract class PreferenceController {
protected Context mContext; protected final Context mContext;
public PreferenceController(Context context) { public PreferenceController(Context context) {
mContext = context; mContext = context;
@@ -85,7 +86,9 @@ public abstract class PreferenceController {
* @param preference the preference being clicked * @param preference the preference being clicked
* @return true if click is handled * @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. * Returns the key for this preference.

View File

@@ -52,11 +52,6 @@ class DashboardTilePlaceholderPreferenceController extends PreferenceController
return false; return false;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_PLACEHOLDER; return KEY_PLACEHOLDER;

View File

@@ -40,11 +40,6 @@ public class AutoTimePreferenceController extends PreferenceController
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
if (!(preference instanceof RestrictedSwitchPreference)) { if (!(preference instanceof RestrictedSwitchPreference)) {

View File

@@ -44,11 +44,6 @@ public class AutoTimeZonePreferenceController extends PreferenceController
return !(Utils.isWifiOnly(mContext) || mIsFromSUW); return !(Utils.isWifiOnly(mContext) || mIsFromSUW);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_AUTO_TIME_ZONE; return KEY_AUTO_TIME_ZONE;

View File

@@ -48,11 +48,6 @@ public class TimeZonePreferenceController extends PreferenceController {
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_TIMEZONE; return KEY_TIMEZONE;

View File

@@ -28,11 +28,6 @@ public class AdditionalSystemUpdatePreferenceController extends PreferenceContro
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return mContext.getResources().getBoolean( return mContext.getResources().getBoolean(

View File

@@ -34,11 +34,6 @@ public class ManageStoragePreferenceController extends PreferenceController {
return KEY_MANAGE_STORAGE; return KEY_MANAGE_STORAGE;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled); return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled);

View File

@@ -55,11 +55,6 @@ public class SerialNumberPreferenceController extends PreferenceController {
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_SERIAL_NUMBER; return KEY_SERIAL_NUMBER;

View File

@@ -45,11 +45,6 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
return KEY_AUTO_BRIGHTNESS; return KEY_AUTO_BRIGHTNESS;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
int brightnessMode = Settings.System.getInt(mContext.getContentResolver(), int brightnessMode = Settings.System.getInt(mContext.getContentResolver(),

View File

@@ -67,11 +67,6 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
1 : 0); 1 : 0);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return RotationPolicy.isRotationLockToggleVisible(mContext); return RotationPolicy.isRotationLockToggleVisible(mContext);

View File

@@ -37,11 +37,6 @@ public class CameraGesturePreferenceController extends PreferenceController impl
return KEY_CAMERA_GESTURE; return KEY_CAMERA_GESTURE;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
int value = Settings.Secure.getInt(mContext.getContentResolver(), int value = Settings.Secure.getInt(mContext.getContentResolver(),

View File

@@ -51,9 +51,4 @@ public class FontSizePreferenceController extends PreferenceController {
strEntryValues); strEntryValues);
preference.setSummary(entries[index]); preference.setSummary(entries[index]);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
} }

View File

@@ -44,11 +44,6 @@ public class LiftToWakePreferenceController extends PreferenceController impleme
return KEY_LIFT_TO_WAKE; return KEY_LIFT_TO_WAKE;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean value = (Boolean) newValue; boolean value = (Boolean) newValue;

View File

@@ -27,11 +27,6 @@ public class NightDisplayPreferenceController extends PreferenceController {
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return NightDisplayController.isAvailable(mContext); return NightDisplayController.isAvailable(mContext);

View File

@@ -61,11 +61,6 @@ public class NightModePreferenceController extends PreferenceController
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
try { try {

View File

@@ -38,11 +38,6 @@ public class ScreenSaverPreferenceController extends PreferenceController {
return KEY_SCREEN_SAVER; return KEY_SCREEN_SAVER;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext)); preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext));

View File

@@ -40,11 +40,6 @@ public class TapToWakePreferenceController extends PreferenceController implemen
com.android.internal.R.bool.config_supportDoubleTapWake); com.android.internal.R.bool.config_supportDoubleTapWake);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
int value = Settings.Secure.getInt( int value = Settings.Secure.getInt(

View File

@@ -51,11 +51,6 @@ public class TimeoutPreferenceController extends PreferenceController implements
return KEY_SCREEN_TIMEOUT; return KEY_SCREEN_TIMEOUT;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference; final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference;

View File

@@ -74,9 +74,4 @@ public class VrDisplayPreferenceController extends PreferenceController implemen
} }
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
} }

View File

@@ -46,11 +46,6 @@ public class WallpaperPreferenceController extends PreferenceController {
disablePreferenceIfManaged((RestrictedPreference) preference); disablePreferenceIfManaged((RestrictedPreference) preference);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
private void disablePreferenceIfManaged(RestrictedPreference pref) { private void disablePreferenceIfManaged(RestrictedPreference pref) {
final String restriction = DISALLOW_SET_WALLPAPER; final String restriction = DISALLOW_SET_WALLPAPER;
if (pref != null) { if (pref != null) {

View File

@@ -50,9 +50,4 @@ public abstract class AdminActionPreferenceControllerBase extends PreferenceCont
public boolean isAvailable() { public boolean isAvailable() {
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
} }

View File

@@ -50,11 +50,6 @@ public class InstalledPackagesPreferenceController extends PreferenceController
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_NUMBER_INSTALLED_PACKAGES; return KEY_NUMBER_INSTALLED_PACKAGES;

View File

@@ -64,11 +64,6 @@ public abstract class GesturePreferenceController extends PreferenceController
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void onStop() { public void onStop() {
if (mVideoPreference != null) { if (mVideoPreference != null) {

View File

@@ -31,11 +31,6 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
super(context, lifecycle); super(context, lifecycle);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return PREF_KEY_SWIPE_DOWN_FINGERPRINT; return PREF_KEY_SWIPE_DOWN_FINGERPRINT;

View File

@@ -51,11 +51,6 @@ public class SpellCheckerPreferenceController extends PreferenceController {
return true; return true;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_SPELL_CHECKERS; return KEY_SPELL_CHECKERS;

View File

@@ -35,11 +35,6 @@ public class PhoneLanguagePreferenceController extends PreferenceController {
return mContext.getAssets().getLocales().length > 1; return mContext.getAssets().getLocales().length > 1;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
if (preference == null) { if (preference == null) {

View File

@@ -48,11 +48,6 @@ public class TtsPreferenceController extends PreferenceController {
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_TTS_SETTINGS; return KEY_TTS_SETTINGS;

View File

@@ -43,11 +43,6 @@ public class UserDictionaryPreferenceController extends PreferenceController {
return localeSet != null; return localeSet != null;
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_USER_DICTIONARY_SETTINGS; return KEY_USER_DICTIONARY_SETTINGS;

View File

@@ -39,11 +39,6 @@ public class MobileNetworkPreferenceController extends PreferenceController {
mIsSecondaryUser = !mUserManager.isAdminUser(); mIsSecondaryUser = !mUserManager.isAdminUser();
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return !mIsSecondaryUser return !mIsSecondaryUser

View File

@@ -31,11 +31,6 @@ public class NetworkResetPreferenceController extends PreferenceController {
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return !RestrictedLockUtils.hasBaseUserRestriction(mContext, return !RestrictedLockUtils.hasBaseUserRestriction(mContext,

View File

@@ -30,11 +30,6 @@ public class ProxyPreferenceController extends PreferenceController {
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
// proxy UI disabled until we have better app support // proxy UI disabled until we have better app support

View File

@@ -48,11 +48,6 @@ public class TetherPreferenceController extends PreferenceController {
mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE); mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);

View File

@@ -40,11 +40,6 @@ public class VpnPreferenceController extends PreferenceController {
mIsSecondaryUser = !UserManager.get(context).isAdminUser(); mIsSecondaryUser = !UserManager.get(context).isAdminUser();
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);

View File

@@ -34,11 +34,6 @@ public class WifiCallingPreferenceController extends PreferenceController {
mTm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); mTm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);

View File

@@ -95,11 +95,6 @@ public class NfcPreferenceController extends PreferenceController
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return mNfcAdapter != null; return mNfcAdapter != null;

View File

@@ -31,11 +31,6 @@ public class CastPreferenceController extends PreferenceController {
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_WIFI_DISPLAY; return KEY_WIFI_DISPLAY;

View File

@@ -75,11 +75,6 @@ public class LockScreenNotificationPreferenceController extends PreferenceContro
&& (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure)); && (utils.isSecure(mProfileChallengeUserId) || (isUnified && mSecure));
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public void displayPreference(PreferenceScreen screen) { public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen); super.displayPreference(screen);

View File

@@ -68,11 +68,6 @@ public class PulseNotificationPreferenceController extends PreferenceController
} }
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_NOTIFICATION_PULSE; return KEY_NOTIFICATION_PULSE;

View File

@@ -17,8 +17,6 @@
package com.android.settings.notification; package com.android.settings.notification;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.lifecycle.Lifecycle; 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 getAudioStream();
protected abstract int getMuteIcon(); protected abstract int getMuteIcon();

View File

@@ -17,7 +17,6 @@
package com.android.settings.notification; package com.android.settings.notification;
import android.content.Context; import android.content.Context;
import android.support.v7.preference.Preference;
public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenceController { public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenceController {
@@ -27,11 +26,6 @@ public class ZenModePreferenceController extends AdjustVolumeRestrictedPreferenc
super(context); super(context);
} }
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
return false;
}
@Override @Override
public String getPreferenceKey() { public String getPreferenceKey() {
return KEY_ZEN_MODE; return KEY_ZEN_MODE;