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

Commit 44268e3c authored by Eric Schwarzenbach's avatar Eric Schwarzenbach
Browse files

Remove references to deprecated NetworkBadging class. 

Cleanup. Replaces references to the badging enums with
AccessPoint.Speed. Recreates getWifiIcon functionality in Utils class.

Bug: 62355275
Test: manual (no behavioral changes)
Change-Id: I33fa70e3680431fd234a92e989f89dbe04798ad2
parent 8e18ca5c

packages/SettingsLib/src/com/android/settingslib/Utils.java

+12 −40
Original line number Original line Diff line number Diff line
@@ -15,14 +15,11 @@ import android.graphics.Bitmap; 
import android.graphics.BitmapFactory;

import android.graphics.BitmapFactory;

import android.graphics.Color;

import android.graphics.Color;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager;

import android.net.NetworkBadging;

import android.os.BatteryManager;

import android.os.BatteryManager;

import android.os.UserManager;

import android.os.UserManager;

import android.print.PrintManager;

import android.print.PrintManager;

import android.provider.Settings;

import android.provider.Settings;

import android.view.View;





import com.android.internal.util.UserIcons;

import com.android.internal.util.UserIcons;

import com.android.settingslib.drawable.UserIconDrawable;

import com.android.settingslib.drawable.UserIconDrawable;
@@ -35,12 +32,12 @@ public class Utils { 
    private static String sServicesSystemSharedLibPackageName;

    private static String sServicesSystemSharedLibPackageName;

    private static String sSharedSystemSharedLibPackageName;

    private static String sSharedSystemSharedLibPackageName;





    static final int[] WIFI_PIE_FOR_BADGING = {

    static final int[] WIFI_PIE = {

          com.android.internal.R.drawable.ic_signal_wifi_badged_0_bars,

        com.android.internal.R.drawable.ic_wifi_signal_0,

          com.android.internal.R.drawable.ic_signal_wifi_badged_1_bar,

        com.android.internal.R.drawable.ic_wifi_signal_1,

          com.android.internal.R.drawable.ic_signal_wifi_badged_2_bars,

        com.android.internal.R.drawable.ic_wifi_signal_2,

          com.android.internal.R.drawable.ic_signal_wifi_badged_3_bars,

        com.android.internal.R.drawable.ic_wifi_signal_3,

          com.android.internal.R.drawable.ic_signal_wifi_badged_4_bars

        com.android.internal.R.drawable.ic_wifi_signal_4

    };

    };





    /**

    /**
@@ -272,42 +269,17 @@ public class Utils { 
    }

    }





    /**

    /**

     * Returns a badged Wifi icon drawable.

     * Returns the Wifi icon resource for a given RSSI level.

     *

     *

     * <p>The first layer contains the Wifi pie and the second layer contains the badge. Callers

     * should set the drawable to the appropriate size and tint color.

     *

     * @param context The caller's context (must have access to internal resources)

     * @param level The number of bars to show (0-4)

     * @param level The number of bars to show (0-4)

     * @param badge The badge enum {@see android.net.ScoredNetwork}

     *

     * @throws IllegalArgumentException if an invalid badge enum is given

     *

     *

     * @deprecated TODO(sghuman): Finalize the form of this method and then move it to a new

     * @throws IllegalArgumentException if an invalid RSSI level is given.

     *         location.

     */

     */

    public static LayerDrawable getBadgedWifiIcon(Context context, int level, int badge) {

    public static int getWifiIconResource(int level) {

        return new LayerDrawable(

        if (level < 0 || level >= WIFI_PIE.length) {

                new Drawable[] {

            throw new IllegalArgumentException("No Wifi icon found for level: " + level);

                        context.getDrawable(WIFI_PIE_FOR_BADGING[level]),

                        context.getDrawable(getWifiBadgeResource(badge))

                });

    }



    private static int getWifiBadgeResource(int badge) {

        switch (badge) {

            case NetworkBadging.BADGING_NONE:

                return View.NO_ID;

            case NetworkBadging.BADGING_SD:

                return com.android.internal.R.drawable.ic_signal_wifi_badged_sd;

            case NetworkBadging.BADGING_HD:

                return com.android.internal.R.drawable.ic_signal_wifi_badged_hd;

            case NetworkBadging.BADGING_4K:

                return com.android.internal.R.drawable.ic_signal_wifi_badged_4k;

            default:

                throw new IllegalArgumentException(

                    "No badge resource found for badge value: " + badge);

        }

        }

        return WIFI_PIE[level];

    }

    }





    public static int getDefaultStorageManagerDaysToRetain(Resources resources) {

    public static int getDefaultStorageManagerDaysToRetain(Resources resources) {

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.StateListDrawable;

import android.graphics.drawable.StateListDrawable;

import android.net.NetworkBadging;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiConfiguration;

import android.os.Looper;

import android.os.Looper;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -37,6 +36,7 @@ import android.widget.TextView; 
import com.android.settingslib.R;

import com.android.settingslib.R;

import com.android.settingslib.TronUtils;

import com.android.settingslib.TronUtils;

import com.android.settingslib.Utils;

import com.android.settingslib.Utils;

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





public class AccessPointPreference extends Preference {

public class AccessPointPreference extends Preference {
@@ -71,7 +71,7 @@ public class AccessPointPreference extends Preference { 
    private int mLevel;

    private int mLevel;

    private CharSequence mContentDescription;

    private CharSequence mContentDescription;

    private int mDefaultIconResId;

    private int mDefaultIconResId;

    private int mWifiSpeed = NetworkBadging.BADGING_NONE;

    private int mWifiSpeed = Speed.NONE;





    public static String generatePreferenceKey(AccessPoint accessPoint) {

    public static String generatePreferenceKey(AccessPoint accessPoint) {

        StringBuilder builder = new StringBuilder();

        StringBuilder builder = new StringBuilder();
@@ -179,9 +179,7 @@ public class AccessPointPreference extends Preference { 
        }

        }

        TronUtils.logWifiSettingsSpeed(context, mWifiSpeed);

        TronUtils.logWifiSettingsSpeed(context, mWifiSpeed);





        // TODO(b/62355275): Revert this to N code after deleting NetworkBadging API

        Drawable drawable = context.getDrawable(Utils.getWifiIconResource(level));

        Drawable drawable = NetworkBadging.getWifiIcon(

                level, NetworkBadging.BADGING_NONE, getContext().getTheme());

        if (!mForSavedNetworks && drawable != null) {

        if (!mForSavedNetworks && drawable != null) {

            drawable.setTint(Utils.getColorAttr(context, android.R.attr.colorControlNormal));

            drawable.setTint(Utils.getColorAttr(context, android.R.attr.colorControlNormal));

            setIcon(drawable);

            setIcon(drawable);