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

Merge "Remove gear from usb preference" into pi-dev am: 631ee514ae

Browse Source 
am: ba04287724

Change-Id: Ic0b801330f581e23a93fa81c1a2b18aa2238c07c
This commit is contained in:
Jerry Zhang
2018-04-09 12:54:19 -07:00
committed by android-build-merger
parent c7e36d940d ba04287724
commit dd3db23f18
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/usb_details_fragment.xml
View File

@@ -36,4 +36,9 @@
<PreferenceCategory
android:key="usb_details_power_role"/>
<!-- Empty category for spacing -->
<PreferenceCategory
android:key="usb_details_space"
settings:allowDividerAbove="false"/>
</PreferenceScreen>

10
src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
View File

@@ -19,12 +19,12 @@ import android.content.Context;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.GearPreference;
/**
* Controller to maintain connected usb device
@@ -34,7 +34,7 @@ public class ConnectedUsbDeviceUpdater {
private UsbBackend mUsbBackend;
private DevicePreferenceCallback mDevicePreferenceCallback;
@VisibleForTesting
GearPreference mUsbPreference;
Preference mUsbPreference;
@VisibleForTesting
UsbConnectionBroadcastReceiver mUsbReceiver;
@@ -75,17 +75,17 @@ public class ConnectedUsbDeviceUpdater {
}
public void initUsbPreference(Context context) {
mUsbPreference = new GearPreference(context, null /* AttributeSet */);
mUsbPreference = new Preference(context, null /* AttributeSet */);
mUsbPreference.setTitle(R.string.usb_pref);
mUsbPreference.setIcon(R.drawable.ic_usb);
mUsbPreference.setSelectable(false);
mUsbPreference.setOnGearClickListener((GearPreference p) -> {
mUsbPreference.setOnPreferenceClickListener((Preference p) -> {
// New version - uses a separate screen.
new SubSettingLauncher(mFragment.getContext())
.setDestination(UsbDetailsFragment.class.getName())
.setTitle(R.string.device_details_title)
.setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch();
return true;
});
forceUpdate();

2
tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
View File

@@ -70,7 +70,7 @@ public class ConnectedUsbDeviceUpdaterTest {
assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
assertThat(mDeviceUpdater.mUsbPreference.getIcon())
.isEqualTo(mContext.getDrawable(R.drawable.ic_usb));
assertThat(mDeviceUpdater.mUsbPreference.isSelectable()).isFalse();
assertThat(mDeviceUpdater.mUsbPreference.isSelectable()).isTrue();
}
@Test