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

Commit dce9f79a authored by jackqdyulei's avatar jackqdyulei
Browse files

Refactor AccessPointPreference 

Make it extend from TwoTargetPreference because AccessPointPreference
do have the second target in the right part(secure icon).

Following cl will create ConnectedAccessPointPreference and make it
extend from AccessPointPreference, so we could reuse bunch of methods.

Bug: 68807544
Test: Existing tests pass.
Change-Id: Ie902366a4d0dbbe910957eb3658ea8fe7ad9c5da
parent d23881e2

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPointPreference.java

+17 −2
Original line number Diff line number Diff line
@@ -31,15 +31,17 @@ import android.support.v7.preference.PreferenceViewHolder; 
import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.SparseArray;

import android.view.View;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.settingslib.R;

import com.android.settingslib.TronUtils;

import com.android.settingslib.TwoTargetPreference;

import com.android.settingslib.Utils;

import com.android.settingslib.wifi.AccessPoint.Speed;



public class AccessPointPreference extends Preference {

public class AccessPointPreference extends TwoTargetPreference {



    private static final int[] STATE_SECURED = {

            R.attr.state_encrypted
@@ -126,7 +128,6 @@ public class AccessPointPreference extends Preference { 
                          int iconResId, boolean forSavedNetworks, StateListDrawable frictionSld,

                          int level, IconInjector iconInjector) {

        super(context);

        setWidgetLayoutResource(R.layout.access_point_friction_widget);

        mBadgeCache = cache;

        mAccessPoint = accessPoint;

        mForSavedNetworks = forSavedNetworks;
@@ -165,6 +166,20 @@ public class AccessPointPreference extends Preference { 


        ImageView frictionImageView = (ImageView) view.findViewById(R.id.friction_icon);

        bindFrictionImage(frictionImageView);

        setDividerVisibility(view, View.GONE);

    }



    protected void setDividerVisibility(final PreferenceViewHolder view,

            @View.Visibility int visibility) {

        final View divider = view.findViewById(R.id.two_target_divider);

        if (divider != null) {

            divider.setVisibility(visibility);

        }

    }



    @Override

    protected int getSecondTargetResId() {

        return R.layout.access_point_friction_widget;

    }



    protected void updateIcon(int level, Context context) {