From 07a4c25fc1a59b8445bb9f6a55c2d1f5adb98616 Mon Sep 17 00:00:00 2001
From: Jerry Zhang <zhangjerry@google.com>
Date: Fri, 6 Apr 2018 12:06:49 -0700
Subject: [PATCH] Remove gear from usb preference

Switch from GearPreference to a normal
Preference.

Add some spacing underneath the power role.

Bug: 77647931
Test: passes
Change-Id: Ic15849e12aa47df75cc75c9da0384e24627a9c8b
---
 res/xml/usb_details_fragment.xml                       |  5 +++++
 .../connecteddevice/usb/ConnectedUsbDeviceUpdater.java | 10 +++++-----
 .../usb/ConnectedUsbDeviceUpdaterTest.java             |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/res/xml/usb_details_fragment.xml b/res/xml/usb_details_fragment.xml
index 5c1efcf19b5..4efad6dc6fd 100644
--- a/res/xml/usb_details_fragment.xml
+++ b/res/xml/usb_details_fragment.xml
@@ -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>
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index b570204fba4..098cdb46ea7 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -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();
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
index 928e1c68094..ad04e7e52ab 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
@@ -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