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

Commit 25595994 authored by Arc Wang's avatar Arc Wang
Browse files

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

Use com.android.settingslib.R.layout.preference_two_target in
WifiTetherSsidPreference to add divider line.

Bug: 128940862
Test: manual test
Change-Id: I46dabcee31a91b68b8c2e57c9840a59f8a1be304
parent c74577ea

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

+0 −5
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -63,10 +62,6 @@ 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

+7 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference { 


    private ImageButton mImageButton;

    private Drawable mButtonIcon;

    private View mDivider;

    private View.OnClickListener mClickListener;

    private boolean mVisible;
@@ -68,6 +69,8 @@ public class WifiTetherSsidPreference extends ValidatedEditTextPreference { 
    }



    private void initialize() {

        // TODO(b/129019971): use methods of divider line in parent object

        setLayoutResource(com.android.settingslib.R.layout.preference_two_target);

        setWidgetLayoutResource(R.layout.wifi_button_preference_widget);

    }
@@ -82,13 +85,17 @@ 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);

        }

    }