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

Commit 8040f4c5 authored by Arc Wang's avatar Arc Wang
Browse files

Revert "Add divider line in Preference for scan QR code button and share hotspot button" 

This reverts commit 890f3a43.

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

Change-Id: Icdbb1d2b5319636b8c4c54bcdc0fc3562585a15a
parent 890f3a43

res/layout/preference.xml

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

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

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

        }

    }

src/com/android/settings/wifi/tether/WifiTetherSsidPreference.java

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

        }

    }