diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-15 09:04:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-15 09:04:35 +0000 |
| commit | e587591c5a5b2519bd9ecf389380d7325d75957c (patch) | |
| tree | a2b403b052488f6fa74d46325b40597a39e47de4 /core/java/android | |
| parent | 4ea09f5ca47d4edb9223f25c4165a4697e9f7188 (diff) | |
| parent | d831be95fb26b6e2b93b41ed056be43071c75ca2 (diff) | |
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkBadging.java | 4 | ||||
| -rw-r--r-- | core/java/android/net/ScoredNetwork.java | 23 |
2 files changed, 2 insertions, 25 deletions
diff --git a/core/java/android/net/NetworkBadging.java b/core/java/android/net/NetworkBadging.java index 4409d0a4ce73..b4ef69542bd1 100644 --- a/core/java/android/net/NetworkBadging.java +++ b/core/java/android/net/NetworkBadging.java @@ -56,7 +56,7 @@ public class NetworkBadging { * * @param signalLevel The level returned by {@link WifiManager#calculateSignalLevel(int, int)} * for a network. Must be between 0 and {@link WifiManager#RSSI_LEVELS}-1. - * @param badging {@see ScoredNetwork#Badging}, retrieved from + * @param badging {@see NetworkBadging#Badging}, retrieved from * {@link ScoredNetwork#calculateBadge(int)}. * @param theme The theme for the current application, may be null. * @return Drawable for the given icon @@ -140,7 +140,7 @@ public class NetworkBadging { * <p>This badge should be displayed with the badge signal resource retrieved from * {@link #getBadgedWifiSignalResource(int)}. * - * @param badging {@see ScoredNetwork#Badging} from {@link ScoredNetwork#calculateBadge(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. diff --git a/core/java/android/net/ScoredNetwork.java b/core/java/android/net/ScoredNetwork.java index a664a8bf1ac1..666da0a455fa 100644 --- a/core/java/android/net/ScoredNetwork.java +++ b/core/java/android/net/ScoredNetwork.java @@ -73,29 +73,6 @@ public class ScoredNetwork implements Parcelable { /** A {@link NetworkKey} uniquely identifying this network. */ public final NetworkKey networkKey; - // TODO(b/35323372): Delete these once external references are switched. - /** @deprecated Use {@link NetworkBadging#Badging} instead. */ - @Deprecated - @IntDef({BADGING_NONE, BADGING_SD, BADGING_HD, BADGING_4K}) - @Retention(RetentionPolicy.SOURCE) - public @interface Badging {} - - /** @deprecated Use {@link NetworkBadging#BADGING_NONE} instead. */ - @Deprecated - public static final int BADGING_NONE = 0; - - /** @deprecated Use {@link NetworkBadging#BADGING_SD} instead. */ - @Deprecated - public static final int BADGING_SD = 10; - - /** @deprecated Use {@link NetworkBadging#BADGING_HD} instead. */ - @Deprecated - public static final int BADGING_HD = 20; - - /** @deprecated Use {@link NetworkBadging#BADGING_4K} instead. */ - @Deprecated - public static final int BADGING_4K = 30; - /** * The {@link RssiCurve} representing the scores for this network based on the RSSI. * |