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

Commit 7b40a559 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev 

* changes:
  [automerge] Change default USB configuration to a RestrictedPreference 2p: bc4fd99d
  Change default USB configuration to a RestrictedPreference
parents 92245b8f 15d0cfed

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