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

Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559bf am: 409ac95f00

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17118783

Change-Id: I2d17216bfbef1df5a06127d4c48f3f2d4e2bdfb0
This commit is contained in:
TreeHugger Robot
2022-03-09 18:31:37 +00:00
committed by Automerger Merge Worker
parent b60c038016 409ac95f00
commit f56cc90557
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/development_settings.xml
View File

@@ -293,7 +293,7 @@
android:title="@string/tethering_hardware_offload" android:title="@string/tethering_hardware_offload"
android:summary="@string/tethering_hardware_offload_summary" /> android:summary="@string/tethering_hardware_offload_summary" />
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedPreference
android:key="default_usb_configuration" android:key="default_usb_configuration"
android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment" android:fragment="com.android.settings.connecteddevice.usb.UsbDefaultFragment"
android:title="@string/usb_default_label"/> android:title="@string/usb_default_label"/>

4
src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java
View File

@@ -24,7 +24,7 @@ import android.os.UserHandle;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class DefaultUsbConfigurationPreferenceController extends public class DefaultUsbConfigurationPreferenceController extends
@@ -32,7 +32,7 @@ public class DefaultUsbConfigurationPreferenceController extends
private static final String PREFERENCE_KEY = "default_usb_configuration"; private static final String PREFERENCE_KEY = "default_usb_configuration";
private RestrictedSwitchPreference mPreference; private RestrictedPreference mPreference;
public DefaultUsbConfigurationPreferenceController(Context context) { public DefaultUsbConfigurationPreferenceController(Context context) {
super(context); super(context);

4
tests/robotests/src/com/android/settings/development/DefaultUsbConfigurationPreferenceControllerTest.java
View File

@@ -32,7 +32,7 @@ import android.os.UserHandle;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.RestrictedPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -48,7 +48,7 @@ public class DefaultUsbConfigurationPreferenceControllerTest {
private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test"); private static final ComponentName TEST_COMPONENT_NAME = new ComponentName("test", "test");
@Mock @Mock
private RestrictedSwitchPreference mPreference; private RestrictedPreference mPreference;
@Mock @Mock
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
@Mock @Mock