From 8040f4c59f5f1dbc5dc5182b33ce1cdc6b2388ab Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Fri, 22 Mar 2019 05:36:59 +0000
Subject: [PATCH] Revert "Add divider line in Preference for scan QR code
 button and share hotspot button"

This reverts commit 890f3a4340b2cbbe1e82337005383f7a33ddd948.

Reason for revert: I find a UI defect in this fix.

Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
---
 res/layout/preference.xml                                  | 4 ----
 .../android/settings/wifi/AddWifiNetworkPreference.java    | 5 +++++
 .../settings/wifi/tether/WifiTetherSsidPreference.java     | 7 -------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index db9613935f3..195671b5655 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -54,10 +54,6 @@
 
     </RelativeLayout>
 
-    <include
-        layout="@layout/preference_two_target_divider"
-        android:visibility="gone"/>
-
     <LinearLayout
         android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
diff --git a/src/com/android/settings/wifi/AddWifiNetworkPreference.java b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
index e49f2ab2db2..cd2e4a8182a 100644
--- a/src/com/android/settings/wifi/AddWifiNetworkPreference.java
+++ b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
+import android.view.View;
 import android.widget.ImageButton;
 
 import androidx.annotation.DrawableRes;
@@ -62,6 +63,10 @@ public class AddWifiNetworkPreference extends Preference {
                 getContext().startActivity(
                     WifiDppUtils.getEnrolleeQrCodeScannerIntent(/* ssid */ null));
             });
+
+            final View divider = (View) holder.findViewById(
+                    com.android.settingslib.R.id.two_target_divider);
+            divider.setVisibility(View.INVISIBLE);
         }
     }
 
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
index e2566d02502..64014d90325 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java
@@ -39,7 +39,6 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
 
     private ImageButton mImageButton;
     private Drawable mButtonIcon;
-    private View mDivider;
     private View.OnClickListener mClickListener;
     private boolean mVisible;
 
@@ -69,8 +68,6 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
     }
 
     private void initialize() {
-        // TODO(b/129019971): use methods of divider line in parent object
-        setLayoutResource(R.layout.preference);
         setWidgetLayoutResource(R.layout.wifi_button_preference_widget);
     }
 
@@ -85,17 +82,13 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference {
                     getContext().getString(R.string.wifi_dpp_share_hotspot));
             setButtonIcon(R.drawable.ic_qrcode_24dp);
             mImageButton.setImageDrawable(mButtonIcon);
-
-            mDivider = holder.findViewById(R.id.two_target_divider);
         }
 
         if (mVisible) {
             mImageButton.setOnClickListener(mClickListener);
             mImageButton.setVisibility(View.VISIBLE);
-            mDivider.setVisibility(View.VISIBLE);
         } else {
             mImageButton.setVisibility(View.GONE);
-            mDivider.setVisibility(View.GONE);
         }
     }