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

Commit 5f87b253 authored by yinxu's avatar yinxu
Browse files

SysUI changes for Provider Model 

This CL contains the below major logic changes:
1. Only show QS/SB Icons for the current default network
2. Support the new "no internet" icons
3. Add a new callback "setConnectivityStatus"
4. Use WiFi scan results for network availability check

Bug: 176428921
Test: Unit Tests, Manual Tests

Change-Id: Ib5e95353205cad4e0bdbd57ef823044fcc54b10d
parent a0ab2cbe

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,10 @@ public class WifiStatusTracker { 
                } else {

                } else {

                    ssid = getValidSsid(mWifiInfo);

                    ssid = getValidSsid(mWifiInfo);

                }

                }

                if (mProviderModel) {

                    isCarrierMerged = mWifiInfo.isCarrierMerged();

                    subId = mWifiInfo.getSubscriptionId();

                }

                updateRssi(mWifiInfo.getRssi());

                updateRssi(mWifiInfo.getRssi());

                maybeRequestNetworkScore();

                maybeRequestNetworkScore();

            }

            }
@@ -211,6 +215,8 @@ public class WifiStatusTracker { 
    private void updateWifiState() {

    private void updateWifiState() {

        state = mWifiManager.getWifiState();

        state = mWifiManager.getWifiState();

        enabled = state == WifiManager.WIFI_STATE_ENABLED;

        enabled = state == WifiManager.WIFI_STATE_ENABLED;

        isCarrierMerged = false;

        subId = 0;

    }

    }





    private void updateRssi(int newRssi) {

    private void updateRssi(int newRssi) {

packages/SystemUI/res/drawable/ic_qs_no_internet_airplane.xml

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
<!--

    Copyright (C) 2020 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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10c0.34,0 0.68,-0.02 1.01,-0.05V20h-1v-0.04c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96H13v-2H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2H21.8C20.87,5.44 16.83,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56C16.43,5.07 17.96,6.35 18.92,8zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82C10.52,6.57 11.17,5.24 12,4.04zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2H4.26zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56C7.57,18.93 6.04,17.66 5.08,16zM8.03,8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M22,19.3v-0.9l-3.37,-2.25v-2.47C18.63,13.3 18.35,13 18,13s-0.63,0.3 -0.63,0.68v2.47L14,18.4v0.9l3.37,-1.12v2.48l-0.84,0.68V22L18,21.55L19.47,22v-0.67l-0.84,-0.68v-2.48L22,19.3z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_qs_no_internet_available.xml

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
<!--

    Copyright (C) 2020 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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10c0.34,0 0.68,-0.02 1.01,-0.05V20h-1v-0.04c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96H13v-2H9.66c-0.09,-0.66 -0.16,-1.32 -0.16,-2s0.07,-1.35 0.16,-2H21.8C20.87,5.44 16.83,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56C16.43,5.07 17.96,6.35 18.92,8zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82C10.52,6.57 11.17,5.24 12,4.04zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2s0.06,1.34 0.14,2H4.26zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56C7.57,18.93 6.04,17.66 5.08,16zM8.03,8H5.08c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M16,14.75c0,-1.93 1.57,-3.5 3.5,-3.5s3.5,1.57 3.5,3.5c0,1.12 -0.69,1.73 -1.36,2.32c-0.64,0.56 -1.26,1.1 -1.26,2.06h-1.75c0,-1.59 0.82,-2.22 1.54,-2.78c0.57,-0.44 1.08,-0.83 1.08,-1.6c0,-0.96 -0.79,-1.75 -1.75,-1.75s-1.75,0.79 -1.75,1.75H16z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M18.63,20.25h1.75V22h-1.75V20.25z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_qs_no_internet_unavailable.xml

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
<!--

    Copyright (C) 2020 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:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M2,12C2,6.48 6.47,2 11.99,2C17.52,2 22,6.48 22,12c0,0.34 -0.02,0.67 -0.05,1h-2.02c0.04,-0.33 0.07,-0.66 0.07,-1c0,-0.69 -0.1,-1.36 -0.26,-2h-3.38c0.08,0.66 0.14,1.32 0.14,2c0,0.34 -0.01,0.67 -0.04,1h-2.01c0.03,-0.33 0.05,-0.66 0.05,-1c0,-0.68 -0.07,-1.35 -0.16,-2H9.66c-0.09,0.65 -0.16,1.32 -0.16,2s0.07,1.34 0.16,2H13v2h-2.91c0.43,1.43 1.08,2.76 1.91,3.96V20h1v1.95C12.67,21.98 12.33,22 11.99,22C6.47,22 2,17.52 2,12zM15.97,8h2.95c-0.96,-1.65 -2.49,-2.93 -4.33,-3.56C15.19,5.55 15.65,6.75 15.97,8zM13.91,8C13.48,6.57 12.83,5.24 12,4.04c-0.83,1.2 -1.48,2.53 -1.91,3.96H13.91zM4,12c0,0.69 0.1,1.36 0.26,2h3.38c-0.08,-0.66 -0.14,-1.32 -0.14,-2s0.06,-1.34 0.14,-2H4.26C4.1,10.64 4,11.31 4,12zM8.03,16H5.08c0.96,1.66 2.49,2.93 4.33,3.56C8.81,18.45 8.35,17.25 8.03,16zM5.08,8h2.95c0.32,-1.25 0.78,-2.45 1.38,-3.56C7.57,5.07 6.04,6.34 5.08,8z"

        android:fillAlpha="0.3"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M22,16.41L20.59,15l-2.09,2.09L16.41,15L15,16.41l2.09,2.09L15,20.59L16.41,22l2.09,-2.08L20.59,22L22,20.59l-2.08,-2.09L22,16.41z"/>

</vector>
 
 No newline at end of file

packages/SystemUI/res/values/strings.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -841,6 +841,12 @@ 
    <string name="quick_settings_wifi_label">Wi-Fi</string>

    <string name="quick_settings_wifi_label">Wi-Fi</string>

    <!-- QuickSettings: Internet [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Internet [CHAR LIMIT=NONE] -->

    <string name="quick_settings_internet_label">Internet</string>

    <string name="quick_settings_internet_label">Internet</string>

    <!-- QuickSettings: Airplane-safe [CHAR LIMIT=NONE] -->

    <string name="quick_settings_airplane_safe_label">Airplane-safe</string>

    <!-- QuickSettings: networks available [CHAR LIMIT=NONE] -->

    <string name="quick_settings_networks_available">Networks available</string>

    <!-- QuickSettings: networks unavailable [CHAR LIMIT=NONE] -->

    <string name="quick_settings_networks_unavailable">Networks unavailable</string>

    <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->

    <string name="quick_settings_wifi_not_connected">Not Connected</string>

    <string name="quick_settings_wifi_not_connected">Not Connected</string>

    <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->

    <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->