Remove unnecessary onDeveloperOptionsSwitchEnabled/Disabled override.
- default implementation has been added in the super class to handle enabling/disabling the preference when the master developer options switch it turned on/off. Removing all subclass that originally implemented the methods that only contains the default behavior. Bug: 73955632 Test: make RunSettingsRoboTests Change-Id: I13c372c2ab498a5786b40cdc1ad3b5f3424abb5a
This commit is contained in:
@@ -20,7 +20,6 @@ import android.content.Context;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
@@ -31,8 +30,8 @@ import com.android.settingslib.applications.DefaultAppInfo;
|
||||
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
|
||||
import com.android.settingslib.wrapper.PackageManagerWrapper;
|
||||
|
||||
public class WebViewAppPreferenceController extends
|
||||
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
|
||||
public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements
|
||||
PreferenceControllerMixin {
|
||||
|
||||
private static final String TAG = "WebViewAppPrefCtrl";
|
||||
private static final String WEBVIEW_APP_KEY = "select_webview_provider";
|
||||
@@ -40,8 +39,6 @@ public class WebViewAppPreferenceController extends
|
||||
private final PackageManagerWrapper mPackageManager;
|
||||
private final WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
|
||||
|
||||
private Preference mPreference;
|
||||
|
||||
public WebViewAppPreferenceController(Context context) {
|
||||
super(context);
|
||||
|
||||
@@ -54,13 +51,6 @@ public class WebViewAppPreferenceController extends
|
||||
return WEBVIEW_APP_KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
|
||||
mPreference = screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateState(Preference preference) {
|
||||
final CharSequence defaultAppLabel = getDefaultAppLabel();
|
||||
@@ -72,16 +62,6 @@ public class WebViewAppPreferenceController extends
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDeveloperOptionsSwitchEnabled() {
|
||||
mPreference.setEnabled(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onDeveloperOptionsSwitchDisabled() {
|
||||
mPreference.setEnabled(false);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
DefaultAppInfo getDefaultAppInfo() {
|
||||
final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
|
||||
|
Reference in New Issue
Block a user