Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev am: 6fe60521d1

Change-Id: I9527c519a2daa31ae79a0c3d3ea6f5ccbbca492b
This commit is contained in:
Blake Kragten
2020-04-30 03:46:56 +00:00
committed by Automerger Merge Worker
3 changed files with 36 additions and 1 deletions

View File

@@ -23,6 +23,7 @@ import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
@@ -70,6 +71,11 @@ public class EnhancedConnectivityPreferenceController extends
enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
}
@Override
public boolean isAvailable() {
return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();