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

Commit f4b548c0 authored by PauloftheWest's avatar PauloftheWest
Browse files

Removed all references to "Google Wi-Fi Assistant" from Settings. 

+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
parent c0deb7da

res/layout/wifi_assistant_card.xml

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
        android:layout_marginLeft="@dimen/wifi_assistant_padding_start_end"

        android:layout_marginRight="@dimen/wifi_assistant_padding_start_end"

        android:gravity="start"

        android:text="@string/wifi_assistant_title_message"

        android:textAppearance="?android:attr/textAppearanceMedium" />



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

res/values/strings.xml

+1 −27
Original line number Diff line number Diff line
@@ -1336,29 +1336,7 @@ 
    <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->

    <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>

    <!-- Wifi Assistant title message.  First piece of text on the Wifi Assistant setup wizard.  [CHAR LIMIT=200] -->

    <string name="wifi_assistant_title_message">Google Wi\u2011Fi Assistant automatically connects you to the best available Wi\u2011Fi</string>

    <!-- Wifi Assistant explanation message.  Explains what wifi assistant does to the android phone.  [CHAR LIMIT=200] -->

    <string name="wifi_assistant_explanation_message">Google Wi\u2011Fi Assistant detects the networks available to you and connects your device to the one with the best speed and reliability.</string>

    <!-- Wifi Assistant vpn message.  Explains to the user that Google may use/provide a secure VPN connecte to Google's servers.  [CHAR LIMIT=100] -->

    <string name="wifi_assistant_vpn_message">To help protect your data, Google Wi\u2011Fi Assistant may provide a secure VPN connection through Google servers.</string>

    <!-- Wifi Assistant No, thanks string.  Text to say no to wifi assistant. [CHAR LIMIT=20] -->

    <string name="wifi_assistant_activity_no_thanks">No, thanks</string>

    <!-- Wifi Assistant Yes string.  Text to say yes to wifi assistant. [CHAR LIMIT=20] -->

    <string name="wifi_assistant_activity_yes">YES, I\'M IN</string>

    <!-- Wifi Assistant Dialog title.  [CHAR LIMIT=30] -->

    <string name="wifi_assistant_dialog_title">Connection Request</string>

    <!-- Wifi Assistant Dialog message.  Explains what monitor may occur with wifi-assistant [CHAR LIMIT=100] -->

    <string name="wifi_assistant_dialog_message">Wi\u2011Fi Assistant" wants to set up a VPN connection that allows it to monitor network traffic.  Only accept if you trust the source.</string>

    <!-- Wifi Assistant Dialog message. Notice of the icon that will appear when wifi assistant is on.  [CHAR LIMIT=100] -->

    <string name="wifi_assistant_dialog_notice">appears at the top of your screen when VPN is active.</string>

    <!-- Wifi Assistant dialog accept.  [CHAR LIMIT=20] -->

    <string name="wifi_assistant_accept">ACCEPT</string>

    <!-- Wifi Assistant dialog deny.  [CHAR LIMIT=20] -->

    <string name="wifi_assistant_deny">DENY</string>

    <!-- Wifi Assistant Network Monitoring titile.  [CHAR LIMIT=40] -->

    <string name="wifi_assistant_network_title">Network monitoring</string>

    <!-- Wifi Assistant permission accepted message.  [CHAR LIMIT=140] -->

    <string name="wifi_assistant_permission_accepted">You gave “Google Wi\u2011Fi Assistant” permission to set up a VPN connection. That means this app can monitor network traffic.</string>

    <string name="wifi_assistant_title_message"><xliff:g id="wifi_assistant">%1$s</xliff:g> automatically connects you to the best available Wi\u2011Fi</string>

    <!-- Wifi Assistant open app button text.  [CHAR LIMIT=40] -->

    <string name="wifi_assistant_open_app">OPEN APP</string>
@@ -1486,10 +1464,6 @@ 
    <string name="wifi_automatically_manage_title">Automatically manage Wi\u2011Fi</string>

    <!-- Checkbox summary for option to Automatically manage Wi\u2011Fi  [CHAR LIMIT=100] -->

    <string name="wifi_automatically_manage_summary">Let <xliff:g id="wifi_assistant">%1$s</xliff:g> manage your Wi\u2011Fi connection</string>

    <!-- Checkbox title for option for Wi\u2011Fi Assistant  [CHAR LIMIT=40] -->

    <string name="wifi_assistant_setting_title">Wi\u2011Fi assistant</string>

    <!-- Checkbox summary for option for Wi\u2011Fi Assistant  [CHAR LIMIT=40] -->

    <string name="wifi_assistant_setting_summary">Google Wi\u2011Fi Assistant</string>

    <!-- Preference title for option to install certificates -->

    <string name="wifi_install_credentials">Install certificates</string>

    <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>

res/xml/wifi_advanced_settings.xml

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
    <SwitchPreference

            android:key="wifi_assistant"

            android:title="@string/wifi_automatically_manage_title"

            android:summary="@string/wifi_assistant_setting_summary"

            android:persistent="false" />



    <ListPreference

src/com/android/settings/wifi/WifiSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -735,6 +735,10 @@ public class WifiSettings extends RestrictedSettingsFragment 
                    .inflate(R.layout.wifi_assistant_card, getListView(), false);

            Button setup = (Button) mWifiAssistantCard.findViewById(R.id.setup);

            Button noThanks = (Button) mWifiAssistantCard.findViewById(R.id.no_thanks_button);

            TextView assistantText =

                (TextView) mWifiAssistantCard.findViewById(R.id.wifi_assistant_text);

            assistantText.setText(getResources().getString(

                    R.string.wifi_assistant_title_message, mWifiAssistantApp.mScorerName));



            if (setup != null && noThanks != null) {

                setup.setOnClickListener(new OnClickListener() {