PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I538ba9a0d1b62eb720621de79b1b515bdf02c25f
This commit is contained in:
Blake Kragten
2020-04-30 03:54:45 +00:00
committed by Automerger Merge Worker
parent 071beb9544 ba264a325f
commit a6c32c6a41
3 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
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();