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

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

Merge "Remove gear from usb preference" into pi-dev

parents 968dcaf4 07a4c25f

res/xml/usb_details_fragment.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java

+5 −5
Original line number Diff line number Diff line
@@ -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();

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

+1 −1
Original line number Diff line number Diff line
@@ -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