Remove the second target for ConnectedApPreference

Also create new gear layout since previous one has its own
ripple, which conflicts the normal preference ripple.

Fixes: 72528535
Fixes: 72442172
Test: Screenshot | RunSettingsRoboTests

Change-Id: I6a253574d0a5c971104c157584d66c3312764a26

src/com/android/settings/wifi/ConnectedAccessPointPreference.java

@@ -36,6 +36,7 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem
     public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
             UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks) {
         super(accessPoint, context, cache, iconResId, forSavedNetworks);
+        setWidgetLayoutResource(R.layout.preference_widget_gear_no_bg);
     }
 
     public void setOnGearClickListener(OnGearClickListener l) {
@@ -43,26 +44,6 @@ public class ConnectedAccessPointPreference extends AccessPointPreference implem
         notifyChanged();
     }
 
-    @Override
-    protected int getSecondTargetResId() {
-        return R.layout.preference_widget_gear;
-    }
-
-    @Override
-    protected boolean shouldHideSecondTarget() {
-        return mOnGearClickListener == null;
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        final View gear = holder.findViewById(R.id.settings_button);
-        if (gear != null) {
-            gear.setOnClickListener(this);
-        }
-        setDividerVisibility(holder, View.VISIBLE);
-    }
-
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.settings_button) {

src/com/android/settings/wifi/WifiSettings.java

@@ -884,13 +884,14 @@ public class WifiSettings extends RestrictedSettingsFragment
                 connectedAp);
 
         // Launch details page on click.
-        pref.setOnGearClickListener(l -> {
+        pref.setOnPreferenceClickListener(preference -> {
             pref.getAccessPoint().saveWifiState(pref.getExtras());
 
             SettingsActivity activity = (SettingsActivity) WifiSettings.this.getActivity();
             activity.startPreferencePanel(this,
                     WifiNetworkDetailsFragment.class.getName(), pref.getExtras(),
                     -1 /* resId */, pref.getTitle(), null, 0 /* resultRequestCode */);
+            return true;
         });
 
         pref.refresh();