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

Commit cccb6d3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused badged wifi API/drawables."

parents 9df31e55 baeb465a

core/java/android/net/NetworkBadging.java

+0 −33
Original line number Diff line number Diff line
@@ -21,13 +21,10 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.LayerDrawable;

import android.net.wifi.WifiManager;

import android.view.View;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -96,34 +93,4 @@ public class NetworkBadging { 
                throw new IllegalArgumentException("Invalid signal level: " + signalLevel);

        }

    }



    /**

     * Returns the badged wifi signal resource id for the given signal level.

     *

     * <p>This badged wifi signal resource should be displayed with the quality badge retrieved

     * from {@link #getWifiBadgeResource(int)}. If there is no badge,

     * {@link #getWifiBadgeResource(int)} should be used instead of this method.

     *

     * @param signalLevel The level returned by {@link WifiManager#calculateSignalLevel(int, int)}

     *                    for a network. Must be between 0 and {@link WifiManager#RSSI_LEVELS}-1.

     * @return the @DrawableRes for the icon

     * @throws IllegalArgumentException for an invalid signal level

     * @hide

     */

    @DrawableRes private static int getBadgedWifiSignalResource(int signalLevel) {

        switch (signalLevel) {

            case 0:

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

            case 1:

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

            case 2:

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

            case 3:

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

            case 4:

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

            default:

                throw new IllegalArgumentException("Invalid signal level: " + signalLevel);

        }

    }

}

core/res/res/drawable/ic_signal_wifi_badged_0_bars.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:width="26dp"

    android:height="24dp">

    <group

        android:translateX="386"

        android:translateY="-298">

        <path

            android:pathData="M-377 308.5c0 -2.5 2 -4.5 4.5 -4.5l3.5 0 0.79999 -1c-0.29999 -0.29999 -3.70001 -3 -8.79999 -3 -5.09998 0 -8.5 2.79999 -8.79999 3l8.79999 11 0 0 0 0 1.60001 -2c-0.9 -0.89999 -1.60001 -2.10001 -1.60001 -3.5z"

            android:fillColor="#FFFFFF"

            android:fillAlpha="0.3" />

    </group>

</vector>

core/res/res/drawable/ic_signal_wifi_badged_1_bar.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:width="26dp"

    android:height="24dp">

    <group

        android:translateX="386"

        android:translateY="-298">

        <path

            android:pathData="M-377 308.5c0 -2.5 2 -4.5 4.5 -4.5l3.5 0 0.79999 -1c-0.29999 -0.29999 -3.70001 -3 -8.79999 -3 -5.09998 0 -8.5 2.79999 -8.79999 3l8.79999 11 0 0 0 0 1.60001 -2c-0.9 -0.89999 -1.60001 -2.10001 -1.60001 -3.5z"

            android:fillColor="#FFFFFF"

            android:fillAlpha="0.3" />

        <path

            android:pathData="M-377 308.5c0 -0.20001 0 -0.29999 0.10001 -0.5 0 0 0 0 -0.10001 0 -2.10001 0 -3.60001 1.20001 -3.79999 1.29999L-377 314l1.60001 -2.10001c-0.9 -0.79998 -1.60001 -2 -1.60001 -3.39999z"

            android:fillColor="#FFFFFF" />

    </group>

</vector>

core/res/res/drawable/ic_signal_wifi_badged_2_bars.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:width="26dp"

    android:height="24dp">

    <group

        android:translateX="386"

        android:translateY="-298">

        <path

            android:pathData="M-377 308.5c0 -2.5 2 -4.5 4.5 -4.5l3.5 0 0.79999 -1c-0.29999 -0.29999 -3.70001 -3 -8.79999 -3 -5.09998 0 -8.5 2.79999 -8.79999 3l8.79999 11 0 0 0 0 1.60001 -2c-0.9 -0.89999 -1.60001 -2.10001 -1.60001 -3.5z"

            android:fillColor="#FFFFFF"

            android:fillAlpha="0.3" />

        <path

            android:pathData="M-377 308.5c0 -0.89999 0.29999 -1.70001 0.70001 -2.5 -0.20001 0 -0.5 0 -0.70001 0 -2.79999 0 -4.79999 1.60001 -5 1.79999l5 6.20001 0 0 0 0 1.60001 -2c-1 -0.89999 -1.60001 -2.10001 -1.60001 -3.5z"

            android:fillColor="#FFFFFF" />

    </group>

</vector>

core/res/res/drawable/ic_signal_wifi_badged_3_bars.xml

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2008 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:viewportWidth="18"

    android:viewportHeight="18"

    android:width="26dp"

    android:height="24dp">

    <group

        android:translateX="386"

        android:translateY="-298">

        <path

            android:pathData="M-377 308.5c0 -2.5 2 -4.5 4.5 -4.5l3.5 0 0.79999 -1c-0.29999 -0.29999 -3.70001 -3 -8.79999 -3 -5.09998 0 -8.5 2.79999 -8.79999 3l8.79999 11 0 0 0 0 1.60001 -2c-0.9 -0.89999 -1.60001 -2.10001 -1.60001 -3.5z"

            android:fillColor="#FFFFFF"

            android:fillAlpha="0.3" />

        <path

            android:pathData="M-375.39999 311.89999c-1 -0.79998 -1.60001 -2.1 -1.60001 -3.39999 0 -1.79999 1.10001 -3.39999 2.70001 -4.10001C-375.09998 304.19998 -376 304 -377 304c-3.60001 0 -6 1.89999 -6.29999 2.20001L-377 314l0 0 0 0"

            android:fillColor="#FFFFFF" />

    </group>

</vector>