Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc4fd99d authored by Alex Johnston's avatar Alex Johnston
Browse files

Change default USB configuration to a RestrictedPreference 

Test: manual with TestDPC and Settings
      DefaultUsbConfigurationPreferenceControllerTest
Bug: 201519976
     205996517
Change-Id: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
Merged-In: I1def7b37184d6d81f29a5e6e4793b92012dacd9b
parent 2ba7f572

res/xml/development_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ 
            android:title="@string/tethering_hardware_offload"

            android:summary="@string/tethering_hardware_offload_summary" />



        <com.android.settingslib.RestrictedSwitchPreference

        <com.android.settingslib.RestrictedPreference

            android:key="default_usb_configuration"

            android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"

            android:title="@string/usb_default_label"/>

src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.UserHandle; 
import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;



import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



public class DefaultUsbConfigurationPreferenceController extends
@@ -32,7 +32,7 @@ public class DefaultUsbConfigurationPreferenceController extends 


    private static final String PREFERENCE_KEY = "default_usb_configuration";



    private RestrictedSwitchPreference mPreference;

    private RestrictedPreference mPreference;



    public DefaultUsbConfigurationPreferenceController(Context context) {

        super(context);

tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.os.UserHandle; 
import androidx.preference.PreferenceScreen;



import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.RestrictedPreference;



import org.junit.Before;

import org.junit.Test;
@@ -48,7 +48,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest { 
    private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test");



    @Mock

    private RestrictedSwitchPreference mPreference;

    private RestrictedPreference mPreference;

    @Mock

    private PreferenceScreen mPreferenceScreen;

    @Mock