PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor InternetIconInjector to SettingsLib"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-22 09:22:30 +00:00
committed by Android (Google) Code Review
parent 2c40a6f19a 54b45141b5
commit e01b7a11f0
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -62,7 +62,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
// StateListDrawable to display secured lock / metered "$" icon // StateListDrawable to display secured lock / metered "$" icon
@Nullable private final StateListDrawable mFrictionSld; @Nullable private final StateListDrawable mFrictionSld;
private final IconInjector mIconInjector; private final WifiUtils.InternetIconInjector mIconInjector;
private WifiEntry mWifiEntry; private WifiEntry mWifiEntry;
private int mLevel = -1; private int mLevel = -1;
private boolean mShowX; // Shows the Wi-Fi signl icon of Pie+x when it's true. private boolean mShowX; // Shows the Wi-Fi signl icon of Pie+x when it's true.
@@ -70,12 +70,12 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
private OnButtonClickListener mOnButtonClickListener; private OnButtonClickListener mOnButtonClickListener;
public WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry) { public WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry) {
this(context, wifiEntry, new IconInjector(context)); this(context, wifiEntry, new WifiUtils.InternetIconInjector(context));
} }
@VisibleForTesting @VisibleForTesting
WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry, WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry,
@NonNull IconInjector iconInjector) { @NonNull WifiUtils.InternetIconInjector iconInjector) {
super(context); super(context);
setLayoutResource(R.layout.preference_access_point); setLayoutResource(R.layout.preference_access_point);
@@ -260,19 +260,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
: context.getString(R.string.accessibility_wifi_security_type_secured)); : context.getString(R.string.accessibility_wifi_security_type_secured));
} }
static class IconInjector {
private final Context mContext;
IconInjector(Context context) {
mContext = context;
}
public Drawable getIcon(boolean showX, int level) {
return mContext.getDrawable(WifiUtils.getInternetIconResource(level, showX));
}
}
/** /**
* Set listeners, who want to listen the button client event. * Set listeners, who want to listen the button client event.
*/ */

3
tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
View File

@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.wifi.WifiUtils;
import com.android.wifitrackerlib.WifiEntry; import com.android.wifitrackerlib.WifiEntry;
import org.junit.Before; import org.junit.Before;
@@ -49,7 +50,7 @@ public class WifiEntryPreferenceTest {
@Mock @Mock
private WifiEntry mMockWifiEntry; private WifiEntry mMockWifiEntry;
@Mock @Mock
private WifiEntryPreference.IconInjector mMockIconInjector; private WifiUtils.InternetIconInjector mMockIconInjector;
@Mock @Mock
private Drawable mMockDrawable0; private Drawable mMockDrawable0;