Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove Wifi Badges from platform." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-07 23:19:04 +00:00
committed by Android (Google) Code Review
parent 584406f8e1 19f64d084d
commit 09d06437ad
1 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/net/NetworkBadging.java
View File

@@ -66,15 +66,7 @@ public class NetworkBadging {
*/
@NonNull public static Drawable getWifiIcon(
@IntRange(from=0, to=4) int signalLevel, @Badging int badging, @Nullable Theme theme) {
Resources resources = Resources.getSystem();
if (badging == BADGING_NONE) {
return resources.getDrawable(getWifiSignalResource(signalLevel), theme);
}
Drawable[] layers = new Drawable[] {
resources.getDrawable(getBadgedWifiSignalResource(signalLevel), theme),
resources.getDrawable(getWifiBadgeResource(badging), theme)
};
return new LayerDrawable(layers);
return Resources.getSystem().getDrawable(getWifiSignalResource(signalLevel), theme);
}
/**
@@ -134,31 +126,4 @@ public class NetworkBadging {
throw new IllegalArgumentException("Invalid signal level: " + signalLevel);
}
}
/**
* Returns the wifi quality badge resource id for the the given badging balue.
*
* <p>This badge should be displayed with the badge signal resource retrieved from
* {@link #getBadgedWifiSignalResource(int)}.
*
* @param badging {@see NetworkBadging#Badging} from {@link ScoredNetwork#calculateBadge(int)}.
* @return the @DrawableRes for the icon or {@link View#NO_ID} for
* {@link NetworkBadging#BADGING_NONE}
* @throws IllegalArgumentException for an invalid badging value.
* @hide
*/
@DrawableRes private static int getWifiBadgeResource(@Badging int badging) {
switch (badging) {
case BADGING_NONE:
return View.NO_ID;
case BADGING_SD:
return com.android.internal.R.drawable.ic_signal_wifi_badged_sd;
case BADGING_HD:
return com.android.internal.R.drawable.ic_signal_wifi_badged_hd;
case BADGING_4K:
return com.android.internal.R.drawable.ic_signal_wifi_badged_4k;
default:
throw new IllegalArgumentException("No resource found for badge: " + badging);
}
}
}