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

Commit cc538e05 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Show saved networks in QS sub-panel."

parents a850300f e6fc4911

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -630,6 +630,8 @@ 
    <string name="quick_settings_connected">Connected</string>

    <!-- QuickSettings: Control panel: Label for a connected Wi-Fi access point when the connection is established by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connected_via_wfa">Connected via Wi\u2011Fi assistant</string>

    <!-- QuickSettings: Control panel: Label for saved device or connection. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_saved">Saved</string>

    <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_connecting">Connecting...</string>

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

packages/SystemUI/src/com/android/systemui/qs/tiles/WifiTile.java

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ public class WifiTile extends QSTile<QSTile.SignalState> { 
                                R.string.quick_settings_connected :

                                R.string.quick_settings_connected_via_wfa);

                    } else if (ap.networkId >= 0) {

                        // TODO: Set line 2 to wifi saved string here.

                        item.line2 = mContext.getString(R.string.quick_settings_saved);

                    }

                    item.overlay = ap.hasSecurity

                            ? mContext.getDrawable(R.drawable.qs_ic_wifi_lock)