Remove sub-text from the lines of AP list in Wi-Fi Slice
- Remove sub-text from the lines of AP list - Add colors to the AP names to indicate the connection status of each AP Fixes: 120685004 Bug: 120786304 Test: make RunSettingsRoboTests -j Change-Id: I7b879248528a293d14d959994bb054275f0d69a1
This commit is contained in:
@@ -16,17 +16,26 @@
|
||||
|
||||
package com.android.settings.wifi.slice;
|
||||
|
||||
import android.annotation.ColorInt;
|
||||
import android.content.Context;
|
||||
import android.graphics.PorterDuff;
|
||||
import android.graphics.PorterDuffColorFilter;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.net.NetworkInfo.State;
|
||||
import android.net.Uri;
|
||||
import android.net.wifi.WifiSsid;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.core.graphics.drawable.IconCompat;
|
||||
import androidx.slice.Slice;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.slices.CustomSliceRegistry;
|
||||
import com.android.settings.slices.CustomSliceable;
|
||||
import com.android.settingslib.wifi.AccessPoint;
|
||||
|
||||
/**
|
||||
* {@link CustomSliceable} for Wi-Fi, used by contextual homepage.
|
||||
@@ -56,6 +65,36 @@ public class ContextualWifiSlice extends WifiSlice {
|
||||
// keep showing this card to keep UI stable, even if wifi connects to a network later.
|
||||
mPreviouslyDisplayed = true;
|
||||
|
||||
// Reload theme for switching dark mode on/off
|
||||
mContext.getTheme().applyStyle(R.style.Theme_Settings_Home, true /* force */);
|
||||
|
||||
return super.getSlice();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected IconCompat getAccessPointLevelIcon(AccessPoint accessPoint) {
|
||||
final Drawable d = mContext.getDrawable(
|
||||
com.android.settingslib.Utils.getWifiIconResource(accessPoint.getLevel()));
|
||||
|
||||
@ColorInt int color;
|
||||
if (accessPoint.isActive()) {
|
||||
final State state = accessPoint.getNetworkInfo().getState();
|
||||
if (state == State.CONNECTED) {
|
||||
color = Utils.getColorAccentDefaultColor(mContext);
|
||||
} else { // connecting
|
||||
color = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
|
||||
android.R.attr.colorControlNormal));
|
||||
}
|
||||
} else {
|
||||
color = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
|
||||
}
|
||||
|
||||
d.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
|
||||
return IconCompat.createWithBitmap(Utils.drawableToBitmap(d));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSliceAccentColor() {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user